Commit 6e901f7f authored by David Diederich's avatar David Diederich
Browse files

Merge remote-tracking branch 'origin/master' into restore-fossa-ci

parents 69361319 6c16e609
Pipeline #87438 failed with stages
in 31 minutes and 56 seconds
......@@ -131,9 +131,6 @@ osdu-gcp-containerize-gitlab:
image: docker:19.03
cache: {}
tags: ["osdu-medium"]
only:
variables:
- $OSDU_GCP == 'true'
variables:
IMAGE_TAG: $CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA
IMAGE_TAG_LATEST: $CI_REGISTRY_IMAGE/osdu-gcp:latest
......@@ -195,9 +192,6 @@ osdu-gcp-test-python:
stage: integration
image: gcr.io/google.com/cloudsdktool/cloud-sdk
needs: ["osdu-gcp-deploy-deployment"]
only:
variables:
- $OSDU_GCP == 'true' && $OSDU_GCP_INT_TEST_TYPE == 'python'
script:
- apt-get install -y python3-venv
- python3 -m venv env
......@@ -227,6 +221,10 @@ osdu-gcp-test:
extends:
- .osdu-gcp-variables
osdu-gcp-dev2-test:
extends:
- .osdu-gcp-dev2-variables
# Allow failure on private development deployments
ibm-deploy-devpri:
allow_failure: true
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