diff --git a/perfmetrics/scripts/fetch_and_upload_metrics.py b/perfmetrics/scripts/fetch_and_upload_metrics.py index d029a9b422..e53edabab8 100644 --- a/perfmetrics/scripts/fetch_and_upload_metrics.py +++ b/perfmetrics/scripts/fetch_and_upload_metrics.py @@ -79,9 +79,10 @@ def _parse_arguments(argv): ) parser.add_argument( - 'spreadsheet_id', + '--spreadsheet_id', help='Provide id of spreadsheet', action='store', + required=False, ) return parser.parse_args(argv[1:]) diff --git a/perfmetrics/scripts/ls_metrics/listing_benchmark.py b/perfmetrics/scripts/ls_metrics/listing_benchmark.py index ef9713ffd3..78d218d8d1 100644 --- a/perfmetrics/scripts/ls_metrics/listing_benchmark.py +++ b/perfmetrics/scripts/ls_metrics/listing_benchmark.py @@ -500,9 +500,10 @@ def _parse_arguments(argv): ) parser.add_argument( - 'spreadsheet_id', + '--spreadsheet_id', help='Provide id of spreadsheet', action='store', + required=False, ) # Ignoring the first parameter, as it is the path of this python # script itself. @@ -568,7 +569,7 @@ def _export_to_bigquery(test_type, config_id, start_time_build, ls_data): if len(argv) < 4: raise TypeError('Incorrect number of arguments.\n' 'Usage: ' - 'python3 listing_benchmark.py [--keep_files] [--upload_gs] [--num_samples NUM_SAMPLES] [--message MESSAGE] --gcsfuse_flags GCSFUSE_FLAGS --command COMMAND config_file spreadsheet_id') + 'python3 listing_benchmark.py [--keep_files] [--upload_gs] [--num_samples NUM_SAMPLES] [--message MESSAGE] --gcsfuse_flags GCSFUSE_FLAGS --command COMMAND config_file --spreadsheet_id SPREADSHEETID') args = _parse_arguments(argv) diff --git a/perfmetrics/scripts/ls_metrics/run_ls_benchmark.sh b/perfmetrics/scripts/ls_metrics/run_ls_benchmark.sh index eb9d35d7a3..dc3a60a3c2 100755 --- a/perfmetrics/scripts/ls_metrics/run_ls_benchmark.sh +++ b/perfmetrics/scripts/ls_metrics/run_ls_benchmark.sh @@ -11,4 +11,4 @@ echo Running script.. GCSFUSE_FLAGS=$1 UPLOAD_FLAGS=$2 SPREADSHEET_ID=$3 -python3 listing_benchmark.py config.json --gcsfuse_flags "$GCSFUSE_FLAGS" $UPLOAD_FLAGS --command "ls -R" --num_samples 30 --message "Testing CT setup." $SPREADSHEET_ID +python3 listing_benchmark.py config.json --gcsfuse_flags "$GCSFUSE_FLAGS" $UPLOAD_FLAGS --command "ls -R" --num_samples 30 --message "Testing CT setup." --spreadsheet_id=$SPREADSHEET_ID diff --git a/perfmetrics/scripts/run_load_test_and_fetch_metrics.sh b/perfmetrics/scripts/run_load_test_and_fetch_metrics.sh index 0b0c037b5c..745c65fd08 100755 --- a/perfmetrics/scripts/run_load_test_and_fetch_metrics.sh +++ b/perfmetrics/scripts/run_load_test_and_fetch_metrics.sh @@ -43,4 +43,4 @@ echo Installing requirements.. pip install --require-hashes -r requirements.txt --user gsutil cp gs://periodic-perf-tests/creds.json gsheet echo Fetching results.. -python3 fetch_and_upload_metrics.py "fio-output${EXPERIMENT_NUMBER}.json" $UPLOAD_FLAGS $SPREADSHEET_ID +python3 fetch_and_upload_metrics.py "fio-output${EXPERIMENT_NUMBER}.json" $UPLOAD_FLAGS --spreadsheet_id=$SPREADSHEET_ID