X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes.yaml;h=c49eaf042a0fcae677c16bf71ec8bf8f7a20e613;hb=196ce49240ed59511a4b7f908a43205f9aa59960;hp=f463a7844addb3c0c8e0ade94d01ad3438ba0a3c;hpb=81ef6740c51f2446a4afa88b7c85faa844d7b807;p=releng.git

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index f463a7844..c49eaf042 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -60,11 +60,20 @@
           name: DEPLOY_SCENARIO
           default: k8-nosdn-nofeature-noha
 
+- parameter:
+    name: functest-kubernetes-E2E_TEST_OPTS
+    parameters:
+      - string:
+          name: E2E_TEST_OPTS
+          default: container-runtime:containerd
+
 - functest-kubernetes-run-containers: &functest-kubernetes-run-containers
     name: 'functest-kubernetes-run-containers'
     <<: *functest-kubernetes-containers
     test: '{test}'
     privileged: '{privileged}'
+    volumes: '{volumes}'
+    env: '{env}'
     network: '{network}'
 
 - builder:
@@ -86,6 +95,14 @@
     builders:
       - shell: |
           set +x
+          volumes=;
+          if [ "{volumes}" != "None" ]; then
+            for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+          fi
+          env=;
+          if [ "{env}" != "None" ]; then
+            for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
+          fi
           [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -97,6 +114,8 @@
           docker run --rm \
             --privileged={privileged} \
             --network={network} \
+            $volumes \
+            $env \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
             -e S3_DST_URL=s3://artifacts.opnfv.org/functest-kubernetes/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
             -e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
@@ -106,8 +125,6 @@
             -e NODE_NAME=$slave \
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-            -e DEPLOY_SCENARIO=$DEPLOY_SCENARIO \
-            -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
             $image run_tests -t {test} -p -r
 
 - builder:
@@ -213,7 +230,7 @@
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
 - job-template:
-    name: 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-{test}-run'
     parameters:
       - functest-kubernetes-slave:
           slave: '{slave}'
@@ -221,6 +238,8 @@
           build_tag: ''
       - functest-kubernetes-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+      - functest-kubernetes-E2E_TEST_OPTS:
+          E2E_TEST_OPTS: container-runtime:containerd
     builders:
       - functest-kubernetes-run-containers:
           <<: *functest-kubernetes-run-containers
@@ -228,6 +247,11 @@
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck'
     <<: *functest-kubernetes-params
+    volumes:
+      - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+    env:
+      - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     container: 'functest-kubernetes-healthcheck'
     test:
       - k8s_quick
@@ -235,11 +259,31 @@
     privileged: 'false'
     network: bridge
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-{test}-run'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-{test}-run'
+    parameters:
+      - functest-kubernetes-slave:
+          slave: '{slave}'
+      - functest-kubernetes-build_tag:
+          build_tag: ''
+      - functest-kubernetes-DEPLOY_SCENARIO:
+          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+      - functest-kubernetes-E2E_TEST_OPTS:
+          E2E_TEST_OPTS: container-runtime:containerd
+    builders:
+      - functest-kubernetes-run-containers:
+          <<: *functest-kubernetes-run-containers
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke'
     <<: *functest-kubernetes-params
+    volumes:
+      - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+    env:
+      - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     container: 'functest-kubernetes-smoke'
     test:
       - xrally_kubernetes
@@ -264,14 +308,36 @@
     privileged: 'false'
     network: bridge
     exclude:
-      - {'tag': 'latest', 'test': 'k8s_io'}
-      - {'tag': 'v1.21', 'test': 'k8s_io'}
+      - tag: latest
+        test: k8s_io
+      - tag: v1.21
+        test: k8s_io
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-{test}-run'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-{test}-run'
+    parameters:
+      - functest-kubernetes-slave:
+          slave: '{slave}'
+      - functest-kubernetes-build_tag:
+          build_tag: ''
+      - functest-kubernetes-DEPLOY_SCENARIO:
+          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+      - functest-kubernetes-E2E_TEST_OPTS:
+          E2E_TEST_OPTS: container-runtime:containerd
+    builders:
+      - functest-kubernetes-run-containers:
+          <<: *functest-kubernetes-run-containers
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-security'
     <<: *functest-kubernetes-params
+    volumes:
+      - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+    env:
+      - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     container: 'functest-kubernetes-security'
     test:
       - kube_hunter
@@ -280,11 +346,31 @@
     privileged: 'false'
     network: bridge
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-{test}-run'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-{test}-run'
+    parameters:
+      - functest-kubernetes-slave:
+          slave: '{slave}'
+      - functest-kubernetes-build_tag:
+          build_tag: ''
+      - functest-kubernetes-DEPLOY_SCENARIO:
+          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+      - functest-kubernetes-E2E_TEST_OPTS:
+          E2E_TEST_OPTS: container-runtime:containerd
+    builders:
+      - functest-kubernetes-run-containers:
+          <<: *functest-kubernetes-run-containers
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking'
     <<: *functest-kubernetes-params
+    volumes:
+      - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+    env:
+      - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     container: 'functest-kubernetes-benchmarking'
     test:
       - xrally_kubernetes_full
@@ -292,11 +378,31 @@
     privileged: 'false'
     network: bridge
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
+      - 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-{test}-run'
+
+- job-template:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-{test}-run'
+    parameters:
+      - functest-kubernetes-slave:
+          slave: '{slave}'
+      - functest-kubernetes-build_tag:
+          build_tag: ''
+      - functest-kubernetes-DEPLOY_SCENARIO:
+          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+      - functest-kubernetes-E2E_TEST_OPTS:
+          E2E_TEST_OPTS: container-runtime:containerd
+    builders:
+      - functest-kubernetes-run-containers:
+          <<: *functest-kubernetes-run-containers
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf'
     <<: *functest-kubernetes-params
+    volumes:
+      - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+    env:
+      - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     container: 'functest-kubernetes-cnf'
     test:
       - k8s_vims
@@ -305,14 +411,21 @@
     privileged: 'false'
     network: bridge
     jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
-
+      - 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-{test}-run'
 
 - builder:
     name: functest-kubernetes-zip
     builders:
       - shell: |
           set +x
+          volumes=;
+          if [ "{volumes}" != "None" ]; then
+            for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+          fi
+          env=;
+          if [ "{env}" != "None" ]; then
+            for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
+          fi
           [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -322,6 +435,8 @@
             image={repo}:{port}/{container}:{tag}
           fi
           docker run --rm \
+            $volumes \
+            $env \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
             -e S3_DST_URL=s3://artifacts.opnfv.org/functest-kubernetes \
             -e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes \
@@ -330,8 +445,6 @@
             -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-            -e DEPLOY_SCENARIO=$DEPLOY_SCENARIO \
-            -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
             $image zip_campaign
 
 - job-template:
@@ -343,13 +456,22 @@
           build_tag: ''
       - functest-kubernetes-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+      - functest-kubernetes-E2E_TEST_OPTS:
+          E2E_TEST_OPTS: container-runtime:containerd
     builders:
       - functest-kubernetes-zip:
           <<: *functest-kubernetes-containers
+          volumes: '{volumes}'
+          env: '{env}'
 
 - project:
     name: 'functest-kubernetes-{tag}-zip'
     <<: *functest-kubernetes-params
+    volumes:
+      - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+    env:
+      - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     container: 'functest-kubernetes-healthcheck'
     jobs:
       - 'functest-kubernetes-{tag}-zip'
@@ -366,12 +488,16 @@
           build_tag: ''
       - functest-kubernetes-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+      - functest-kubernetes-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-{tag}-(daily|docker|review)$'
+          - ^functest-kubernetes-(pi-)*{tag}-(daily|docker|review)$
+    # yamllint enable rule:indentation
     builders:
       - multijob:
           name: remove former images
@@ -710,7 +836,6 @@
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
 
-
 - trigger:
     name: functest-kubernetes-patchset-created
     triggers:
@@ -741,12 +866,16 @@
           build_tag: ''
       - functest-kubernetes-DEPLOY_SCENARIO:
           DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+      - functest-kubernetes-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-{tag}-(daily|docker|review)$'
+          - ^functest-kubernetes-(pi-)*{tag}-(daily|docker|review)$
+    # yamllint enable rule:indentation
     builders:
       - multijob:
           name: remove former images
@@ -991,7 +1120,6 @@
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-build'
 
-
 - job-template:
     name: 'functest-kubernetes-{tag}-docker'
     project-type: multijob
@@ -1003,12 +1131,14 @@
     parameters:
       - functest-kubernetes-slave:
           slave: '{slave}'
+    # 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-{tag}-(daily|docker|review)$'
+          - ^functest-kubernetes-(pi-)*{tag}-(daily|docker|review)$
+    # yamllint enable rule:indentation
     builders:
       - multijob:
           name: remove dependency