summaryrefslogtreecommitdiffstats
path: root/jjb/functest/xtesting.yaml
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2022-01-21 14:35:37 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2022-01-21 14:35:37 +0100
commite4445c78b5f8ecef1369eba11752e8c27dd14031 (patch)
tree0315710606f65384c185d7ff0bb08abe1cac4daa /jjb/functest/xtesting.yaml
parentbb0c8c6d35d22e8c89efdc6a8fa500af73874281 (diff)
Increase timout for apt locks
Change-Id: I9d810e05d70cedb7e983322eb63958bd60885e6a Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb/functest/xtesting.yaml')
-rw-r--r--jjb/functest/xtesting.yaml17
1 files changed, 10 insertions, 7 deletions
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