summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/functest/xtesting-ci.yaml9
1 files changed, 7 insertions, 2 deletions
diff --git a/jjb/functest/xtesting-ci.yaml b/jjb/functest/xtesting-ci.yaml
index b23bb02f0..64a3fb87c 100644
--- a/jjb/functest/xtesting-ci.yaml
+++ b/jjb/functest/xtesting-ci.yaml
@@ -6,7 +6,7 @@
set +x
sudo apt-get -o DPkg::Lock::Timeout=300 update
sudo DEBIAN_FRONTEND=noninteractive apt-get \
- -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
@@ -17,6 +17,8 @@
sudo rm -f /etc/systemd/system/docker.service.d/http-proxy.conf
sudo systemctl daemon-reload
sudo systemctl restart docker
+ sudo podman ps -aq |xargs sudo podman stop || true
+ sudo podman ps -aq |xargs sudo podman rm || true
sudo rm -rfv /data /tmp/xtesting*
sudo apt-get install ansible patch -y
rm -rf ~/.ansible/roles/collivier.xtesting
@@ -39,7 +41,7 @@
ssh opnfv@10.200.140.224 << EOF
sudo apt-get -o DPkg::Lock::Timeout=300 update
sudo DEBIAN_FRONTEND=noninteractive apt-get \
- -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
@@ -50,6 +52,8 @@
sudo rm -f /etc/systemd/system/docker.service.d/http-proxy.conf
sudo systemctl daemon-reload
sudo systemctl restart docker
+ sudo podman ps -aq |xargs sudo podman stop || true
+ sudo podman ps -aq |xargs sudo podman rm || true
sudo rm -rfv /data /tmp/xtesting*
EOF
sudo apt-get install ansible patch -y
@@ -114,6 +118,7 @@
name: 'playbook'
playbook:
- all
+ - podman
- proxy
- proxy2
- radosgw