Allow vendor change (try #2)

Quick-build: true Skip-checkpatch: true Skip-run_test: true Signed-off-by: Brian J. Murrell <[email protected]>
daos-stack · Mar 11, 2020 · 35c7803 · 35c7803
1 parent aeecd9d
commit 35c7803
Showing 1 changed file with 23 additions and 23 deletions.
diff --git 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