From 35c78035f80555eafea1275bdac5d0d4382393ba Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Wed, 11 Mar 2020 08:56:01 -0400 Subject: [PATCH] Allow vendor change (try #2) Quick-build: true Skip-checkpatch: true Skip-run_test: true Signed-off-by: Brian J. Murrell --- utils/docker/Dockerfile.leap.15 | 46 ++++++++++++++++----------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/utils/docker/Dockerfile.leap.15 b/utils/docker/Dockerfile.leap.15 index 070169caec5..56ac0f28d1f 100644 --- a/utils/docker/Dockerfile.leap.15 +++ b/utils/docker/Dockerfile.leap.15 @@ -96,29 +96,29 @@ ARG QUICKBUILD=false ARG QUICKBUILD_DEPS="" ARG CART_COMMIT="" ARG REPOS="" -RUN if $QUICKBUILD; then \ - zypper --non-interactive addrepo --no-gpgcheck \ - http://repo.dc.hpdd.intel.com/repository/daos-stack-leap-15-x86_64-stable-local/ daos-local; \ - zypper --non-interactive addrepo --no-gpgcheck \ - http://repo.dc.hpdd.intel.com/repository/daos-stack-external-leap-15-x86_64-stable-group/ leap15; \ - for repo in $REPOS; do \ - branch="master"; \ - build_number="lastSuccessfulBuild"; \ - if [[ $repo = *@* ]]; then \ - branch="${repo#*@}"; \ - repo="${repo%@*}"; \ - if [[ $branch = *:* ]]; then \ - build_number="${branch#*:}"; \ - branch="${branch%:*}"; \ - fi; \ - fi; \ - zypper --non-interactive addrepo --no-gpgcheck \ - ${JENKINS_URL}job/daos-stack/job/$repo/job/$branch/$build_number/artifact/artifacts/leap15/ \ - $repo:$branch:$build_number; \ - done; \ - zypper --non-interactive --gpg-auto-import-keys refresh leap15; \ - echo "Installing: $QUICKBUILD_DEPS"; \ - echo "$QUICKBUILD_DEPS" | tr '\n' '\0' | xargs -0 zypper --non-interactive −−allow−vendor−change install; \ +RUN if $QUICKBUILD; then \ + zypper --non-interactive addrepo --no-gpgcheck \ + http://repo.dc.hpdd.intel.com/repository/daos-stack-leap-15-x86_64-stable-local/ daos-local; \ + zypper --non-interactive addrepo --no-gpgcheck \ + http://repo.dc.hpdd.intel.com/repository/daos-stack-external-leap-15-x86_64-stable-group/ leap15; \ + for repo in $REPOS; do \ + branch="master"; \ + build_number="lastSuccessfulBuild"; \ + if [[ $repo = *@* ]]; then \ + branch="${repo#*@}"; \ + repo="${repo%@*}"; \ + if [[ $branch = *:* ]]; then \ + build_number="${branch#*:}"; \ + branch="${branch%:*}"; \ + fi; \ + fi; \ + zypper --non-interactive addrepo --no-gpgcheck \ + ${JENKINS_URL}job/daos-stack/job/$repo/job/$branch/$build_number/artifact/artifacts/leap15/ \ + $repo:$branch:$build_number; \ + done; \ + zypper --non-interactive --gpg-auto-import-keys refresh leap15; \ + echo "Installing: $QUICKBUILD_DEPS"; \ + echo "$QUICKBUILD_DEPS" | tr '\n' '\0' | xargs -0 zypper --non-interactive install −f; \ fi # force an upgrade to get any newly built RPMs