Commit f9eef68e authored by Oleksandr Kosse (EPAM)'s avatar Oleksandr Kosse (EPAM)
Browse files

Merge branch 'dev2' into 'master'

(GONRG-4189) Update .gitlab-ci.yml

See merge request !137
parents 6d34c365 e9078b59
Pipeline #88906 failed with stages
in 18 minutes and 40 seconds
...@@ -22,6 +22,7 @@ variables: ...@@ -22,6 +22,7 @@ variables:
OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap" OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap"
OSDU_GCP_HELM_NAMESPACE: default OSDU_GCP_HELM_NAMESPACE: default
OSDU_GCP_HELM_CONFIG_SERVICE_VARS: "--set data.partition_admin_accounts=$OSDU_GCP_PARTITION_ADMIN_ACCOUNTS --set data.google_cloud_project=$OSDU_GCP_PROJECT --set data.google_audiences=$GOOGLE_AUDIENCE --set data.log_level=INFO --set data.key_ring=$OSDU_GCP_PARTITION_KEY_RING --set data.kms_key=$OSDU_GCP_PARTITION_KMS_KEY" OSDU_GCP_HELM_CONFIG_SERVICE_VARS: "--set data.partition_admin_accounts=$OSDU_GCP_PARTITION_ADMIN_ACCOUNTS --set data.google_cloud_project=$OSDU_GCP_PROJECT --set data.google_audiences=$GOOGLE_AUDIENCE --set data.log_level=INFO --set data.key_ring=$OSDU_GCP_PARTITION_KEY_RING --set data.kms_key=$OSDU_GCP_PARTITION_KMS_KEY"
OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: "--set data.partition_admin_accounts=$OSDU_GCP_PARTITION_ADMIN_ACCOUNTS_DEV2 --set data.google_cloud_project=$OSDU_GCP_PROJECT --set data.google_audiences=$GOOGLE_AUDIENCE --set data.log_level=INFO --set data.key_ring=$OSDU_GCP_PARTITION_KEY_RING --set data.kms_key=$OSDU_GCP_PARTITION_KMS_KEY"
OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$OSDU_GCP_SERVICE-k8s" OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=$OSDU_GCP_SERVICE-k8s"
OSDU_GCP_HELM_CONFIG_SERVICE: partition-config OSDU_GCP_HELM_CONFIG_SERVICE: partition-config
OSDU_GCP_HELM_DEPLOYMENT_SERVICE: partition-deploy OSDU_GCP_HELM_DEPLOYMENT_SERVICE: partition-deploy
...@@ -57,3 +58,7 @@ include: ...@@ -57,3 +58,7 @@ include:
osdu-gcp-test: osdu-gcp-test:
variables: variables:
CLIENT_TENANT: osdu CLIENT_TENANT: osdu
osdu-gcp-dev2-test:
variables:
CLIENT_TENANT: devtwo
This diff is collapsed.
...@@ -12,3 +12,4 @@ data: ...@@ -12,3 +12,4 @@ data:
KEY_RING: "{{ .Values.data.key_ring }}" KEY_RING: "{{ .Values.data.key_ring }}"
KMS_KEY: "{{ .Values.data.kms_key }}" KMS_KEY: "{{ .Values.data.kms_key }}"
LOG_LEVEL: "{{ .Values.data.log_level }}" LOG_LEVEL: "{{ .Values.data.log_level }}"
SERVICE_ACCOUNT_TAIL: "{{ .Values.data.service_account_tail }}"
...@@ -5,6 +5,8 @@ data: ...@@ -5,6 +5,8 @@ data:
key_ring: "" key_ring: ""
kms_key: "" kms_key: ""
log_level: "INFO" log_level: "INFO"
service_account_tail: ".iam.gserviceaccount.com"
conf: conf:
configmap: "partition-config" configmap: "partition-config"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment