Commit 5245bd75 authored by Nikhil Singh[MicroSoft]'s avatar Nikhil Singh[MicroSoft]
Browse files

Merge branch 'master'

parents 36f30a8d 65d22adf
Pipeline #73283 failed with stages
in 25 minutes and 15 seconds
variables:
OSDU_GCP_APPLICATION_NAME: notification
OSDU_GCP_VENDOR: gcp
OSDU_GCP_SERVICE: notification
OSDU_GCP_REGISTER_BASE_URL: https://os-register-attcrcktoa-uc.a.run.app/api/register/v1
OSDU_GCP_ENVIRONMENT: dev_gke
OSDU_GCP_LOG_LEVEL: INFO
OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap"
OSDU_GCP_VENDOR: gcp
OSDU_GCP_HELM_DEPLOYMENT_DIR: "devops/gcp/deploy"
OSDU_GCP_HELM_CONFIG_DIR: "devops/gcp/configmap"
OSDU_GCP_HELM_NAMESPACE: "default"
OSDU_GCP_HELM_CONFIG_SERVICE_VARS: " --set data.log_level=$OSDU_GCP_LOG_LEVEL --set data.app_project=$OSDU_GCP_PROJECT --set data.app_googleaudience=$GOOGLE_AUDIENCE --set data.google_audiences=$GOOGLE_AUDIENCE --set data.app_register=$OSDU_GCP_REGISTER_BASE_URL"
OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=workload-identity-notification --set data.app_name=$OSDU_GCP_SERVICE"
OSDU_GCP_HELM_CONFIG_SERVICE_VARS: " --set data.log_level=$OSDU_GCP_LOG_LEVEL --set data.app_project=$OSDU_GCP_PROJECT --set data.app_googleaudience=$GOOGLE_AUDIENCE --set data.google_audiences=$GOOGLE_AUDIENCE --set data.app_register=$OSDU_GCP_REGISTER_API"
OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=workload-identity-notification"
OSDU_GCP_HELM_CONFIG_SERVICE: "notification-config"
OSDU_GCP_HELM_DEPLOYMENT_SERVICE: "notification-deploy"
OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap"
AWS_BUILD_SUBDIR: provider/notification-aws/build-aws
AWS_TEST_SUBDIR: testing/notification-test-aws
......@@ -51,7 +47,6 @@ include:
file: "cloud-providers/azure.yml"
- project: "osdu/platform/ci-cd-pipelines"
ref: "master"
file: "cloud-providers/osdu-gcp-gke.yml"
- project: "osdu/platform/ci-cd-pipelines"
......
This diff is collapsed.
......@@ -44,7 +44,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-lib-ibm</artifactId>
<version>0.9.0</version>
<version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
......
......@@ -33,7 +33,7 @@
<java.version>8</java.version>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.source>${java.version}</maven.compiler.source>
<os-core-lib-ibm.version>0.7.0</os-core-lib-ibm.version>
<os-core-lib-ibm.version>0.12.0-SNAPSHOT</os-core-lib-ibm.version>
</properties>
<dependencies>
......
Markdown is supported
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