From a36973d45e21b1bde0fe4d26a665b6a7f8fc36b1 Mon Sep 17 00:00:00 2001 From: Milica-Cvrkota-IBM <109787570+Milica-Cvrkota-IBM@users.noreply.github.com> Date: Tue, 22 Oct 2024 15:54:33 +0200 Subject: [PATCH] update cluster names and zones (#223) Signed-off-by: Milica Cvrkota --- ci/pipeline.yaml | 72 +++++++++++++++++++++++----------------------- ci/pr-pipeline.yml | 60 +++++++++++++++++++------------------- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/ci/pipeline.yaml b/ci/pipeline.yaml index 9883faae..cd1c64a6 100644 --- a/ci/pipeline.yaml +++ b/ci/pipeline.yaml @@ -20,8 +20,8 @@ groups: - build-e2e-operator-base-image - name: manual-unlock jobs: - - gke-21-release-unlock-manual - - gke-27-release-unlock-manual + - gke-lowest-release-unlock-manual + - gke-latest-release-unlock-manual - openshift-4.11-release-unlock-manual var: @@ -250,10 +250,10 @@ jobs: params: { state: pending, context: build/docker } - put: gh-status inputs: [ pipeline-source ] - params: { state: pending, context: end-to-end-tests/run-e2e-test-gke-21 } + params: { state: pending, context: end-to-end-tests/run-e2e-test-gke-lowest } - put: gh-status inputs: [ pipeline-source ] - params: { state: pending, context: end-to-end-tests/run-e2e-test-gke-27 } + params: { state: pending, context: end-to-end-tests/run-e2e-test-gke-latest } - put: gh-status inputs: [ pipeline-source ] params: { state: pending, context: end-to-end-tests/run-e2e-test-openshift-4-11 } @@ -498,12 +498,12 @@ jobs: passed: [docker-build] - in_parallel: - do: - - put: gke-21 + - put: gke-lowest inputs: detect resource: test-clusters params: - claim: gke-21 - - task: run-e2e-test-gke-21 + claim: gke-lowest + - task: run-e2e-test-gke-lowest timeout: 30m attempts: 1 config: &gke-e2e-test-config @@ -517,9 +517,9 @@ jobs: password: ((project-berlin-tests-gcp-instana-qa)) params: GIT_COMMIT: ((.:git-commit)) - CLUSTER_INFO: '{ "name": "project-berlin-21", "zone": "us-central1-c", "project": "instana-agent-qa" }' + CLUSTER_INFO: '{ "name": "project-berlin-lowest", "zone": "us-central1", "project": "instana-agent-qa" }' CLUSTER_TYPE: gke - NAME: gke-21 + NAME: gke-lowest GCP_KEY_JSON: ((project-berlin-tests-gcp-instana-qa)) INSTANA_ENDPOINT_HOST: ((instana-qa.endpoint_host)) INSTANA_ENDPOINT_PORT: 443 @@ -540,31 +540,31 @@ jobs: on_success: put: gh-status inputs: [ pipeline-source ] - params: { state: success, context: end-to-end-tests/run-e2e-test-gke-21 } + params: { state: success, context: end-to-end-tests/run-e2e-test-gke-lowest } on_failure: do: - put: slack-alert params: channel: '#tech-agent-delivery-notifications' text: | - :x: the operator run-e2e-test-gke-21 has failed. please check <$ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME|the build job>. + :x: the operator run-e2e-test-gke-lowest has failed. please check <$ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME|the build job>. - put: gh-status inputs: [ pipeline-source ] - params: { state: failure, context: end-to-end-tests/run-e2e-test-gke-21 } + params: { state: failure, context: end-to-end-tests/run-e2e-test-gke-lowest } on_error: do: - put: slack-alert params: channel: '#tech-agent-delivery-notifications' text: | - :x: the operator run-e2e-test-gke-21 has failed. please check <$ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME|the build job>. + :x: the operator run-e2e-test-gke-lowest has failed. please check <$ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME|the build job>. - put: gh-status inputs: [ pipeline-source ] - params: { state: error, context: end-to-end-tests/run-e2e-test-gke-21 } + params: { state: error, context: end-to-end-tests/run-e2e-test-gke-lowest } on_abort: put: gh-status inputs: [ pipeline-source ] - params: { state: error, context: end-to-end-tests/run-e2e-test-gke-21 } + params: { state: error, context: end-to-end-tests/run-e2e-test-gke-lowest } ensure: do: - task: cleanup-resources @@ -573,9 +573,9 @@ jobs: platform: linux image_resource: *e2e-test-image-resource params: - CLUSTER_INFO: '{ "name": "project-berlin-21", "zone": "us-central1-c", "project": "instana-agent-qa" }' + CLUSTER_INFO: '{ "name": "project-berlin-lowest", "zone": "us-central1", "project": "instana-agent-qa" }' CLUSTER_TYPE: gke - NAME: gke-21 + NAME: gke-lowest GCP_KEY_JSON: ((project-berlin-tests-gcp-instana-qa)) inputs: - name: pipeline-source @@ -584,24 +584,24 @@ jobs: - put: test-clusters inputs: detect params: - release: gke-21 + release: gke-lowest - do: - - put: gke-27 + - put: gke-latest inputs: detect resource: test-clusters params: - claim: gke-27 - - task: run-e2e-test-gke-27 + claim: gke-latest + - task: run-e2e-test-gke-latest timeout: 30m attempts: 1 config: <<: *gke-e2e-test-config params: GIT_COMMIT: ((.:git-commit)) - CLUSTER_INFO: '{ "name": "project-berlin-27", "zone": "us-central1-c", "project": "instana-agent-qa" }' + CLUSTER_INFO: '{ "name": "project-berlin-latest", "zone": "us-central1", "project": "instana-agent-qa" }' CLUSTER_TYPE: gke - NAME: gke-27 + NAME: gke-latest GCP_KEY_JSON: ((project-berlin-tests-gcp-instana-qa)) INSTANA_ENDPOINT_HOST: ((instana-qa.endpoint_host)) INSTANA_ENDPOINT_PORT: 443 @@ -625,31 +625,31 @@ jobs: on_success: put: gh-status inputs: [ pipeline-source ] - params: { state: success, context: end-to-end-tests/run-e2e-test-gke-27 } + params: { state: success, context: end-to-end-tests/run-e2e-test-gke-latest } on_failure: do: - put: slack-alert params: channel: '#tech-agent-delivery-notifications' text: | - :x: the operator run-e2e-test-gke-27 has failed. please check <$ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME|the build job>. + :x: the operator run-e2e-test-gke-latest has failed. please check <$ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME|the build job>. - put: gh-status inputs: [ pipeline-source ] - params: { state: failure, context: end-to-end-tests/run-e2e-test-gke-27 } + params: { state: failure, context: end-to-end-tests/run-e2e-test-gke-latest } on_error: do: - put: slack-alert params: channel: '#tech-agent-delivery-notifications' text: | - :x: the operator run-e2e-test-gke-27 has failed. please check <$ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME|the build job>. + :x: the operator run-e2e-test-gke-latest has failed. please check <$ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME|the build job>. - put: gh-status inputs: [ pipeline-source ] - params: { state: error, context: end-to-end-tests/run-e2e-test-gke-27 } + params: { state: error, context: end-to-end-tests/run-e2e-test-gke-latest } on_abort: put: gh-status inputs: [ pipeline-source ] - params: { state: error, context: end-to-end-tests/run-e2e-test-gke-27 } + params: { state: error, context: end-to-end-tests/run-e2e-test-gke-latest } ensure: do: - task: cleanup-resources @@ -658,9 +658,9 @@ jobs: platform: linux image_resource: *e2e-test-image-resource params: - CLUSTER_INFO: '{ "name": "project-berlin-27", "zone": "us-central1-c", "project": "instana-agent-qa" }' + CLUSTER_INFO: '{ "name": "project-berlin-latest", "zone": "us-central1", "project": "instana-agent-qa" }' CLUSTER_TYPE: gke - NAME: gke-27 + NAME: gke-latest GCP_KEY_JSON: ((project-berlin-tests-gcp-instana-qa)) inputs: @@ -670,7 +670,7 @@ jobs: - put: test-clusters inputs: detect params: - release: gke-27 + release: gke-latest # - do: # - put: openshift-4.11 # inputs: detect @@ -1443,7 +1443,7 @@ jobs: get_params: skip_download: true - - name: gke-21-release-unlock-manual + - name: gke-lowest-release-unlock-manual plan: - task: prepare-lock config: @@ -1459,13 +1459,13 @@ jobs: args: - -cx - | - echo "gke-21" > tmp-lock/name + echo "gke-lowest" > tmp-lock/name touch tmp-lock/metadata - put: test-clusters params: release: tmp-lock - - name: gke-27-release-unlock-manual + - name: gke-latest-release-unlock-manual plan: - task: prepare-lock config: @@ -1481,7 +1481,7 @@ jobs: args: - -cx - | - echo "gke-27" > tmp-lock/name + echo "gke-latest" > tmp-lock/name touch tmp-lock/metadata - put: test-clusters params: diff --git a/ci/pr-pipeline.yml b/ci/pr-pipeline.yml index 1a470e7a..dca898ca 100644 --- a/ci/pr-pipeline.yml +++ b/ci/pr-pipeline.yml @@ -50,14 +50,14 @@ gh-status-set-pending-docker-build: &gh-status-set-pending-docker-build put: gh-status inputs: [pipeline-source] params: { state: pending, context: build/docker } -gh-status-set-pending-e2e-gke-21: &gh-status-set-pending-e2e-gke-21 +gh-status-set-pending-e2e-gke-lowest: &gh-status-set-pending-e2e-gke-lowest put: gh-status inputs: [pipeline-source] - params: { state: pending, context: end-to-end-tests/run-e2e-test-gke-21 } -gh-status-set-pending-e2e-gke-27: &gh-status-set-pending-e2e-gke-27 + params: { state: pending, context: end-to-end-tests/run-e2e-test-gke-lowest } +gh-status-set-pending-e2e-gke-latest: &gh-status-set-pending-e2e-gke-latest put: gh-status inputs: [pipeline-source] - params: { state: pending, context: end-to-end-tests/run-e2e-test-gke-27 } + params: { state: pending, context: end-to-end-tests/run-e2e-test-gke-latest } # gh-status-set-pending-e2e-openshift: &gh-status-set-pending-e2e-openshift # put: gh-status # inputs: [ pipeline-source ] @@ -569,17 +569,17 @@ jobs: - load_var: git-commit file: pipeline-source/.git/short_ref reveal: true - - <<: *gh-status-set-pending-e2e-gke-21 - - <<: *gh-status-set-pending-e2e-gke-27 + - <<: *gh-status-set-pending-e2e-gke-lowest + - <<: *gh-status-set-pending-e2e-gke-latest # - <<: *gh-status-set-pending-e2e-openshift - in_parallel: - do: - - put: gke-21 + - put: gke-lowest inputs: detect resource: test-clusters params: - claim: gke-21 - - task: run-e2e-test-gke-21 + claim: gke-lowest + - task: run-e2e-test-gke-lowest timeout: 30m attempts: 1 config: &gke-e2e-test-config @@ -593,9 +593,9 @@ jobs: password: ((project-berlin-tests-gcp-instana-qa)) params: GIT_COMMIT: ((.:git-commit)) - CLUSTER_INFO: '{ "name": "project-berlin-21", "zone": "us-central1-c", "project": "instana-agent-qa" }' + CLUSTER_INFO: '{ "name": "project-berlin-lowest", "zone": "us-central1", "project": "instana-agent-qa" }' CLUSTER_TYPE: gke - NAME: gke-21 + NAME: gke-lowest GCP_KEY_JSON: ((project-berlin-tests-gcp-instana-qa)) INSTANA_ENDPOINT_HOST: ((instana-qa.endpoint_host)) INSTANA_ENDPOINT_PORT: 443 @@ -619,7 +619,7 @@ jobs: params: { state: success, - context: end-to-end-tests/run-e2e-test-gke-21, + context: end-to-end-tests/run-e2e-test-gke-lowest, } on_failure: put: gh-status @@ -627,7 +627,7 @@ jobs: params: { state: failure, - context: end-to-end-tests/run-e2e-test-gke-21, + context: end-to-end-tests/run-e2e-test-gke-lowest, } on_error: put: gh-status @@ -635,7 +635,7 @@ jobs: params: { state: error, - context: end-to-end-tests/run-e2e-test-gke-21, + context: end-to-end-tests/run-e2e-test-gke-lowest, } on_abort: put: gh-status @@ -643,7 +643,7 @@ jobs: params: { state: error, - context: end-to-end-tests/run-e2e-test-gke-21, + context: end-to-end-tests/run-e2e-test-gke-lowest, } ensure: do: @@ -653,9 +653,9 @@ jobs: platform: linux image_resource: *e2e-test-image-resource params: - CLUSTER_INFO: '{ "name": "project-berlin-21", "zone": "us-central1-c", "project": "instana-agent-qa" }' + CLUSTER_INFO: '{ "name": "project-berlin-lowest", "zone": "us-central1", "project": "instana-agent-qa" }' CLUSTER_TYPE: gke - NAME: gke-21 + NAME: gke-lowest GCP_KEY_JSON: ((project-berlin-tests-gcp-instana-qa)) inputs: - name: pipeline-source @@ -664,24 +664,24 @@ jobs: - put: test-clusters inputs: detect params: - release: gke-21 + release: gke-lowest - do: - - put: gke-27 + - put: gke-latest inputs: detect resource: test-clusters params: - claim: gke-27 - - task: run-e2e-test-gke-27 + claim: gke-latest + - task: run-e2e-test-gke-latest timeout: 30m attempts: 1 config: <<: *gke-e2e-test-config params: GIT_COMMIT: ((.:git-commit)) - CLUSTER_INFO: '{ "name": "project-berlin-27", "zone": "us-central1-c", "project": "instana-agent-qa" }' + CLUSTER_INFO: '{ "name": "project-berlin-latest", "zone": "us-central1", "project": "instana-agent-qa" }' CLUSTER_TYPE: gke - NAME: gke-27 + NAME: gke-latest GCP_KEY_JSON: ((project-berlin-tests-gcp-instana-qa)) INSTANA_ENDPOINT_HOST: ((instana-qa.endpoint_host)) INSTANA_ENDPOINT_PORT: 443 @@ -708,7 +708,7 @@ jobs: params: { state: success, - context: end-to-end-tests/run-e2e-test-gke-27, + context: end-to-end-tests/run-e2e-test-gke-latest, } on_failure: put: gh-status @@ -716,7 +716,7 @@ jobs: params: { state: failure, - context: end-to-end-tests/run-e2e-test-gke-27, + context: end-to-end-tests/run-e2e-test-gke-latest, } on_error: put: gh-status @@ -724,7 +724,7 @@ jobs: params: { state: error, - context: end-to-end-tests/run-e2e-test-gke-27, + context: end-to-end-tests/run-e2e-test-gke-latest, } on_abort: put: gh-status @@ -732,7 +732,7 @@ jobs: params: { state: error, - context: end-to-end-tests/run-e2e-test-gke-27, + context: end-to-end-tests/run-e2e-test-gke-latest, } ensure: do: @@ -742,9 +742,9 @@ jobs: platform: linux image_resource: *e2e-test-image-resource params: - CLUSTER_INFO: '{ "name": "project-berlin-27", "zone": "us-central1-c", "project": "instana-agent-qa" }' + CLUSTER_INFO: '{ "name": "project-berlin-latest", "zone": "us-central1", "project": "instana-agent-qa" }' CLUSTER_TYPE: gke - NAME: gke-27 + NAME: gke-latest GCP_KEY_JSON: ((project-berlin-tests-gcp-instana-qa)) inputs: @@ -754,7 +754,7 @@ jobs: - put: test-clusters inputs: detect params: - release: gke-27 + release: gke-latest # - do: # - put: openshift-4.11 # inputs: detect