diff options
| -rw-r--r-- | jjb/functest/xtesting-ci.yaml | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/jjb/functest/xtesting-ci.yaml b/jjb/functest/xtesting-ci.yaml index 6c2791a32..5e1ca472b 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 podman -y + -o DPkg::Lock::Timeout=300 install python3-pip docker.io -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,8 +17,12 @@ 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 + if [ $(lsb_release -r -s |cut -d\. -f1) -ge "22" ]; then + sudo DEBIAN_FRONTEND=noninteractive apt-get \ + -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* sudo apt-get install ansible patch -y rm -rf ~/.ansible/roles/collivier.xtesting @@ -41,7 +45,7 @@ ssh -T opnfv@172.30.13.92 << 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 podman -y + -o DPkg::Lock::Timeout=300 install python3-pip docker.io -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 @@ -52,8 +56,12 @@ 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 + if [ $(lsb_release -r -s |cut -d\. -f1) -ge "22" ]; then + sudo DEBIAN_FRONTEND=noninteractive apt-get \ + -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* EOF sudo apt-get install ansible patch -y |