From 3418877af0d9830d4f62b3e4a6ef68511337bec7 Mon Sep 17 00:00:00 2001 From: "Rustam Lotsmanenko (EPAM)" Date: Mon, 22 Aug 2022 14:23:48 +0000 Subject: [PATCH 1/4] Update override-stages.yml --- devops/gcp/pipeline/override-stages.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/devops/gcp/pipeline/override-stages.yml b/devops/gcp/pipeline/override-stages.yml index 50074a62..307f3810 100644 --- a/devops/gcp/pipeline/override-stages.yml +++ b/devops/gcp/pipeline/override-stages.yml @@ -10,6 +10,7 @@ variables: # Postman tests TEST_SOURCE_FILES_DIR: "Postman Collection/31_CICD_Setup_CSVIngestion" COLLECTION_PATH: "Postman Collection/31_CICD_Setup_CSVIngestion/CSVWorkflow__CI-CD_v1.0.postman_collection.json" + OSDU_GCP_COLLECTION_BRANCH: "Fix_CSV_for_Anthos" # FIXME: delete after package registry usage is implemented in DF osdu-gcp-containerize-bootstrap-gitlab: -- GitLab From 08b1768920aa10cdde7d1fbac137f7c2a44086f5 Mon Sep 17 00:00:00 2001 From: Mikhail Piatliou Date: Tue, 23 Aug 2022 12:04:21 +0300 Subject: [PATCH 2/4] redefined postman job variable for anthos env --- devops/gcp/pipeline/override-stages.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/devops/gcp/pipeline/override-stages.yml b/devops/gcp/pipeline/override-stages.yml index 307f3810..d572c4bb 100644 --- a/devops/gcp/pipeline/override-stages.yml +++ b/devops/gcp/pipeline/override-stages.yml @@ -10,7 +10,6 @@ variables: # Postman tests TEST_SOURCE_FILES_DIR: "Postman Collection/31_CICD_Setup_CSVIngestion" COLLECTION_PATH: "Postman Collection/31_CICD_Setup_CSVIngestion/CSVWorkflow__CI-CD_v1.0.postman_collection.json" - OSDU_GCP_COLLECTION_BRANCH: "Fix_CSV_for_Anthos" # FIXME: delete after package registry usage is implemented in DF osdu-gcp-containerize-bootstrap-gitlab: @@ -181,6 +180,10 @@ osdu-gcp-deploy-dag:dev2: - exit 1 allow_failure: true +osdu-gcp-postman-tests:anthos: + variables: + OSDU_GCP_COLLECTION_BRANCH: "Fix_CSV_for_Anthos" + osdu-gcp-postman-tests:dev2: script: - echo "Skip postman tests until integration tests are implemented" -- GitLab From 4de0ee0d6ce1cd4b7ce2370375967eb09095a729 Mon Sep 17 00:00:00 2001 From: Mikhail Piatliou Date: Tue, 23 Aug 2022 13:29:12 +0300 Subject: [PATCH 3/4] temp fix for dags deploy --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 988af0a6..d98f253f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,6 +60,7 @@ include: file: "cloud-providers/osdu-gcp-containerize.yml" - project: "osdu/platform/ci-cd-pipelines" + ref: "gcp-temp-fix-dag-deploy" file: "cloud-providers/osdu-gcp-dag.yaml" - local: "devops/gcp/pipeline/override-stages.yml" -- GitLab From a37f8b397f1ab2336d4374458875c99d184e2429 Mon Sep 17 00:00:00 2001 From: Rustam_Lotsmanenko Date: Tue, 23 Aug 2022 18:31:38 +0300 Subject: [PATCH 4/4] override collection branch --- devops/gcp/pipeline/override-stages.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/devops/gcp/pipeline/override-stages.yml b/devops/gcp/pipeline/override-stages.yml index 83638d72..a5e29582 100644 --- a/devops/gcp/pipeline/override-stages.yml +++ b/devops/gcp/pipeline/override-stages.yml @@ -211,3 +211,7 @@ osdu-gcp-deploy-dag:dev2: before_script: - export OSDU_GCP_COMPOSER_TAG=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA} - echo $OSDU_GCP_COMPOSER_TAG + +osdu-gcp-postman-tests:anthos: + variables: + OSDU_GCP_COLLECTION_BRANCH: "Fix_CSV_for_Anthos" -- GitLab