From 175a3ca8ca84faa223cd56769c024846d3437ef4 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Mon, 5 Mar 2018 01:22:03 +0100 Subject: [PATCH] buildpackages: run zypper refresh in try/wait loop Avoid silly things like: + sudo zypper --non-interactive --no-gpg-checks refresh System management is locked by the application with pid 2560 (zypper). Signed-off-by: Nathan Cutler --- teuthology/task/buildpackages/make-rpm.sh | 16 ++++++---------- .../buildpackages/opensuse-15.0-user-data.txt | 1 + 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/teuthology/task/buildpackages/make-rpm.sh b/teuthology/task/buildpackages/make-rpm.sh index ea33bc253a..3dc889104a 100755 --- a/teuthology/task/buildpackages/make-rpm.sh +++ b/teuthology/task/buildpackages/make-rpm.sh @@ -36,10 +36,13 @@ suse=false [[ $codename =~ sle ]] && suse=true if [ "$suse" = true ] ; then - sudo zypper --non-interactive --no-gpg-checks refresh - sudo zypper --non-interactive install --no-recommends git + for delay in 60 60 60 60 ; do + sudo zypper --non-interactive --no-gpg-checks refresh && break + sleep $delay + done + sudo zypper --non-interactive install --no-recommends git createrepo else - sudo yum install -y git + sudo yum install -y git createrepo fi export BUILDPACKAGES_CANONICAL_TAGS=$canonical_tags @@ -256,13 +259,6 @@ function build_rpm_repo() { local gitbuilder_host=$2 local base=$3 - if [ "$suse" = true ] ; then - sudo zypper --non-interactive --no-gpg-checks refresh - sudo zypper --non-interactive install --no-recommends createrepo - else - sudo yum install -y createrepo - fi - for dir in ${buildarea}/SRPMS ${buildarea}/RPMS/* do createrepo ${dir} diff --git a/teuthology/task/buildpackages/opensuse-15.0-user-data.txt b/teuthology/task/buildpackages/opensuse-15.0-user-data.txt index bb210c4b8e..8b9e2244c4 100644 --- a/teuthology/task/buildpackages/opensuse-15.0-user-data.txt +++ b/teuthology/task/buildpackages/opensuse-15.0-user-data.txt @@ -12,4 +12,5 @@ runcmd: - ( MYHOME=/home/ubuntu ; mkdir $MYHOME/.ssh ; chmod 700 $MYHOME/.ssh ; cp /root/.ssh/authorized_keys $MYHOME/.ssh ; chown -R ubuntu.users $MYHOME/.ssh ) - zypper --non-interactive --no-gpg-checks rm gettext-runtime-mini grub2 grub2-branding-openSUSE grub2-i386-pc grub2-snapper-plugin grub2-systemd-sleep-plugin - zypper --non-interactive --no-gpg-checks install --no-recommends wget git-core rsyslog lsb-release make gcc gcc-c++ grub2 rpm-build + - sleep 30 final_message: "READYTORUN" -- 2.39.5