X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes-pi.yaml;h=913036e6e697eb1660229a20e3fd9f9e9fb63ec8;hb=7a5d6483138a1f6e5bb183d68689b42aa74209ba;hp=d4d9738a2582708f70dd97fa92f63fb884441d18;hpb=9aac45a0fe0313c0bfe9d913165a03fc9f495e0c;p=releng.git

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index d4d9738a2..913036e6e 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -12,41 +12,29 @@
     port:
     tag:
       - latest:
+          slave: lf-virtual1-7
+      - v1.21:
           slave: lf-virtual1-6
       - leguer:
-          slave: functest_k8s_leguer
+          slave: lf-virtual1-5
       - kali:
-          slave: functest_k8s_kali
-      - jerma:
-          slave: lf-virtual1-3
-      - iruya:
-          slave: lf-virtual1-2
-      - hunter:
-          slave: lf-virtual1-1
+          slave: lf-virtual1-4
       - arm-latest:
+          slave: lf-virtual1-7
+      - arm-v1.21:
           slave: lf-virtual1-6
       - arm-leguer:
-          slave: functest_k8s_leguer
+          slave: lf-virtual1-5
       - arm-kali:
-          slave: functest_k8s_kali
-      - arm-jerma:
-          slave: lf-virtual1-3
-      - arm-iruya:
-          slave: lf-virtual1-2
-      - arm-hunter:
-          slave: lf-virtual1-1
+          slave: lf-virtual1-4
       - arm64-latest:
+          slave: lf-virtual1-7
+      - arm64-v1.21:
           slave: lf-virtual1-6
       - arm64-leguer:
-          slave: functest_k8s_leguer
+          slave: lf-virtual1-5
       - arm64-kali:
-          slave: functest_k8s_kali
-      - arm64-jerma:
-          slave: lf-virtual1-3
-      - arm64-iruya:
-          slave: lf-virtual1-2
-      - arm64-hunter:
-          slave: lf-virtual1-1
+          slave: lf-virtual1-4
 
 - functest-kubernetes-pi-jobs: &functest-kubernetes-pi-jobs
     name: 'functest-kubernetes-pi-jobs'
@@ -72,6 +60,13 @@
           name: DEPLOY_SCENARIO
           default: k8-nosdn-nofeature-noha
 
+- parameter:
+    name: functest-kubernetes-pi-E2E_TEST_OPTS
+    parameters:
+      - string:
+          name: E2E_TEST_OPTS
+          default: container-runtime:containerd
+
 - functest-kubernetes-pi-run-containers: &functest-kubernetes-pi-run-containers
     name: 'functest-kubernetes-pi-run-containers'
     <<: *functest-kubernetes-pi-containers
@@ -119,6 +114,7 @@
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             -e DEPLOY_SCENARIO=$DEPLOY_SCENARIO \
+            -e E2E_TEST_OPTS=$E2E_TEST_OPTS \
             -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
             $image run_tests -t {test} -p -r
 
@@ -233,6 +229,8 @@
           build_tag: ''
       - functest-kubernetes-pi-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+      - functest-kubernetes-pi-E2E_TEST_OPTS:
+          E2E_TEST_OPTS: container-runtime:containerd
     builders:
       - functest-kubernetes-pi-run-containers:
           <<: *functest-kubernetes-pi-run-containers
@@ -255,120 +253,41 @@
     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': 'jerma', 'test': 'k8s_conformance_serial'}
-      - {'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': 'k8s_conformance_serial'}
-      - {'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': 'k8s_conformance_serial'}
-      - {'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-jerma', 'test': 'k8s_conformance_serial'}
-      - {'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': 'k8s_conformance_serial'}
-      - {'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': 'k8s_conformance_serial'}
-      - {'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-jerma', 'test': 'k8s_conformance_serial'}
-      - {'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': 'k8s_conformance_serial'}
-      - {'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': 'k8s_conformance_serial'}
-      - {'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'}
+      - tag: latest
+        test: k8s_io
+      - tag: v1.21
+        test: k8s_io
+      - tag: jerma
+        test: k8s_io
+      - tag: arm-latest
+        test: k8s_io
+      - tag: arm-v1.21
+        test: k8s_io
+      - tag: arm64-latest
+        test: k8s_io
+      - tag: arm64-v1.21
+        test: k8s_io
     jobs:
       - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
 
@@ -391,6 +310,7 @@
     container: 'functest-kubernetes-benchmarking'
     test:
       - xrally_kubernetes_full
+      - netperf
     privileged: 'false'
     network: bridge
     jobs:
@@ -403,7 +323,7 @@
     test:
       - k8s_vims
       - helm_vims
-      - cnf_conformance
+      - cnf_testsuite
     privileged: 'false'
     network: bridge
     jobs:
@@ -433,6 +353,7 @@
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             -e DEPLOY_SCENARIO=$DEPLOY_SCENARIO \
+            -e E2E_TEST_OPTS=$E2E_TEST_OPTS \
             -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
             $image zip_campaign
 
@@ -445,6 +366,8 @@
           build_tag: ''
       - functest-kubernetes-pi-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+      - functest-kubernetes-pi-E2E_TEST_OPTS:
+          E2E_TEST_OPTS: container-runtime:containerd
     builders:
       - functest-kubernetes-pi-zip:
           <<: *functest-kubernetes-pi-containers
@@ -468,12 +391,16 @@
           build_tag: ''
       - functest-kubernetes-pi-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+      - functest-kubernetes-pi-E2E_TEST_OPTS:
+          E2E_TEST_OPTS: container-runtime:containerd
+    # PyYAML and yamllint differ here
+    # see https://github.com/yaml/pyyaml/issues/234
+    # yamllint disable rule:indentation
     properties:
       - build-blocker:
-          use-build-blocker: true
-          blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-pi-{tag}-(daily|docker|review)$'
+          - ^functest-kubernetes-(pi-)*{tag}-(daily|docker|review)$
+    # yamllint enable rule:indentation
     builders:
       - multijob:
           name: remove former images
@@ -514,30 +441,42 @@
           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:
@@ -552,6 +491,8 @@
           projects:
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
               <<: *functest-kubernetes-pi-jobs
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-netperf-run'
+              <<: *functest-kubernetes-pi-jobs
       - multijob:
           name: ollivier/functest-kubernetes-cnf:{tag}
           projects:
@@ -559,7 +500,7 @@
               <<: *functest-kubernetes-pi-jobs
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-helm_vims-run'
               <<: *functest-kubernetes-pi-jobs
-            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-cnf_conformance-run'
+            - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-cnf_testsuite-run'
               <<: *functest-kubernetes-pi-jobs
       - multijob:
           name: dump all campaign data