X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Fxtesting-ci.yaml;h=e8b0222b06b5361fc56f763c09fc337a988ffca4;hb=refs%2Fchanges%2F04%2F74204%2F1;hp=cbba1b013c3b57a56894c108cbcd7f5eee15587d;hpb=45befac30190c762b8ae18ae07286b8aa3fa474a;p=releng.git

diff --git a/jjb/functest/xtesting-ci.yaml b/jjb/functest/xtesting-ci.yaml
index cbba1b013..e8b0222b0 100644
--- a/jjb/functest/xtesting-ci.yaml
+++ b/jjb/functest/xtesting-ci.yaml
@@ -4,36 +4,47 @@
     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
           sudo docker ps -aq |xargs sudo docker stop || true
           sudo docker ps -aq |xargs sudo docker rm || true
+          sudo docker system prune -f --all || true
           sudo rm -f /etc/systemd/system/docker.service.d/http-proxy.conf
           sudo systemctl daemon-reload
           sudo systemctl restart docker
-          sudo rm -rf /data/*
-          sudo pip3 install ansible
-          ansible-galaxy install -f collivier.xtesting
+          sudo rm -rfv /data
+          sudo apt-get install ansible -y
+          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
+          (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 -vv ~/.ansible/roles/collivier.xtesting/tests/{playbook}.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-{playbook}'
+    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
@@ -43,10 +54,11 @@
     builders:
       - xtesting-ci-tests:
           playbook: '{playbook}'
+          release: '{release}'
 
 - project:
     name: xtesting-ci-tests
-    slave: lf-virtual1
+    node: xtestingci
     playbook:
       - all
       - proxy
@@ -78,8 +90,11 @@
       - k8s_gitlab_kind1
       - k8s_gitlab_kind2
       - k8s_gitlab_kind3
+    release:
+      - stable
+      - master
     jobs:
-      - 'xtesting-ci-tests-{playbook}'
+      - 'xtesting-ci-tests-{release}-{playbook}'
 
 - view:
     name: xtesting-ci