@@ -158,7 +158,7 @@ commands:
158158 environment :
159159 SYNCSTORAGE_RS_IMAGE : app:build
160160
161- upload-to-gcs :
161+ gcs-configure-and-upload :
162162 parameters :
163163 source :
164164 type : string
@@ -168,6 +168,10 @@ commands:
168168 type : enum
169169 enum : ["xml", "json"]
170170 steps :
171+ - gcp-cli/setup :
172+ google_project_id : ETE_GOOGLE_PROJECT_ID
173+ gcloud_service_key : ETE_GCLOUD_SERVICE_KEY
174+ google_project_number : ETE_GOOGLE_PROJECT_NUMBER
171175 - run :
172176 name : Upload << parameters.source >> << parameters.extension >> Files to GCS
173177 when : always # Ensure the step runs even if previous steps, like test runs, fail
@@ -247,10 +251,6 @@ jobs:
247251 MYSQL_DATABASE : syncstorage
248252 resource_class : large
249253 steps :
250- - gcp-cli/setup :
251- google_project_id : ETE_GOOGLE_PROJECT_ID
252- gcloud_service_key : ETE_GCLOUD_SERVICE_KEY
253- google_project_number : ETE_GOOGLE_PROJECT_NUMBER
254254 - checkout
255255 - display-versions
256256 - setup-python
@@ -268,11 +268,11 @@ jobs:
268268 # then run-tokenserver-scripts-tests will fail. These tests expect the db to be
269269 # configured already, and it appears unit-tests modify the db to the expected state
270270 - store-test-results
271- - upload-to-gcs :
271+ - gcs-configure-and-upload :
272272 source : workflow/test-results
273273 destination : gs://ecosystem-test-eng-metrics/syncstorage-rs/junit
274274 extension : xml
275- - upload-to-gcs :
275+ - gcs-configure-and-upload :
276276 source : workflow/test-results
277277 destination : gs://ecosystem-test-eng-metrics/syncstorage-rs/coverage
278278 extension : json
@@ -432,7 +432,7 @@ jobs:
432432 - run-e2e-tests :
433433 db : mysql
434434 - store-test-results
435- - upload-to-gcs :
435+ - gcs-configure-and-upload :
436436 source : workflow/test-results
437437 destination : gs://ecosystem-test-eng-metrics/syncstorage-rs/junit
438438 extension : xml
@@ -461,7 +461,7 @@ jobs:
461461 - run-e2e-tests :
462462 db : spanner
463463 - store-test-results
464- - upload-to-gcs :
464+ - gcs-configure-and-upload :
465465 source : workflow/test-results
466466 destination : gs://ecosystem-test-eng-metrics/syncstorage-rs/junit
467467 extension : xml
0 commit comments