X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes-pi.yaml;h=062d8f8fa9d8cc2ae33475170c411a8db0ec7c85;hb=2a47107b3e6c4af001c93e8eda93977b842ddf26;hp=3c329bf9b6761c6b1b379f8de284fcf480ff5f10;hpb=958b9ea782ad7b8c6fbde821ed2e00eca031bbda;p=releng.git

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 3c329bf9b..062d8f8fa 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'
@@ -9,60 +12,46 @@
     port:
     tag:
       - latest:
-          branch: 'master'
           slave: lf-virtual1-6
       - leguer:
-          branch: 'master'
           slave: lf-virtual1-5
       - kali:
-          branch: 'master'
           slave: lf-virtual1-4
       - jerma:
-          branch: 'master'
           slave: lf-virtual1-3
       - iruya:
-          branch: 'master'
           slave: lf-virtual1-2
       - hunter:
-          branch: 'master'
           slave: lf-virtual1-1
       - arm-latest:
-          branch: 'master'
           slave: lf-virtual1-6
       - arm-leguer:
-          branch: 'master'
           slave: lf-virtual1-5
       - arm-kali:
-          branch: 'master'
           slave: lf-virtual1-4
       - arm-jerma:
-          branch: 'master'
           slave: lf-virtual1-3
       - arm-iruya:
-          branch: 'master'
           slave: lf-virtual1-2
       - arm-hunter:
-          branch: 'master'
           slave: lf-virtual1-1
       - arm64-latest:
-          branch: 'master'
           slave: lf-virtual1-6
       - arm64-leguer:
-          branch: 'master'
           slave: lf-virtual1-5
       - arm64-kali:
-          branch: 'master'
           slave: lf-virtual1-4
       - arm64-jerma:
-          branch: 'master'
           slave: lf-virtual1-3
       - arm64-iruya:
-          branch: 'master'
           slave: lf-virtual1-2
       - arm64-hunter:
-          branch: 'master'
           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:
@@ -83,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
@@ -154,7 +136,6 @@
           fi
           docker rmi $image || true
 
-
 - job-template:
     name: 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
     parameters:
@@ -274,58 +255,183 @@
     container: 'functest-kubernetes-smoke'
     test:
       - xrally_kubernetes
+      - k8s_io
       - k8s_conformance
+      - k8s_conformance_serial
+      - sig_api_machinery
+      - sig_api_machinery_serial
+      - sig_apps
+      - sig_apps_serial
+      - sig_auth
+      - sig_cli
+      - sig_cli_serial
+      - sig_cluster_lifecycle
+      - sig_instrumentation
       - sig_network
-      - sig_network_features
+      - sig_network_serial
+      - sig_node
+      - sig_scheduling_serial
       - sig_storage
+      - sig_storage_serial
     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': 'latest', 'test': 'k8s_io'}
+      - {'tag': 'jerma', 'test': 'k8s_io'}
+      - {'tag': 'jerma', 'test': 'k8s_conformance_serial'}
+      - {'tag': 'jerma', 'test': 'sig_api_machinery'}
+      - {'tag': 'jerma', 'test': 'sig_api_machinery_serial'}
+      - {'tag': 'jerma', 'test': 'sig_apps'}
+      - {'tag': 'jerma', 'test': 'sig_apps_serial'}
+      - {'tag': 'jerma', 'test': 'sig_auth'}
+      - {'tag': 'jerma', 'test': 'sig_cli'}
+      - {'tag': 'jerma', 'test': 'sig_cli_serial'}
+      - {'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_network_serial'}
+      - {'tag': 'jerma', 'test': 'sig_node'}
+      - {'tag': 'jerma', 'test': 'sig_scheduling_serial'}
       - {'tag': 'jerma', 'test': 'sig_storage'}
+      - {'tag': 'jerma', 'test': 'sig_storage_serial'}
+      - {'tag': 'iruya', 'test': 'k8s_io'}
+      - {'tag': 'iruya', 'test': 'k8s_conformance_serial'}
+      - {'tag': 'iruya', 'test': 'sig_api_machinery'}
+      - {'tag': 'iruya', 'test': 'sig_api_machinery_serial'}
+      - {'tag': 'iruya', 'test': 'sig_apps'}
+      - {'tag': 'iruya', 'test': 'sig_apps_serial'}
+      - {'tag': 'iruya', 'test': 'sig_auth'}
+      - {'tag': 'iruya', 'test': 'sig_cli'}
+      - {'tag': 'iruya', 'test': 'sig_cli_serial'}
+      - {'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_network_serial'}
+      - {'tag': 'iruya', 'test': 'sig_node'}
+      - {'tag': 'iruya', 'test': 'sig_scheduling_serial'}
       - {'tag': 'iruya', 'test': 'sig_storage'}
+      - {'tag': 'iruya', 'test': 'sig_storage_serial'}
+      - {'tag': 'hunter', 'test': 'k8s_io'}
+      - {'tag': 'hunter', 'test': 'k8s_conformance_serial'}
+      - {'tag': 'hunter', 'test': 'sig_api_machinery'}
+      - {'tag': 'hunter', 'test': 'sig_api_machinery_serial'}
+      - {'tag': 'hunter', 'test': 'sig_apps'}
+      - {'tag': 'hunter', 'test': 'sig_apps_serial'}
+      - {'tag': 'hunter', 'test': 'sig_auth'}
+      - {'tag': 'hunter', 'test': 'sig_cli'}
+      - {'tag': 'hunter', 'test': 'sig_cli_serial'}
+      - {'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_network_serial'}
+      - {'tag': 'hunter', 'test': 'sig_node'}
+      - {'tag': 'hunter', 'test': 'sig_scheduling_serial'}
       - {'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': 'hunter', 'test': 'sig_storage_serial'}
+      - {'tag': 'arm-latest', 'test': 'k8s_io'}
+      - {'tag': 'arm-jerma', 'test': 'k8s_io'}
+      - {'tag': 'arm-jerma', 'test': 'k8s_conformance_serial'}
+      - {'tag': 'arm-jerma', 'test': 'sig_api_machinery'}
+      - {'tag': 'arm-jerma', 'test': 'sig_api_machinery_serial'}
+      - {'tag': 'arm-jerma', 'test': 'sig_apps'}
+      - {'tag': 'arm-jerma', 'test': 'sig_apps_serial'}
+      - {'tag': 'arm-jerma', 'test': 'sig_auth'}
+      - {'tag': 'arm-jerma', 'test': 'sig_cli'}
+      - {'tag': 'arm-jerma', 'test': 'sig_cli_serial'}
+      - {'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_network_serial'}
+      - {'tag': 'arm-jerma', 'test': 'sig_node'}
+      - {'tag': 'arm-jerma', 'test': 'sig_scheduling_serial'}
       - {'tag': 'arm-jerma', 'test': 'sig_storage'}
+      - {'tag': 'arm-jerma', 'test': 'sig_storage_serial'}
+      - {'tag': 'arm-iruya', 'test': 'k8s_io'}
+      - {'tag': 'arm-iruya', 'test': 'k8s_conformance_serial'}
+      - {'tag': 'arm-iruya', 'test': 'sig_api_machinery'}
+      - {'tag': 'arm-iruya', 'test': 'sig_api_machinery_serial'}
+      - {'tag': 'arm-iruya', 'test': 'sig_apps'}
+      - {'tag': 'arm-iruya', 'test': 'sig_apps_serial'}
+      - {'tag': 'arm-iruya', 'test': 'sig_auth'}
+      - {'tag': 'arm-iruya', 'test': 'sig_cli'}
+      - {'tag': 'arm-iruya', 'test': 'sig_cli_serial'}
+      - {'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_network_serial'}
+      - {'tag': 'arm-iruya', 'test': 'sig_node'}
+      - {'tag': 'arm-iruya', 'test': 'sig_scheduling_serial'}
       - {'tag': 'arm-iruya', 'test': 'sig_storage'}
+      - {'tag': 'arm-iruya', 'test': 'sig_storage_serial'}
+      - {'tag': 'arm-hunter', 'test': 'k8s_io'}
+      - {'tag': 'arm-hunter', 'test': 'k8s_conformance_serial'}
+      - {'tag': 'arm-hunter', 'test': 'sig_api_machinery'}
+      - {'tag': 'arm-hunter', 'test': 'sig_api_machinery_serial'}
+      - {'tag': 'arm-hunter', 'test': 'sig_apps'}
+      - {'tag': 'arm-hunter', 'test': 'sig_apps_serial'}
+      - {'tag': 'arm-hunter', 'test': 'sig_auth'}
+      - {'tag': 'arm-hunter', 'test': 'sig_cli'}
+      - {'tag': 'arm-hunter', 'test': 'sig_cli_serial'}
+      - {'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_network_serial'}
+      - {'tag': 'arm-hunter', 'test': 'sig_node'}
+      - {'tag': 'arm-hunter', 'test': 'sig_scheduling_serial'}
       - {'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': 'arm-hunter', 'test': 'sig_storage_serial'}
+      - {'tag': 'arm64-latest', 'test': 'k8s_io'}
+      - {'tag': 'arm64-jerma', 'test': 'k8s_io'}
+      - {'tag': 'arm64-jerma', 'test': 'k8s_conformance_serial'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_api_machinery'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_api_machinery_serial'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_apps'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_apps_serial'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_auth'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_cli'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_cli_serial'}
+      - {'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_network_serial'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_node'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_scheduling_serial'}
       - {'tag': 'arm64-jerma', 'test': 'sig_storage'}
+      - {'tag': 'arm64-jerma', 'test': 'sig_storage_serial'}
+      - {'tag': 'arm64-iruya', 'test': 'k8s_io'}
+      - {'tag': 'arm64-iruya', 'test': 'k8s_conformance_serial'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_api_machinery'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_api_machinery_serial'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_apps'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_apps_serial'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_auth'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_cli'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_cli_serial'}
+      - {'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_network_serial'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_node'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_scheduling_serial'}
       - {'tag': 'arm64-iruya', 'test': 'sig_storage'}
+      - {'tag': 'arm64-iruya', 'test': 'sig_storage_serial'}
+      - {'tag': 'arm64-hunter', 'test': 'k8s_io'}
+      - {'tag': 'arm64-hunter', 'test': 'k8s_conformance_serial'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_api_machinery'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_api_machinery_serial'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_apps'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_apps_serial'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_auth'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_cli'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_cli_serial'}
+      - {'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_network_serial'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_node'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_scheduling_serial'}
       - {'tag': 'arm64-hunter', 'test': 'sig_storage'}
+      - {'tag': 'arm64-hunter', 'test': 'sig_storage_serial'}
     jobs:
       - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
 
@@ -372,6 +478,7 @@
     builders:
       - shell: |
           set +x
+          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -427,9 +534,9 @@
     properties:
       - build-blocker:
           use-build-blocker: true
-          blocking-level: 'NODE'
+          blocking-level: 'GLOBAL'
           blocking-jobs:
-            - '^functest-kubernetes-pi-{tag}-(daily|docker|review)$'
+            - '^functest-kubernetes-*-(daily|docker|review)$'
     builders:
       - multijob:
           name: remove former images
@@ -466,17 +573,46 @@
               <<: *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_io-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}-k8s_conformance_serial-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_api_machinery_serial-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_apps_serial-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_cli_serial-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'
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_network_serial-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_scheduling_serial-run'
               <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_storage-run'
               <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-sig_storage_serial-run'
+              <<: *functest-kubernetes-pi-jobs
       - multijob:
           name: ollivier/functest-kubernetes-security:{tag}
           projects:
@@ -522,4 +658,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$