Close Functest K8s Hunter Iruya and Jerma

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

diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml
index dcbc537..15a493c 100644 (file)
--- a/jjb/functest/xtesting-pi.yaml
+++ b/jjb/functest/xtesting-pi.yaml
@@ -1,7 +1,10 @@
 ---
-- xtesting-pi-jobs: &xtesting-pi-jobs
-    name: 'xtesting-pi-jobs'
-    current-parameters: true
+- xtesting-pi-containers: &xtesting-pi-containers
+    name: 'xtesting-pi-containers'
+    repo: '{repo}'
+    port: '{port}'
+    container: '{container}'
+    tag: '{tag}'
 
 - xtesting-pi-params: &xtesting-pi-params
     name: 'xtesting-pi-params'
@@ -9,60 +12,52 @@
     port:
     tag:
       - latest:
-          branch: 'master'
+          slave: lf-virtual1
+      - wallaby:
           slave: lf-virtual1
       - leguer:
-          branch: 'master'
           slave: lf-virtual1
       - kali:
-          branch: 'master'
           slave: lf-virtual1
       - jerma:
-          branch: 'master'
           slave: lf-virtual1
       - iruya:
-          branch: 'master'
           slave: lf-virtual1
       - hunter:
-          branch: 'master'
           slave: lf-virtual1
       - arm-latest:
-          branch: 'master'
+          slave: lf-virtual1
+      - arm-wallaby:
           slave: lf-virtual1
       - arm-leguer:
-          branch: 'master'
           slave: lf-virtual1
       - arm-kali:
-          branch: 'master'
           slave: lf-virtual1
       - arm-jerma:
-          branch: 'master'
           slave: lf-virtual1
       - arm-iruya:
-          branch: 'master'
           slave: lf-virtual1
       - arm-hunter:
-          branch: 'master'
           slave: lf-virtual1
       - arm64-latest:
-          branch: 'master'
+          slave: lf-virtual1
+      - arm64-wallaby:
           slave: lf-virtual1
       - arm64-leguer:
-          branch: 'master'
           slave: lf-virtual1
       - arm64-kali:
-          branch: 'master'
           slave: lf-virtual1
       - arm64-jerma:
-          branch: 'master'
           slave: lf-virtual1
       - arm64-iruya:
-          branch: 'master'
           slave: lf-virtual1
       - arm64-hunter:
-          branch: 'master'
           slave: lf-virtual1
 
+- xtesting-pi-jobs: &xtesting-pi-jobs
+    name: 'xtesting-pi-jobs'
+    current-parameters: true
+
 - parameter:
     name: xtesting-pi-slave
     parameters:
@@ -77,13 +72,6 @@
           name: build_tag
 
 
-- xtesting-pi-containers: &xtesting-pi-containers
-    name: 'xtesting-pi-containers'
-    repo: '{repo}'
-    port: '{port}'
-    container: '{container}'
-    tag: '{tag}'
-
 - xtesting-pi-run-containers: &xtesting-pi-run-containers
     name: 'xtesting-pi-run-containers'
     <<: *xtesting-pi-containers
@@ -146,7 +134,6 @@
           fi
           sudo docker rmi $image || true
 
-
 - job-template:
     name: 'xtesting-pi-{repo}-{container}-{tag}-pull'
     parameters:
@@ -215,8 +202,25 @@
       - fourth
       - fifth
       - sixth
+      - eighth
     privileged: 'false'
     network: bridge
+    exclude:
+      - {'tag': 'leguer', 'test': 'eighth'}
+      - {'tag': 'kali', 'test': 'eighth'}
+      - {'tag': 'jerma', 'test': 'eighth'}
+      - {'tag': 'iruya', 'test': 'eighth'}
+      - {'tag': 'hunter', 'test': 'eighth'}
+      - {'tag': 'arm-leguer', 'test': 'eighth'}
+      - {'tag': 'arm-kali', 'test': 'eighth'}
+      - {'tag': 'arm-jerma', 'test': 'eighth'}
+      - {'tag': 'arm-iruya', 'test': 'eighth'}
+      - {'tag': 'arm-hunter', 'test': 'eighth'}
+      - {'tag': 'arm64-leguer', 'test': 'eighth'}
+      - {'tag': 'arm64-kali', 'test': 'eighth'}
+      - {'tag': 'arm64-jerma', 'test': 'eighth'}
+      - {'tag': 'arm64-iruya', 'test': 'eighth'}
+      - {'tag': 'arm64-hunter', 'test': 'eighth'}
     jobs:
       - 'xtesting-pi-{repo}-{container}-{tag}-{test}-run'
 
@@ -237,6 +241,7 @@
     builders:
       - shell: |
           set +x
+          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -319,6 +324,8 @@
               <<: *xtesting-pi-jobs
             - name: 'xtesting-pi-ollivier-xtesting-{tag}-sixth-run'
               <<: *xtesting-pi-jobs
+            - name: 'xtesting-pi-ollivier-xtesting-{tag}-eighth-run'
+              <<: *xtesting-pi-jobs
       - multijob:
           name: ollivier/xtesting-mts:{tag}
           projects:
@@ -331,7 +338,7 @@
               <<: *xtesting-pi-jobs
 
 - project:
-    name: 'xtesting-pi'
+    name: 'xtesting-pi-daily'
     <<: *xtesting-pi-params
     jobs:
       - 'xtesting-pi-{tag}-daily'
@@ -346,4 +353,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtesting-pi-[a-z0-9]+-daily$
+    regex: ^xtesting-pi-[a-z-0-9.]+-daily$