summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/functest/xtesting-ci.yaml12
1 files changed, 8 insertions, 4 deletions
diff --git a/jjb/functest/xtesting-ci.yaml b/jjb/functest/xtesting-ci.yaml
index 213cb3cc7..f9e757acb 100644
--- a/jjb/functest/xtesting-ci.yaml
+++ b/jjb/functest/xtesting-ci.yaml
@@ -25,9 +25,11 @@
fi
sudo rm -rfv /data /tmp/xtesting*
if [ $(lsb_release -r -s |cut -d\. -f1) -ge "22" ]; then
- sudo apt-get install ansible patch -y
+ sudo DEBIAN_FRONTEND=noninteractive apt-get \
+ -o DPkg::Lock::Timeout=300 install ansible patch -y
else
- sudo apt-get install patch -y
+ sudo DEBIAN_FRONTEND=noninteractive apt-get \
+ -o DPkg::Lock::Timeout=300 install patch -y
sudo pip3 install ansible
fi
rm -rf ~/.ansible/roles/collivier.xtesting
@@ -70,10 +72,12 @@
sudo rm -rfv /data /tmp/xtesting*
EOF
if [ $(lsb_release -r -s |cut -d\. -f1) -ge "22" ]; then
- sudo apt-get install ansible patch -y
+ sudo DEBIAN_FRONTEND=noninteractive apt-get \
+ -o DPkg::Lock::Timeout=300 install ansible patch -y
else
sudo apt-get install patch -y
- sudo pip3 install ansible
+ sudo DEBIAN_FRONTEND=noninteractive apt-get \
+ -o DPkg::Lock::Timeout=300 install ansible
fi
rm -rf ~/.ansible/roles/collivier.xtesting
case {release} in