From e4445c78b5f8ecef1369eba11752e8c27dd14031 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Fri, 21 Jan 2022 14:35:37 +0100 Subject: [PATCH] Increase timout for apt locks MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I9d810e05d70cedb7e983322eb63958bd60885e6a Signed-off-by: Cédric Ollivier --- jjb/functest/functest-kubernetes-ng.yaml | 5 +++-- jjb/functest/functest-kubernetes.yaml | 17 ++++++++++------- jjb/functest/functest.yaml | 17 ++++++++++------- jjb/functest/xtesting.yaml | 17 ++++++++++------- 4 files changed, 33 insertions(+), 23 deletions(-) diff --git a/jjb/functest/functest-kubernetes-ng.yaml b/jjb/functest/functest-kubernetes-ng.yaml index 19f93d690..9a868d376 100644 --- a/jjb/functest/functest-kubernetes-ng.yaml +++ b/jjb/functest/functest-kubernetes-ng.yaml @@ -305,8 +305,9 @@ name: functest-kubernetes-ng-trivy builders: - shell: | - sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \ - apt-get install curl -y + sudo apt-get -o DPkg::Lock::Timeout=300 update && \ + sudo DEBIAN_FRONTEND=noninteractive apt-get \ + -o DPkg::Lock::Timeout=300 install curl -y curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b . if [ "{repo}" = "_" ]; then diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index 5bc79c104..169d1b2a6 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -752,13 +752,15 @@ builders: - shell: | set +x - apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y + apt-get -o DPkg::Lock::Timeout=300 update && \ + DEBIAN_FRONTEND=noninteractive apt-get \ + -o DPkg::Lock::Timeout=300 dist-upgrade -y DEBIAN_FRONTEND=noninteractive \ - apt-get install software-properties-common gpg -y + apt-get -o DPkg::Lock::Timeout=300 install software-properties-common gpg -y add-apt-repository -y ppa:deadsnakes/ppa - apt-get update && DEBIAN_FRONTEND=noninteractive \ - apt-get install \ + apt-get -o DPkg::Lock::Timeout=300 update && \ + DEBIAN_FRONTEND=noninteractive apt-get \ + -o DPkg::Lock::Timeout=300 install \ python3.9 python3.9-dev python3.9-distutils \ python3.8 python3.8-dev python3.8-distutils \ python3.7 python3.7-dev python3.6 python3.6-dev \ @@ -1198,8 +1200,9 @@ name: functest-kubernetes-trivy builders: - shell: | - apt-get update && DEBIAN_FRONTEND=noninteractive \ - apt-get install curl -y + apt-get -o DPkg::Lock::Timeout=300 update && \ + DEBIAN_FRONTEND=noninteractive apt-get \ + -o DPkg::Lock::Timeout=300 install curl -y curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b . if [ "{repo}" = "_" ]; then diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index a07a92084..cec79ea23 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -981,13 +981,15 @@ builders: - shell: | set +x - sudo apt-get update && \ - sudo DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y + sudo apt-get -o DPkg::Lock::Timeout=300 update && \ + sudo DEBIAN_FRONTEND=noninteractive apt-get \ + -o DPkg::Lock::Timeout=300 dist-upgrade -y sudo DEBIAN_FRONTEND=noninteractive \ - apt-get install software-properties-common gpg -y + apt-get -o DPkg::Lock::Timeout=300 install software-properties-common gpg -y sudo add-apt-repository -y ppa:deadsnakes/ppa - sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \ - apt-get install \ + sudo apt-get -o DPkg::Lock::Timeout=300 update && \ + sudo DEBIAN_FRONTEND=noninteractive apt-get \ + -o DPkg::Lock::Timeout=300 install \ python3.9 python3.9-dev python3.9-distutils \ python3.8 python3.8-dev python3.8-distutils \ python3.7 python3.7-dev python3.6 python3.6-dev \ @@ -1547,8 +1549,9 @@ name: functest-trivy builders: - shell: | - sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \ - apt-get install curl -y + sudo apt-get -o DPkg::Lock::Timeout=300 update && \ + sudo DEBIAN_FRONTEND=noninteractive apt-get \ + -o DPkg::Lock::Timeout=300 install curl -y curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b . if [ "{repo}" = "_" ]; then diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml index 13e60c462..f4ef35ea4 100644 --- a/jjb/functest/xtesting.yaml +++ b/jjb/functest/xtesting.yaml @@ -503,13 +503,15 @@ builders: - shell: | set +x - sudo apt-get update && \ - sudo DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y + sudo apt-get -o DPkg::Lock::Timeout=300 update && \ + sudo DEBIAN_FRONTEND=noninteractive apt-get \ + -o DPkg::Lock::Timeout=300 dist-upgrade -y sudo DEBIAN_FRONTEND=noninteractive \ - apt-get install software-properties-common gpg -y + apt-get -o DPkg::Lock::Timeout=300 install software-properties-common gpg -y sudo add-apt-repository -y ppa:deadsnakes/ppa - sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \ - apt-get install \ + sudo apt-get -o DPkg::Lock::Timeout=300 update && \ + sudo DEBIAN_FRONTEND=noninteractive apt-get \ + -o DPkg::Lock::Timeout=300 install \ python3.9 python3.9-dev python3.9-distutils \ python3.8 python3.8-dev python3.8-distutils \ python3.7 python3.7-dev python3.6 python3.6-dev \ @@ -793,8 +795,9 @@ name: xtesting-trivy builders: - shell: | - sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \ - apt-get install curl -y + sudo apt-get -o DPkg::Lock::Timeout=300 update && \ + sudo DEBIAN_FRONTEND=noninteractive apt-get \ + -o DPkg::Lock::Timeout=300 install curl -y curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b . if [ "{repo}" = "_" ]; then -- 2.16.6