Rename xtestingci to xtesting-ci

[releng.git] / jjb / functest / xtestingci.yaml

diff --git a/jjb/functest/xtestingci.yaml b/jjb/functest/xtestingci.yaml
index 77dac47..345fa11 100644 (file)
--- a/jjb/functest/xtestingci.yaml
+++ b/jjb/functest/xtestingci.yaml
@@ -1,15 +1,15 @@
 ---
 - builder:
-    name: xtestingci-tests
+    name: xtesting-ci-tests
     builders:
       - shell: |
           set +x
           curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.11.1/kind-linux-amd64
           chmod +x ./kind
-          mv ./kind /usr/local/bin/kind
-          kind delete clusters xtesting
-          sudo docker ps -aq |xargs docker stop
-          sudo docker ps -aq |xargs docker rm
+          sudo mv ./kind /usr/local/bin/kind
+          kind delete clusters xtesting | true
+          sudo docker ps -aq |xargs sudo docker stop | true
+          sudo docker ps -aq |xargs sudo docker rm | true
           sudo rm -rf /data/*
           sudo pip3 install ansible
           ansible-galaxy install -f collivier.xtesting
@@ -17,31 +17,53 @@
           ansible-playbook -vv ~/.ansible/roles/collivier.xtesting/tests/{playbook}.yml
 
 - parameter:
-    name: xtestingci-slave
+    name: xtesting-ci-slave
     parameters:
       - label:
           name: slave
           default: '{slave}'
 
 - job-template:
-    name: 'xtestingci-tests-{playbook}'
+    name: 'xtesting-ci-tests-{playbook}'
     parameters:
-      - xtestingci-slave:
+      - xtesting-ci-slave:
           slave: '{slave}'
+    properties:
+      - build-blocker:
+          use-build-blocker: true
+          blocking-level: 'NODE'
+          blocking-jobs:
+            - '^xtesting-ci-tests-.*$'
     builders:
-      - xtestingci-tests:
+      - xtesting-ci-tests:
           playbook: '{playbook}'
 
 - project:
-    name: xtestingci-tests
-    slave: master
+    name: xtesting-ci-tests
+    slave: lf-virtual1
     playbook:
       - all
+      - kubernetes0
+      - kubernetes1
+      - kubernetes2
+      - proxy_kubernetes
+      - proxy_kubernetes2
+      - k8s_jenkins_kind0
+      - k8s_jenkins_kind1
+      - k8s_jenkins_kind2
+      - k8s_jenkins_kind3
+      - k8s_gitlab0
+      - k8s_gitlab1
+      - k8s_gitlab_kind0
+      - k8s_gitlab_kind1
+      - k8s_gitlab_kind2
+      - k8s_gitlab_kind3
+
     jobs:
-      - 'xtestingci-tests-{playbook}'
+      - 'xtesting-ci-tests-{playbook}'
 
 - view:
-    name: xtestingci
+    name: xtesting-ci
     view-type: list
     columns:
       - status
@@ -50,4 +72,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtestingci-tests-.*$
+    regex: ^xtesting-ci-tests-.*$