Skip to content
Snippets Groups Projects
Commit bcbd8af7 authored by Oleksandr Kosse (EPAM)'s avatar Oleksandr Kosse (EPAM)
Browse files

Merge branch 'GONRG-5943' into 'master'

fix: remove unused configmap variable

See merge request !611
parents c2b6c45d ac406ae2
No related branches found
No related tags found
1 merge request!611fix: remove unused configmap variable
Pipeline #161607 failed
......@@ -6,7 +6,6 @@ variables:
sdms-osdu-gcp-helm-charts-master:
extends: .osdu-gcp-helm-charts-master
variables:
SEISMIC_OSDU_GCP_HELM_CONFIG_DIR: "app/sdms/devops/gcp/configmap"
SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/sdms/devops/gcp/deploy"
SEISMIC_OSDU_GCP_SERVICE: seismic-store
IMAGE_NAME: osdu-gcp-$SEISMIC_OSDU_GCP_SERVICE
......@@ -14,7 +13,6 @@ sdms-osdu-gcp-helm-charts-master:
sdms-osdu-gcp-helm-charts-release:
extends: .osdu-gcp-helm-charts-release
variables:
SEISMIC_OSDU_GCP_HELM_CONFIG_DIR: "app/sdms/devops/gcp/configmap"
SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/sdms/devops/gcp/deploy"
SEISMIC_OSDU_GCP_SERVICE: seismic-store
IMAGE_NAME: osdu-gcp-$SEISMIC_OSDU_GCP_SERVICE
......@@ -62,26 +60,6 @@ sdms-osdu-gcp-containerize-gcr:
- devops/**/*
- app/sdms/**/*
sdms-osdu-gcp-dev2-deploy-configmap:
extends: .osdu-gcp-dev2-deploy-configmap
needs: ["sdms-osdu-gcp-containerize-gitlab"]
variables:
SEISMIC_OSDU_GCP_HELM_CONFIG_SERVICE: seismic-store-configmap
SEISMIC_OSDU_GCP_HELM_CONFIG_DIR: "app/sdms/devops/gcp/configmap"
SEISMIC_OSDU_GCP_SERVICE: seismic-store
SEISMIC_OSDU_GCP_CHART: gcp-seismic-store-sdms-configmap #var used only in release and tagged pipelines
rules:
- if: '$OSDU_GCP == "1" && $CI_COMMIT_BRANCH =~ /^release/'
when: on_success
changes:
- devops/**/*
- app/sdms/**/*
- if: '$OSDU_GCP == "1" && $CI_COMMIT_TAG'
when: on_success
changes:
- devops/**/*
- app/sdms/**/*
sdms-osdu-gcp-deployment:
extends: .osdu-gcp-deployment
needs: ["sdms-osdu-gcp-containerize-gitlab"]
......@@ -102,7 +80,7 @@ sdms-osdu-gcp-deployment:
sdms-osdu-gcp-dev2-deploy-deployment:
extends: .osdu-gcp-dev2-deploy-deployment
needs: ["sdms-osdu-gcp-containerize-gitlab", "sdms-osdu-gcp-dev2-deploy-configmap"]
needs: ["sdms-osdu-gcp-containerize-gitlab"]
variables:
SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_SERVICE: seismic-store-deploy
SEISMIC_OSDU_GCP_HELM_DEPLOYMENT_DIR: "app/sdms/devops/gcp/deploy"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment