From 0084f06aa4617223d143dbf60c5ca5bed5e8369c Mon Sep 17 00:00:00 2001 From: Artem Date: Sun, 27 May 2018 09:22:56 +1000 Subject: [PATCH] Make SQL tests serial Due to SQLv1 and v2 being driven by the same collection, we get a race condition on cleanup. --- ci/pipeline.yml | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 77a4616da3..64f021305a 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -68,7 +68,7 @@ jobs: path: fog-google-src status: failure - - name: integration-tests-sqlv1 + - name: integration-tests-sql serial: true plan: - get: fog-google-src @@ -81,30 +81,7 @@ jobs: - task: full-integration-tests file: fog-google-src/ci/tasks/run-int.yml params: - rake_task: test:sqlv1 - google_project: {{google_project}} - google_json_key_data: {{google_json_key_data}} - google_client_email: {{google_client_email}} - on_failure: - put: pull-request - params: - path: fog-google-src - status: failure - - - name: integration-tests-sqlv2 - serial: true - plan: - - get: fog-google-src - resource: pull-request - version: every - trigger: true - - put: pull-request - params: {path: fog-google-src, status: pending} - - - task: full-integration-tests - file: fog-google-src/ci/tasks/run-int.yml - params: - rake_task: test:sqlv2 + rake_task: test:sql google_project: {{google_project}} google_json_key_data: {{google_json_key_data}} google_client_email: {{google_client_email}} @@ -142,8 +119,7 @@ jobs: - get: fog-google-src resource: pull-request passed: [integration-tests-storage, - integration-tests-sqlv1, - integration-tests-sqlv2, + integration-tests-sql, integration-tests-pubsub, integration-tests-monitoring, integration-tests-compute]