Commit b517bb9f authored by Morris Estepa's avatar Morris Estepa
Browse files

Merge branch 'master' into master-dev-merge

parents b317b2d9 c37cda17
Pipeline #89080 failed with stages
in 30 minutes
......@@ -18,6 +18,7 @@ variables:
OSDU_GCP_TEST_SUBDIR: testing/$OSDU_GCP_SERVICE-test-$OSDU_GCP_VENDOR
OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap"
OSDU_GCP_HELM_CONFIG_SERVICE_VARS: "--set data.google_audiences=$GOOGLE_AUDIENCE --set data.redis_group_host=$REDIS_GROUP_HOST --set data.file_dms_bucket=$OSDU_GCP_FILE_DMS_BUCKET --set data.expiration_days=$OSDU_GCP_EXPIRATION_DAYS"
OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: "--set data.google_audiences=$GOOGLE_AUDIENCE --set data.redis_group_host=$REDIS_GROUP_HOST --set data.file_dms_bucket=$OSDU_GCP_FILE_DMS_BUCKET --set data.expiration_days=$OSDU_GCP_EXPIRATION_DAYS"
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: dataset-config
OSDU_GCP_HELM_DEPLOYMENT_SERVICE: dataset-deploy
......@@ -72,4 +73,19 @@ osdu-gcp-test:
KIND_SUBTYPE: DatasetTest
LEGAL_TAG: datatest-int-tag
LEGAL_HOST: $OSDU_GCP_LEGAL_EXTERNAL_URL
GCP_STORAGE_PERSISTENT_AREA: persisten-area
GCP_STORAGE_PERSISTENT_AREA: persistent-area
GCP_DEPLOY_FILE: $OSDU_GCP_DEPLOY_FILE
osdu-gcp-dev2-test:
variables:
STORAGE_BASE_URL: $OSDU_GCP_STORAGE_EXTERNAL_URL
LEGAL_BASE_URL: $OSDU_GCP_LEGAL_EXTERNAL_URL
DATASET_BASE_URL: $OSDU_GCP_DATASET_EXTERNAL_URL
SCHEMA_API: $OSDU_GCP_SCHEMA_URL
PROVIDER_KEY: GCP
KIND_SUBTYPE: DatasetTest
LEGAL_TAG: datatest-int-tag
LEGAL_HOST: $OSDU_GCP_LEGAL_EXTERNAL_URL
GCP_STORAGE_PERSISTENT_AREA: persistent-area
GCP_DEPLOY_FILE: $OSDU_GCP_DEPLOY_FILE
This diff is collapsed.
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