From fdef7fe278aa085952338a1973d03622feb56319 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Fri, 14 Mar 2025 14:38:07 +0100
Subject: Add docker if RockyLinux
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: I12c78706b6562e25bb54c1a7692f979704b67bd2
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
jjb/functest/xtesting-ci.yaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'jjb/functest/xtesting-ci.yaml')
diff --git a/jjb/functest/xtesting-ci.yaml b/jjb/functest/xtesting-ci.yaml
index 855985c83..62485cf0c 100644
--- a/jjb/functest/xtesting-ci.yaml
+++ b/jjb/functest/xtesting-ci.yaml
@@ -233,7 +233,7 @@
-v /home/opnfv/.docker/config.json:/home/opnfv/.config/helm/registry/config.json \
-v /data:/data -v /var/run/docker.sock:/var/run/docker.sock --network host debian:{debian} bash -c "\
apt update && DEBIAN_FRONTEND=noninteractive apt \
- -o DPkg::Lock::Timeout=300 install docker.io vim iproute2 sudo git lsb-release -y && \
+ -o DPkg::Lock::Timeout=300 install docker.io sudo git -y && \
case {debian} in \
buster) \
[ -z "$VIRTUAL_ENV" ] && sudo DEBIAN_FRONTEND=noninteractive apt \
@@ -302,7 +302,7 @@
-v /home/opnfv/.docker/config.json:/home/opnfv/.config/helm/registry/config.json \
-v /data:/data -v /var/run/docker.sock:/var/run/docker.sock --network host ubuntu:{ubuntu} bash -c "\
apt update && DEBIAN_FRONTEND=noninteractive apt \
- -o DPkg::Lock::Timeout=300 install docker.io vim iproute2 git sudo -y && \
+ -o DPkg::Lock::Timeout=300 install docker.io git sudo -y && \
case {ubuntu} in \
focal) \
[ -z "$VIRTUAL_ENV" ] && sudo DEBIAN_FRONTEND=noninteractive apt \
@@ -454,7 +454,7 @@
yum install epel-release -y
case {rockylinux} in \
*) \
- [ -z "$VIRTUAL_ENV" ] && yum install ansible git iproute -y ;; \
+ [ -z "$VIRTUAL_ENV" ] && yum install ansible git docker -y ;; \
esac && \
rm -rf ~/.ansible/roles/collivier.xtesting && \
case {release} in \
--
cgit