diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-09-28 15:09:31 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2018-09-28 15:09:31 -0400 |
| commit | fca363d44c64cbdf5484f30c21d901de5ee8c368 (patch) | |
| tree | 33990653f124df5c48c41f3221f295c3dc482f20 /jjb/apex/apex-deploy.sh | |
| parent | f836a454d1ef4ac2375dd13694227764af433755 (diff) | |
Apex: Fixes branch checking
With the move to upstream artifacts post-fraser the checks to use
upstream artifacts were relying on BRANCH == 'master'. This doesn't
scale as we preserve fraser functionality but add more branches like
gambia. Therefore inversing the logic to accomodate for new branches.
Change-Id: Ice17f6afd33744f44d253d320a194c3f6d02d8bf
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'jjb/apex/apex-deploy.sh')
| -rwxr-xr-x | jjb/apex/apex-deploy.sh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh index 441bf9059..1bc727d32 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -29,7 +29,7 @@ if [[ "$ARTIFACT_VERSION" =~ dev ]]; then # we want to use that built in mechanism to avoid re-downloading every job # so we use a dedicated folder to hold the upstream cache UPSTREAM_CACHE=$HOME/upstream_cache - if [ "$BRANCH" == 'master' ]; then + if [[ "$BRANCH" != 'stable/fraser' ]]; then mkdir -p ${UPSTREAM_CACHE} RESOURCES=$UPSTREAM_CACHE else @@ -55,7 +55,7 @@ else # set to use different directory here because upon RPM removal this # directory will be wiped in daily UPSTREAM_CACHE=$HOME/upstream_cache - if [ "$BRANCH" == 'master' ]; then + if [[ "$BRANCH" != 'stable/fraser' ]]; then mkdir -p ${UPSTREAM_CACHE} RESOURCES=$UPSTREAM_CACHE else @@ -161,11 +161,6 @@ else DEPLOY_CMD="${DEPLOY_CMD} -i ${INVENTORY_FILE}" fi -if [[ "$BRANCH" == "master" ]]; then - echo "Upstream deployment detected" - DEPLOY_CMD="${DEPLOY_CMD} --upstream" -fi - if [ "$IPV6_FLAG" == "True" ]; then NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings_v6.yaml" elif [[ "$PROMOTE" == "True" ]]; then |