Commit f1fd1c9d authored by Sanjeev-SLB's avatar Sanjeev-SLB
Browse files

rebase

parents 5fcb58e0 b4a1fa79
Pipeline #70295 failed with stages
in 1 minute and 18 seconds
variables:
OSDU_GCP_APPLICATION_NAME: os-notification
OSDU_GCP_CLOUD_RUN_PARAMETERS: "--min-instances=1"
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_ENV_VARS: APP_PROJECT=$OSDU_GCP_PROJECT,APP_ENTITLEMENTS=$OSDU_GCP_ENTITLEMENTS_V2_URL,APP_REGISTER=$OSDU_GCP_REGISTER_BASE_URL,APP_GOOGLEAUDIENCE=$GOOGLE_AUDIENCE,PARTITION_API=$OSDU_GCP_PARTITION_API,GOOGLE_AUDIENCES=$GOOGLE_AUDIENCE
OSDU_GCP_ENVIRONMENT: dev_gke
OSDU_GCP_LOG_LEVEL: INFO
OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap"
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: "notification-config"
OSDU_GCP_HELM_DEPLOYMENT_SERVICE: "notification-deploy"
AWS_BUILD_SUBDIR: provider/notification-aws/build-aws
AWS_TEST_SUBDIR: testing/notification-test-aws
......@@ -47,7 +52,7 @@ include:
- project: "osdu/platform/ci-cd-pipelines"
ref: "master"
file: "cloud-providers/osdu-gcp-cloudrun.yml"
file: "cloud-providers/osdu-gcp-gke.yml"
- project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/aws.yml"
......@@ -59,4 +64,3 @@ osdu-gcp-test:
variables:
ENVIRONMENT: $OSDU_GCP_ENVIRONMENT
REGISTER_BASE_URL: $OSDU_GCP_REGISTER_BASE_URL
allow_failure: true
......@@ -82,8 +82,8 @@ The following software have components provided under the terms of this license:
- Gson (from https://repo1.maven.org/maven2/com/google/code/gson/gson)
- Guava InternalFutureFailureAccess and InternalFutures (from https://repo1.maven.org/maven2/com/google/guava/failureaccess)
- Guava InternalFutureFailureAccess and InternalFutures (from https://repo1.maven.org/maven2/com/google/guava/failureaccess)
- Guava: Google Core Libraries for Java (from https://github.com/google/guava)
- Guava: Google Core Libraries for Java (from https://github.com/google/guava)
- Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava)
- Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava)
- HPPC Collections (from https://repo1.maven.org/maven2/com/carrotsearch/hppc)
- HTTP functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty)
- Hibernate Validator Engine (from https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator)
......@@ -302,6 +302,10 @@ The following software have components provided under the terms of this license:
- nio-stream-storage (from https://github.com/synchronoss/nio-stream-storage)
- okhttp (from https://github.com/square/okhttp)
- okhttp (from https://github.com/square/okhttp)
<<<<<<< HEAD
=======
- okhttp-logging-interceptor (from https://square.github.io/okhttp/)
>>>>>>> b4a1fa79b20be9c429413db5f48ddacc46cedc26
- okhttp-urlconnection (from https://github.com/square/okhttp)
- okhttp-urlconnection (from https://github.com/square/okhttp)
- org.apiguardian:apiguardian-api (from https://github.com/apiguardian-team/apiguardian)
......@@ -319,14 +323,21 @@ The following software have components provided under the terms of this license:
- proto-google-common-protos (from https://github.com/googleapis/java-iam/proto-google-common-protos)
- proto-google-iam-v1 (from https://github.com/googleapis/java-iam/proto-google-iam-v1)
- rank-eval (from https://github.com/elastic/elasticsearch)
- resilience4j (from https://github.com/resilience4j/resilience4j)
- resilience4j (from https://resilience4j.readme.io)
- resilience4j (from https://resilience4j.readme.io)
- resilience4j (from https://resilience4j.readme.io)
- resilience4j (from https://github.com/resilience4j/resilience4j)
<<<<<<< HEAD
- resilience4j (from https://github.com/resilience4j/resilience4j)
- resilience4j (from https://resilience4j.readme.io)
- resilience4j (from https://github.com/resilience4j/resilience4j)
- resilience4j (from https://resilience4j.readme.io)
=======
- resilience4j (from https://resilience4j.readme.io)
- resilience4j (from https://resilience4j.readme.io)
- resilience4j (from https://github.com/resilience4j/resilience4j)
>>>>>>> b4a1fa79b20be9c429413db5f48ddacc46cedc26
- rest (from https://github.com/elastic/elasticsearch)
- rest-high-level (from https://github.com/elastic/elasticsearch)
- rxjava (from https://github.com/ReactiveX/RxJava)
......@@ -775,8 +786,8 @@ public-domain
The following software have components provided under the terms of this license:
- Asynchronous Http Client (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client)
- Guava: Google Core Libraries for Java (from https://github.com/google/guava)
- Guava: Google Core Libraries for Java (from https://github.com/google/guava)
- Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava)
- Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava)
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
- Joda-Time (from https://www.joda.org/joda-time/)
- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
......@@ -806,5 +817,3 @@ The following software have components provided under the terms of this license:
- JUnit Platform Commons (from https://junit.org/junit5/)
- JUnit Platform Engine API (from https://junit.org/junit5/)
- Spongy Castle (from http://rtyley.github.io/spongycastle/)
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