Build Xtesting 2023.1 VM

[releng.git] / jjb / functest / xtesting-ci.yaml

diff --git a/jjb/functest/xtesting-ci.yaml b/jjb/functest/xtesting-ci.yaml
index 6de371e..e8b0222 100644 (file)
--- a/jjb/functest/xtesting-ci.yaml
+++ b/jjb/functest/xtesting-ci.yaml
@@ -4,8 +4,10 @@
     builders:
       - shell: |
           set +x
-          sudo apt-get install python3-pip -y
-          curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.11.1/kind-linux-amd64
+          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 -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
           kind delete clusters xtesting jenkins gitlab || true
@@ -16,7 +18,7 @@
           sudo systemctl daemon-reload
           sudo systemctl restart docker
           sudo rm -rfv /data
-          sudo pip3 install ansible
+          sudo apt-get install ansible -y
           rm -rf ~/.ansible/roles/collivier.xtesting
           case {release} in
           stable)
@@ -25,23 +27,24 @@
             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
+          (cd ~/.ansible/roles/collivier.xtesting; patch -p1 < tests/docker_config_json.patch)
           ansible-galaxy collection install -f -r ~/.ansible/roles/collivier.xtesting/requirements.yml
           ansible-playbook -vvvv ~/.ansible/roles/collivier.xtesting/tests/{playbook}.yml
 
 - parameter:
-    name: xtesting-ci-slave
+    name: xtesting-ci-node
     parameters:
       - label:
-          name: slave
-          default: '{slave}'
+          name: node
+          default: '{node}'
 
 - job-template:
     name: 'xtesting-ci-tests-{release}-{playbook}'
     triggers:
       - timed: '@daily'
     parameters:
-      - xtesting-ci-slave:
-          slave: '{slave}'
+      - xtesting-ci-node:
+          node: '{node}'
     properties:
       - build-blocker:
           use-build-blocker: true
@@ -55,7 +58,7 @@
 
 - project:
     name: xtesting-ci-tests
-    slave: lf-virtual1
+    node: xtestingci
     playbook:
       - all
       - proxy