summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/functest/xtesting-ci.yaml12
1 files changed, 10 insertions, 2 deletions
diff --git a/jjb/functest/xtesting-ci.yaml b/jjb/functest/xtesting-ci.yaml
index 5df2fe61f..f043fa371 100644
--- a/jjb/functest/xtesting-ci.yaml
+++ b/jjb/functest/xtesting-ci.yaml
@@ -52,7 +52,7 @@
ssh -T opnfv@172.30.12.84 << EOF
sudo apt -o DPkg::Lock::Timeout=300 update
sudo DEBIAN_FRONTEND=noninteractive apt \
- -o DPkg::Lock::Timeout=300 install python3-pip docker.io -y
+ -o DPkg::Lock::Timeout=300 install python3-pip docker.io podman -y
curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.17.0/kind-linux-amd64
chmod +x ./kind
sudo mv ./kind /usr/local/bin/kind
@@ -140,7 +140,7 @@
name: 'playbook'
playbook:
- all
- # - podman
+ - podman
- proxy
- proxy2
- radosgw
@@ -224,6 +224,14 @@
sudo rm -f /etc/systemd/system/docker.service.d/http-proxy.conf
sudo systemctl daemon-reload
sudo systemctl restart docker
+ if [ $(lsb_release -r -s |cut -d\. -f1) -ge "22" ]; then
+ sudo DEBIAN_FRONTEND=noninteractive apt \
+ -o DPkg::Lock::Timeout=300 install podman -y
+ sudo podman ps -aq |xargs sudo podman stop || true
+ sudo podman ps -aq |xargs sudo podman rm || true
+ fi
+ sudo rm -rfv /data /tmp/xtesting*
+
- builder:
name: xtesting-ci-tests-debian-docker