diff options
| -rw-r--r-- | jjb/functest/xtesting-ci.yaml | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/jjb/functest/xtesting-ci.yaml b/jjb/functest/xtesting-ci.yaml index 62485cf0c..a892bfafd 100644 --- a/jjb/functest/xtesting-ci.yaml +++ b/jjb/functest/xtesting-ci.yaml @@ -233,16 +233,16 @@ -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 && \ @@ -302,16 +302,16 @@ -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 && \ @@ -360,7 +360,6 @@ - stable - master ubuntu: - - bionic - focal - jammy - noble @@ -392,7 +391,8 @@ ansible-galaxy collection install community.kubernetes && \ case {alpine} in \ "3.18") \ - [ -z "$VIRTUAL_ENV" ] && apk add ansible git ;; \ + [ -z "$VIRTUAL_ENV" ] && apk add ansible git && \ + ansible-galaxy collection install -f community.docker ;; \ "3.19") \ [ -z "$VIRTUAL_ENV" ] && apk add ansible git && \ ansible-galaxy collection install -f community.docker ;; \ @@ -454,7 +454,7 @@ 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 \ |