Merge 2004195 into 559ee54

SUSE · Jul 30, 2020 · 95967ca · 95967ca
2 parents 559ee54 + 2004195
commit 95967ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Dockerfile.12sp0 b/Dockerfile.12sp0
@@ -8,8 +8,8 @@ RUN zypper ar http://download.suse.de/ibs/SUSE:/SLE-12:/GA/standard/ SLE-12-stan
     zypper ar -f http://download.suse.de/ibs/SUSE:/SLE-12:/Update/standard/ SLE-12-update-standard &&\
     zypper ar -f http://download.suse.de/ibs/SUSE/Updates/SLE-SERVER/12-LTSS/x86_64/update/ SLE-12-ltss &&\
     zypper --non-interactive --gpg-auto-import-keys ref &&\
-    zypper --non-interactive up zypper &&\
-    zypper --non-interactive install git-core ruby-devel make gcc gcc-c++ build wget dmidecode \
+    zypper --non-interactive up --replacefiles zypper &&\
+    zypper --non-interactive install --replacefiles git-core ruby-devel make gcc gcc-c++ build wget dmidecode \
       vim osc ruby2.1-rubygem-gem2rpm hwinfo libx86emu1 zypper-migration-plugin sudo curl && \
     zypper --non-interactive rr SLE-12-standard SLE-12-update-standard SLE-12-ltss
 

diff --git a/docker/integration.sh b/docker/integration.sh
@@ -8,6 +8,6 @@ fi
 rake package:checkout &&
 rake package:build_gem &&
 rake package:generate_manpages &&
-cd package && osc build $PRODUCT x86_64 --no-verify --trust-all-projects && cd .. &&
+cd package && osc build $PRODUCT x86_64 --no-verify --trust-all-projects --clean && cd .. &&
 zypper --non-interactive --no-gpg-checks in /oscbuild/$PRODUCT-x86_64/home/abuild/rpmbuild/RPMS/x86_64/* &&
 cucumber