diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/functest/xtesting-ci.yaml | 112 |
1 files changed, 86 insertions, 26 deletions
diff --git a/jjb/functest/xtesting-ci.yaml b/jjb/functest/xtesting-ci.yaml index b8d8ed767..f043fa371 100644 --- a/jjb/functest/xtesting-ci.yaml +++ b/jjb/functest/xtesting-ci.yaml @@ -52,7 +52,7 @@ ssh -T opnfv@172.30.12.84 << EOF sudo apt -o DPkg::Lock::Timeout=300 update sudo DEBIAN_FRONTEND=noninteractive apt \ - -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 @@ -140,7 +140,7 @@ name: 'playbook' playbook: - all - # - podman + - podman - proxy - proxy2 - radosgw @@ -152,6 +152,7 @@ - jjb - https - https2 + - properties - gitlab.insert - jenkins_kind - jenkins_kind2 @@ -223,6 +224,14 @@ sudo rm -f /etc/systemd/system/docker.service.d/http-proxy.conf sudo systemctl daemon-reload sudo systemctl restart docker + if [ $(lsb_release -r -s |cut -d\. -f1) -ge "22" ]; then + sudo DEBIAN_FRONTEND=noninteractive apt \ + -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* + - builder: name: xtesting-ci-tests-debian-docker @@ -233,16 +242,13 @@ -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 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 ;; \ 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 && \ @@ -253,8 +259,7 @@ ansible-galaxy install -f git+https://github.com/collivier/ansible-role-xtesting.git,{release} && \ mv ~/.ansible/roles/ansible-role-xtesting ~/.ansible/roles/collivier.xtesting ;; \ esac && \ - ansible-galaxy collection install ansible.posix community.general community.grafana \ - community.kubernetes community.docker community.postgresql community.crypto && \ + ansible-galaxy collection install community.kubernetes && \ ansible-playbook -vvvv ~/.ansible/roles/collivier.xtesting/tests/{playbook}.yml" - job-template: @@ -303,19 +308,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 vim iproute2 git sudo -y && \ + -o DPkg::Lock::Timeout=300 install git -y && \ case {ubuntu} in \ - bionic) \ - [ -z "$VIRTUAL_ENV" ] && sudo DEBIAN_FRONTEND=noninteractive apt \ - -o DPkg::Lock::Timeout=300 install python3-pip -y && sudo LC_CTYPE=C.UTF-8 pip3 install ansible ;; \ 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 && \ @@ -326,8 +328,7 @@ ansible-galaxy install -f git+https://github.com/collivier/ansible-role-xtesting.git,{release} && \ mv ~/.ansible/roles/ansible-role-xtesting ~/.ansible/roles/collivier.xtesting ;; \ esac && \ - ansible-galaxy collection install ansible.posix community.general community.grafana \ - community.kubernetes community.docker community.postgresql community.crypto && \ + ansible-galaxy collection install community.kubernetes && \ case {ubuntu} in \ oracular) \ ansible-galaxy collection install -f community.docker ;; \ @@ -365,7 +366,6 @@ - stable - master ubuntu: - - bionic - focal - jammy - noble @@ -394,11 +394,11 @@ ansible-galaxy install -f git+https://github.com/collivier/ansible-role-xtesting.git,{release} && \ mv ~/.ansible/roles/ansible-role-xtesting ~/.ansible/roles/collivier.xtesting ;; \ esac && \ - ansible-galaxy collection install ansible.posix community.general community.grafana \ - community.kubernetes community.docker community.postgresql community.crypto && \ + 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 ;; \ @@ -447,3 +447,63 @@ - edge jobs: - 'xtesting-ci-tests-{alpine}-{release}-{playbook}' + +- builder: + name: xtesting-ci-tests-rockylinux-docker + builders: + - shell: | + set +x + sudo docker run -v /home/opnfv/.docker/config.json:/root/.docker/config.json \ + -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 \ + rockylinux:{rockylinux} bash -c "\ + yum install epel-release -y + case {rockylinux} in \ + *) \ + [ -z "$VIRTUAL_ENV" ] && yum install ansible git -y ;; \ + esac && \ + rm -rf ~/.ansible/roles/collivier.xtesting && \ + case {release} in \ + stable) \ + ansible-galaxy install -f collivier.xtesting ;; \ + *) \ + ansible-galaxy install -f git+https://github.com/collivier/ansible-role-xtesting.git,{release} && \ + mv ~/.ansible/roles/ansible-role-xtesting ~/.ansible/roles/collivier.xtesting ;; \ + esac && \ + ansible-galaxy collection install community.kubernetes && \ + ansible-playbook -vvvv ~/.ansible/roles/collivier.xtesting/tests/{playbook}.yml" + +- job-template: + name: 'xtesting-ci-tests-{rockylinux}-{release}-{playbook}' + triggers: + - timed: '@daily' + parameters: + - xtesting-ci-node: + node: '{node}' + properties: + - build-blocker: + use-build-blocker: true + blocking-level: 'NODE' + blocking-jobs: + - '^xtesting-ci-tests-.*$' + builders: + - xtesting-ci-clean-docker + - xtesting-ci-tests-rockylinux-docker: + playbook: '{playbook}' + release: '{release}' + rockylinux: '{rockylinux}' + +- project: + name: xtesting-ci-tests-rockylinux + playbook: + - all + - kubernetes0 + node: xtesting + release: + - stable + - master + rockylinux: + - 8 + - 9 + jobs: + - 'xtesting-ci-tests-{rockylinux}-{release}-{playbook}' |