Commit 83d33d26 authored by Elizabeth Halper's avatar Elizabeth Halper
Browse files

Merge branch 'azure/m10-master' into 'Azure/OSDU-Seismic-DDMS-M8-Master'

# Conflicts:
#   app/sdms/devops/osdu/cloud-providers/ibm.yml
parents 8bd35361 502936f8
Pipeline #104221 passed with stages
in 14 minutes and 2 seconds
......@@ -2,6 +2,7 @@ include:
# pipeline logic
- project: "osdu/platform/ci-cd-pipelines"
file: "standard-setup.yml"
ref: release/0.13
# global
# scanners
......
......@@ -72,20 +72,5 @@ sdms_ibm-preship-promote:
- oc login --token=$IBM_PRESHIP_OPENSHIFT_TOKEN --server=$IBM_PRESHIP_OPENSHIFT_URL
- oc project $IBM_OPENSHIFT_PRESHIP_PROJECT
- oc start-build og-$SDMS_PROJECT_NAME-ibm
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
changes:
- devops/**/*
- app/sdms/**/*
sdms_ibm-preship-promote-release:
extends: .ibm-preship-promote-release
stage: publish
needs: ['sdms_ibm-test-py']
script:
- cd app/$SDMS_SERVICE
- oc login --token=$IBM_PRESHIP_OPENSHIFT_TOKEN --server=$IBM_PRESHIP_OPENSHIFT_URL
- oc project $IBM_OPENSHIFT_PRESHIP_PROJECT
- oc start-build og-$SDMS_PROJECT_NAME-monthly-ibm --commit=$CI_COMMIT_SHA --follow
rules:
- if: '$CI_COMMIT_BRANCH == $IBM_PRESHIP_RELEASE_BRANCH'
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