Commit 7e5dad75 authored by Mikhail Piatliou (EPAM)'s avatar Mikhail Piatliou (EPAM)
Browse files

GONRG-4968: finalized changes

parent 7e2c4259
Pipeline #110448 failed with stages
in 76 minutes and 34 seconds
...@@ -62,7 +62,6 @@ include: ...@@ -62,7 +62,6 @@ include:
file: "cloud-providers/azure.yml" file: "cloud-providers/azure.yml"
- project: "osdu/platform/ci-cd-pipelines" - project: "osdu/platform/ci-cd-pipelines"
ref: "gcp-int-tests-anthos"
file: "cloud-providers/osdu-gcp-gke.yml" file: "cloud-providers/osdu-gcp-gke.yml"
- local: "devops/gcp/pipeline/override-stages.yml" - local: "devops/gcp/pipeline/override-stages.yml"
......
...@@ -4,7 +4,7 @@ variables: ...@@ -4,7 +4,7 @@ variables:
OSDU_GCP_VENDOR: gcp OSDU_GCP_VENDOR: gcp
OSDU_GCP_HELM_CONFIG_SERVICE: schema-config OSDU_GCP_HELM_CONFIG_SERVICE: schema-config
OSDU_GCP_HELM_DEPLOYMENT_SERVICE: schema-deploy OSDU_GCP_HELM_DEPLOYMENT_SERVICE: schema-deploy
OSDU_GCP_HELM_TIMEOUT: "--timeout 20m" OSDU_GCP_HELM_TIMEOUT: "--timeout 15m"
OSDU_GCP_HELM_CONFIG_SERVICE_VARS: > OSDU_GCP_HELM_CONFIG_SERVICE_VARS: >
--set data.log_level=INFO --set data.log_level=INFO
--set data.google_audiences=$GOOGLE_AUDIENCE --set data.google_audiences=$GOOGLE_AUDIENCE
...@@ -24,6 +24,14 @@ variables: ...@@ -24,6 +24,14 @@ variables:
# FIXME add value below for DEV2 pipeline # FIXME add value below for DEV2 pipeline
# OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2: > # OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS_DEV2: >
osdu-gcp-containerize-bootstrap-gitlab:
variables:
BUILD_PATH: devops/$OSDU_GCP_VENDOR/bootstrap-osdu-module/Dockerfile
osdu-gcp-containerize-bootstrap-gcr:
variables:
BUILD_PATH: devops/$OSDU_GCP_VENDOR/bootstrap-osdu-module/Dockerfile
# REFACTOR to common pipeline # REFACTOR to common pipeline
osdu-gcp-deploy-deployment: osdu-gcp-deploy-deployment:
needs: needs:
...@@ -55,6 +63,12 @@ osdu-gcp-deploy-deployment: ...@@ -55,6 +63,12 @@ osdu-gcp-deploy-deployment:
# - echo $STATUS # - echo $STATUS
# - if [[ "$STATUS" != *"met"* ]]; then echo "POD didn't start correctly" ; exit 1 ; fi # - if [[ "$STATUS" != *"met"* ]]; then echo "POD didn't start correctly" ; exit 1 ; fi
osdu-gcp-anthos-deploy-deployment:
needs:
- osdu-gcp-containerize-gitlab
- osdu-gcp-containerize-bootstrap-gitlab
- osdu-gcp-anthos-deploy-configmap
osdu-gcp-test: osdu-gcp-test:
script: script:
- $MAVEN_BUILD . test-results.log verify -q -f testing/schema-test-core/pom.xml - $MAVEN_BUILD . test-results.log verify -q -f testing/schema-test-core/pom.xml
...@@ -91,17 +105,3 @@ osdu-gcp-anthos-test: ...@@ -91,17 +105,3 @@ osdu-gcp-anthos-test:
reports: reports:
junit: junit:
- testing/schema-test-core/target/*/TEST-*.xml - testing/schema-test-core/target/*/TEST-*.xml
osdu-gcp-containerize-bootstrap-gitlab:
variables:
BUILD_PATH: devops/$OSDU_GCP_VENDOR/bootstrap-osdu-module/Dockerfile
osdu-gcp-containerize-bootstrap-gcr:
variables:
BUILD_PATH: devops/$OSDU_GCP_VENDOR/bootstrap-osdu-module/Dockerfile
osdu-gcp-anthos-deploy-deployment:
needs:
- osdu-gcp-containerize-gitlab
- osdu-gcp-containerize-bootstrap-gitlab
- osdu-gcp-anthos-deploy-configmap
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