X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes-pi.yaml;h=087c83d39e73d8077bbe173243fdd99876b91d0e;hb=6c338b47697e221e6264d7adac20ae75c7485561;hp=81ab559460465dee11e7ee448252702ccd82d8e3;hpb=8590449b1be7f9fbcbfdf08070832cdb86dc431c;p=releng.git

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 81ab55946..087c83d39 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -60,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
@@ -107,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
 
@@ -221,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
@@ -264,13 +274,20 @@
     privileged: 'false'
     network: bridge
     exclude:
-      - {'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'}
+      - 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'
 
@@ -293,6 +310,7 @@
     container: 'functest-kubernetes-benchmarking'
     test:
       - xrally_kubernetes_full
+      - netperf
     privileged: 'false'
     network: bridge
     jobs:
@@ -311,7 +329,6 @@
     jobs:
       - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
 
-
 - builder:
     name: functest-kubernetes-pi-zip
     builders:
@@ -335,6 +352,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
 
@@ -347,6 +365,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
@@ -370,12 +390,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
@@ -466,6 +490,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: