UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit b5fc840a authored by Branden Cobb's avatar Branden Cobb Committed by Micah Nagel
Browse files

Upgrade job to use merge branch

parent 7e8279c1
No related branches found
No related tags found
1 merge request!920Upgrade job to use merge branch
......@@ -156,9 +156,9 @@ upgrade:
variables:
CLUSTER_NAME: "upgrade-${CI_COMMIT_SHORT_SHA}"
script:
- echo "Install Big Bang from ${CI_DEFAULT_BRANCH}"
- echo "Install Big Bang from ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}"
- echo -e "\e[0Ksection_start:`date +%s`:git_master[collapsed=true]\r\e[0K\e[33;1mGit Fetch Master\e[37m"
- git fetch && git checkout ${CI_DEFAULT_BRANCH}
- git fetch && git checkout ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}
- echo -e "\e[0Ksection_end:`date +%s`:git_master\r\e[0K"
- *deploy_bigbang
- *test_bigbang
......
......@@ -42,6 +42,9 @@ helm upgrade -i bigbang chart -n bigbang --create-namespace \
if [[ $(git branch --show-current) == "${CI_DEFAULT_BRANCH}" ]]; then
echo "Deploying secrets from the ${CI_DEFAULT_BRANCH} branch"
kubectl apply -f tests/ci/shared-secrets.yaml
elif [[ $(git branch --show-current) == "${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}" ]]; then
echo "Deploying secrets from the ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME} branch"
cat tests/ci/shared-secrets.yaml | sed 's|master|'"$CI_MERGE_REQUEST_TARGET_BRANCH_NAME"'|g' | kubectl apply -f -
elif [ -z "$CI_COMMIT_TAG" ]; then
echo "Deploying secrets from the ${CI_COMMIT_REF_NAME} branch"
cat tests/ci/shared-secrets.yaml | sed 's|master|'"$CI_COMMIT_REF_NAME"'|g' | kubectl apply -f -
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment