X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes-pi.yaml;h=8bc4cc08632e59c6e9ef62beddc00f6db3f79084;hb=refs%2Fchanges%2F15%2F72315%2F1;hp=72da722323ba7b018fab2adcaf58e29e00222fbd;hpb=f58b5b06071fdb4a3b141e3d7fe4b98a4d793d25;p=releng.git

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 72da72232..8bc4cc086 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -1,7 +1,10 @@
 ---
-- functest-kubernetes-pi-jobs: &functest-kubernetes-pi-jobs
-    name: 'functest-kubernetes-pi-jobs'
-    current-parameters: true
+- functest-kubernetes-pi-containers: &functest-kubernetes-pi-containers
+    name: 'functest-kubernetes-pi-containers'
+    repo: '{repo}'
+    port: '{port}'
+    container: '{container}'
+    tag: '{tag}'
 
 - functest-kubernetes-pi-params: &functest-kubernetes-pi-params
     name: 'functest-kubernetes-pi-params'
@@ -45,6 +48,10 @@
       - arm64-hunter:
           slave: lf-virtual1-1
 
+- functest-kubernetes-pi-jobs: &functest-kubernetes-pi-jobs
+    name: 'functest-kubernetes-pi-jobs'
+    current-parameters: true
+
 - parameter:
     name: functest-kubernetes-pi-slave
     parameters:
@@ -65,13 +72,6 @@
           name: DEPLOY_SCENARIO
           default: k8-nosdn-nofeature-noha
 
-- functest-kubernetes-pi-containers: &functest-kubernetes-pi-containers
-    name: 'functest-kubernetes-pi-containers'
-    repo: '{repo}'
-    port: '{port}'
-    container: '{container}'
-    tag: '{tag}'
-
 - functest-kubernetes-pi-run-containers: &functest-kubernetes-pi-run-containers
     name: 'functest-kubernetes-pi-run-containers'
     <<: *functest-kubernetes-pi-containers
@@ -136,7 +136,6 @@
           fi
           docker rmi $image || true
 
-
 - job-template:
     name: 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
     parameters:
@@ -257,56 +256,108 @@
     test:
       - xrally_kubernetes
       - k8s_conformance
+      - sig_api_machinery
+      - sig_apps
+      - sig_auth
+      - sig_cli
+      - sig_cluster_lifecycle
+      - sig_instrumentation
       - sig_network
       - sig_network_features
+      - sig_node
       - sig_storage
     privileged: 'false'
     network: bridge
     exclude:
-      - {'tag': 'leguer', 'test': 'sig_network'}
-      - {'tag': 'leguer', 'test': 'sig_network_features'}
-      - {'tag': 'leguer', 'test': 'sig_storage'}
-      - {'tag': 'kali', 'test': 'sig_network'}
-      - {'tag': 'kali', 'test': 'sig_network_features'}
-      - {'tag': 'kali', 'test': 'sig_storage'}
+      - {'tag': 'jerma', 'test': 'sig_api_machinery'}
+      - {'tag': 'jerma', 'test': 'sig_apps'}
+      - {'tag': 'jerma', 'test': 'sig_auth'}
+      - {'tag': 'jerma', 'test': 'sig_cli'}
+      - {'tag': 'jerma', 'test': 'sig_cluster_lifecycle'}
+      - {'tag': 'jerma', 'test': 'sig_instrumentation'}
       - {'tag': 'jerma', 'test': 'sig_network'}
       - {'tag': 'jerma', 'test': 'sig_network_features'}
+      - {'tag': 'jerma', 'test': 'sig_node'}
       - {'tag': 'jerma', 'test': 'sig_storage'}
+      - {'tag': 'iruya', 'test': 'sig_api_machinery'}
+      - {'tag': 'iruya', 'test': 'sig_apps'}
+      - {'tag': 'iruya', 'test': 'sig_auth'}
+      - {'tag': 'iruya', 'test': 'sig_cli'}
+      - {'tag': 'iruya', 'test': 'sig_cluster_lifecycle'}
+      - {'tag': 'iruya', 'test': 'sig_instrumentation'}
       - {'tag': 'iruya', 'test': 'sig_network'}
       - {'tag': 'iruya', 'test': 'sig_network_features'}
+      - {'tag': 'iruya', 'test': 'sig_node'}
       - {'tag': 'iruya', 'test': 'sig_storage'}
+      - {'tag': 'hunter', 'test': 'sig_api_machinery'}
+      - {'tag': 'hunter', 'test': 'sig_apps'}
+      - {'tag': 'hunter', 'test': 'sig_auth'}
+      - {'tag': 'hunter', 'test': 'sig_cli'}
+      - {'tag': 'hunter', 'test': 'sig_cluster_lifecycle'}
+      - {'tag': 'hunter', 'test': 'sig_instrumentation'}
       - {'tag': 'hunter', 'test': 'sig_network'}
       - {'tag': 'hunter', 'test': 'sig_network_features'}
+      - {'tag': 'hunter', 'test': 'sig_node'}
       - {'tag': 'hunter', 'test': 'sig_storage'}
-      - {'tag': 'arm-leguer', 'test': 'sig_network'}
-      - {'tag': 'arm-leguer', 'test': 'sig_network_features'}
-      - {'tag': 'arm-leguer', 'test': 'sig_storage'}
-      - {'tag': 'arm-kali', 'test': 'sig_network'}
-      - {'tag': 'arm-kali', 'test': 'sig_network_features'}
-      - {'tag': 'arm-kali', 'test': 'sig_storage'}
+      - {'tag': 'arm-jerma', 'test': 'sig_api_machinery'}
+      - {'tag': 'arm-jerma', 'test': 'sig_apps'}
+      - {'tag': 'arm-jerma', 'test': 'sig_auth'}
+      - {'tag': 'arm-jerma', 'test': 'sig_cli'}
+      - {'tag': 'arm-jerma', 'test': 'sig_cluster_lifecycle'}
+      - {'tag': 'arm-jerma', 'test': 'sig_instrumentation'}
       - {'tag': 'arm-jerma', 'test': 'sig_network'}
       - {'tag': 'arm-jerma', 'test': 'sig_network_features'}
+      - {'tag': 'arm-jerma', 'test': 'sig_node'}
       - {'tag': 'arm-jerma', 'test': 'sig_storage'}
+      - {'tag': 'arm-iruya', 'test': 'sig_api_machinery'}
+      - {'tag': 'arm-iruya', 'test': 'sig_apps'}
+      - {'tag': 'arm-iruya', 'test': 'sig_auth'}
+      - {'tag': 'arm-iruya', 'test': 'sig_cli'}
+      - {'tag': 'arm-iruya', 'test': 'sig_cluster_lifecycle'}
+      - {'tag': 'arm-iruya', 'test': 'sig_instrumentation'}
       - {'tag': 'arm-iruya', 'test': 'sig_network'}
       - {'tag': 'arm-iruya', 'test': 'sig_network_features'}
+      - {'tag': 'arm-iruya', 'test': 'sig_node'}
       - {'tag': 'arm-iruya', 'test': 'sig_storage'}
+      - {'tag': 'arm-hunter', 'test': 'sig_api_machinery'}
+      - {'tag': 'arm-hunter', 'test': 'sig_apps'}
+      - {'tag': 'arm-hunter', 'test': 'sig_auth'}
+      - {'tag': 'arm-hunter', 'test': 'sig_cli'}
+      - {'tag': 'arm-hunter', 'test': 'sig_cluster_lifecycle'}
+      - {'tag': 'arm-hunter', 'test': 'sig_instrumentation'}
       - {'tag': 'arm-hunter', 'test': 'sig_network'}
       - {'tag': 'arm-hunter', 'test': 'sig_network_features'}
+      - {'tag': 'arm-hunter', 'test': 'sig_node'}
       - {'tag': 'arm-hunter', 'test': 'sig_storage'}
-      - {'tag': 'arm64-leguer', 'test': 'sig_network'}
-      - {'tag': 'arm64-leguer', 'test': 'sig_network_features'}
-      - {'tag': 'arm64-leguer', 'test': 'sig_storage'}
-      - {'tag': 'arm64-kali', 'test': 'sig_network'}
-      - {'tag': 'arm64-kali', 'test': 'sig_network_features'}
-      - {'tag': 'arm64-kali', 'test': 'sig_storage'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_api_machinery'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_apps'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_auth'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_cli'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_cluster_lifecycle'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_instrumentation'}
       - {'tag': 'arm64-jerma', 'test': 'sig_network'}
       - {'tag': 'arm64-jerma', 'test': 'sig_network_features'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_node'}
       - {'tag': 'arm64-jerma', 'test': 'sig_storage'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_api_machinery'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_apps'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_auth'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_cli'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_cluster_lifecycle'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_instrumentation'}
       - {'tag': 'arm64-iruya', 'test': 'sig_network'}
       - {'tag': 'arm64-iruya', 'test': 'sig_network_features'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_node'}
       - {'tag': 'arm64-iruya', 'test': 'sig_storage'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_api_machinery'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_apps'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_auth'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_cli'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_cluster_lifecycle'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_instrumentation'}
       - {'tag': 'arm64-hunter', 'test': 'sig_network'}
       - {'tag': 'arm64-hunter', 'test': 'sig_network_features'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_node'}
       - {'tag': 'arm64-hunter', 'test': 'sig_storage'}
     jobs:
       - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
@@ -354,6 +405,7 @@
     builders:
       - shell: |
           set +x
+          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -448,15 +500,30 @@
               <<: *functest-kubernetes-pi-jobs
       - multijob:
           name: ollivier/functest-kubernetes-smoke:{tag}
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-xrally_kubernetes-run'
               <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
               <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_api_machinery-run'
+              <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_apps-run'
+              <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_auth-run'
+              <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_cli-run'
+              <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_cluster_lifecycle-run'
+              <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_instrumentation-run'
+              <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_network-run'
               <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_network_features-run'
               <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_node-run'
+              <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_storage-run'
               <<: *functest-kubernetes-pi-jobs
       - multijob:
@@ -504,4 +571,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-kubernetes-pi-[a-z-0-9]+-daily$
+    regex: ^functest-kubernetes-pi-[a-z-0-9.]+-daily$