Remove docker install in all docker gates 26/74826/1
authorCédric Ollivier <cedric.ollivier@orange.com>
Fri, 14 Mar 2025 13:59:45 +0000 (14:59 +0100)
committerCédric Ollivier <cedric.ollivier@orange.com>
Fri, 14 Mar 2025 14:00:00 +0000 (15:00 +0100)
Change-Id: I5a9473dabb42a2ccf2c636a35b4898258b75bb56
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
jjb/functest/xtesting-ci.yaml

index 62485cf..0734f43 100644 (file)
             -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 sudo git -y && \
+            -o DPkg::Lock::Timeout=300 install git -y && \
           case {debian} in \
           buster) \
-            [ -z "$VIRTUAL_ENV" ] && sudo DEBIAN_FRONTEND=noninteractive apt \
-              -o DPkg::Lock::Timeout=300 install python3-pip -y && sudo pip3 install ansible ;; \
+            [ -z "$VIRTUAL_ENV" ] && DEBIAN_FRONTEND=noninteractive apt \
+              -o DPkg::Lock::Timeout=300 install python3-pip -y && pip3 install ansible ;; \
           bullseye) \
-            [ -z "$VIRTUAL_ENV" ] && sudo DEBIAN_FRONTEND=noninteractive apt \
-              -o DPkg::Lock::Timeout=300 install python3-pip -y && sudo pip3 install ansible ;; \
+            [ -z "$VIRTUAL_ENV" ] && DEBIAN_FRONTEND=noninteractive apt \
+              -o DPkg::Lock::Timeout=300 install python3-pip -y && pip3 install ansible ;; \
           *) \
-            [ -z "$VIRTUAL_ENV" ] && sudo DEBIAN_FRONTEND=noninteractive apt \
+            [ -z "$VIRTUAL_ENV" ] && DEBIAN_FRONTEND=noninteractive apt \
               -o DPkg::Lock::Timeout=300 install ansible -y ;; \
           esac && \
           rm -rf ~/.ansible/roles/collivier.xtesting && \
             -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 git sudo -y && \
+            -o DPkg::Lock::Timeout=300 install git -y && \
           case {ubuntu} in \
           focal) \
-            [ -z "$VIRTUAL_ENV" ] && sudo DEBIAN_FRONTEND=noninteractive apt \
-              -o DPkg::Lock::Timeout=300 install python3-pip -y && sudo pip3 install ansible ;; \
+            [ -z "$VIRTUAL_ENV" ] && DEBIAN_FRONTEND=noninteractive apt \
+              -o DPkg::Lock::Timeout=300 install python3-pip -y && pip3 install ansible ;; \
           jammy) \
-            [ -z "$VIRTUAL_ENV" ] && sudo DEBIAN_FRONTEND=noninteractive apt \
-              -o DPkg::Lock::Timeout=300 install python3-pip -y && sudo pip3 install ansible ;; \
+            [ -z "$VIRTUAL_ENV" ] && DEBIAN_FRONTEND=noninteractive apt \
+              -o DPkg::Lock::Timeout=300 install python3-pip -y && pip3 install ansible ;; \
           *) \
-            [ -z "$VIRTUAL_ENV" ] && sudo DEBIAN_FRONTEND=noninteractive apt \
+            [ -z "$VIRTUAL_ENV" ] && DEBIAN_FRONTEND=noninteractive apt \
               -o DPkg::Lock::Timeout=300 install ansible -y ;; \
           esac && \
           rm -rf ~/.ansible/roles/collivier.xtesting && \
           yum install epel-release -y
           case {rockylinux} in \
           *) \
-            [ -z "$VIRTUAL_ENV" ] && yum install ansible git docker -y ;; \
+            [ -z "$VIRTUAL_ENV" ] && yum install ansible git -y ;; \
           esac && \
           rm -rf ~/.ansible/roles/collivier.xtesting && \
           case {release} in \