diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f98022922ef6fc7455baa27a23d0476c2745034..b648c4223d4fed0b343333b0037777928caa4d11 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,25 +16,6 @@ variables: GCP_DOMAIN: cloud.slb-ds.com GCP_STORAGE_URL: https://osdu-indexer-dot-opendes.appspot.com/api/storage/v2/ - OSDU_GCP_SERVICE: indexer - OSDU_GCP_VENDOR: gcp - OSDU_GCP_HELM_CONFIG_SERVICE_VARS: > - --set data.log_level=INFO - --set data.redis_search_host=$REDIS_SEARCH_HOST - --set data.redis_group_host=$REDIS_GROUP_HOST - --set data.google_audiences=$GOOGLE_AUDIENCE - OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: > - --set data.log_level=INFO - --set data.redis_search_host=$REDIS_SEARCH_HOST - --set data.redis_group_host=$REDIS_GROUP_HOST - --set data.google_audiences=$GOOGLE_AUDIENCE - OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: > - --set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA - --set data.serviceAccountName=$OSDU_GCP_SERVICE-k8s - OSDU_GCP_HELM_CONFIG_SERVICE: indexer-config - OSDU_GCP_HELM_DEPLOYMENT_SERVICE: indexer-deploy - OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap" - IBM_BUILD_SUBDIR: provider/indexer-ibm IBM_INT_TEST_SUBDIR: testing/indexer-test-ibm @@ -73,5 +54,7 @@ include: - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/osdu-gcp-gke.yml" + - local: "devops/gcp/pipeline/override-stages.yml" + aws-test-java: tags: ["aws-internal-test"] diff --git a/devops/gcp/pipeline/override-stages.yml b/devops/gcp/pipeline/override-stages.yml new file mode 100644 index 0000000000000000000000000000000000000000..40cb2632357c0db3e0976a3ddc34789c7cf918bc --- /dev/null +++ b/devops/gcp/pipeline/override-stages.yml @@ -0,0 +1,19 @@ +variables: + OSDU_GCP_SERVICE: indexer + OSDU_GCP_VENDOR: gcp + OSDU_GCP_HELM_CONFIG_SERVICE_VARS: > + --set data.log_level=INFO + --set data.redis_search_host=$REDIS_SEARCH_HOST + --set data.redis_group_host=$REDIS_GROUP_HOST + --set data.google_audiences=$GOOGLE_AUDIENCE + OSDU_GCP_HELM_CONFIG_SERVICE_VARS_DEV2: > + --set data.log_level=INFO + --set data.redis_search_host=$REDIS_SEARCH_HOST + --set data.redis_group_host=$REDIS_GROUP_HOST + --set data.google_audiences=$GOOGLE_AUDIENCE + OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: > + --set data.image=$CI_REGISTRY_IMAGE/osdu-gcp-$OSDU_GCP_SERVICE:$CI_COMMIT_SHORT_SHA + --set data.serviceAccountName=$OSDU_GCP_SERVICE-k8s + OSDU_GCP_HELM_CONFIG_SERVICE: indexer-config + OSDU_GCP_HELM_DEPLOYMENT_SERVICE: indexer-deploy + OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap"