X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes.yaml;h=2a370b3d4a521ac98cae6d3e45fe34071ef5cb13;hb=refs%2Fchanges%2F66%2F72966%2F1;hp=6b8547927a1fd384032985d89b3e97867c6862d7;hpb=7a5d6483138a1f6e5bb183d68689b42aa74209ba;p=releng.git

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 6b8547927..2a370b3d4 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -13,25 +13,31 @@
     tag:
       - latest:
           from:
-          buildargs:
+          build_args:
           branch: master
+          slave: lf-virtual1-8
+          dependency: 3.14
+      - v1.22:
+          from:
+          build_args:
+          branch: stable/v1.22
           slave: lf-virtual1-7
-          dependency: 3.13
+          dependency: 3.14
       - v1.21:
           from:
-          buildargs:
+          build_args:
           branch: stable/v1.21
           slave: lf-virtual1-6
           dependency: 3.13
       - leguer:
           from:
-          buildargs:
+          build_args:
           branch: stable/leguer
           slave: lf-virtual1-5
           dependency: 3.12
       - kali:
           from:
-          buildargs:
+          build_args:
           branch: stable/kali
           slave: lf-virtual1-4
           dependency: 3.11
@@ -72,6 +78,8 @@
     <<: *functest-kubernetes-containers
     test: '{test}'
     privileged: '{privileged}'
+    volumes: '{volumes}'
+    env: '{env}'
     network: '{network}'
 
 - builder:
@@ -93,6 +101,16 @@
     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}
@@ -104,6 +122,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 \
@@ -113,9 +133,6 @@
             -e NODE_NAME=$slave \
             -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
 
 - builder:
@@ -221,7 +238,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}'
@@ -238,6 +255,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
@@ -245,11 +267,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
@@ -261,12 +303,9 @@
       - sig_apps
       - sig_apps_serial
       - sig_auth
-      - sig_cli
-      - sig_cli_serial
       - sig_cluster_lifecycle
       - sig_instrumentation
       - sig_network
-      - sig_network_serial
       - sig_node
       - sig_scheduling_serial
       - sig_storage
@@ -276,14 +315,36 @@
     exclude:
       - tag: latest
         test: k8s_io
+      - tag: v1.22
+        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
@@ -292,11 +353,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
@@ -304,11 +385,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
@@ -317,14 +418,23 @@
     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}
@@ -334,6 +444,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 \
@@ -342,9 +454,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 \
-            -e E2E_TEST_OPTS=$E2E_TEST_OPTS \
-            -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
             $image zip_campaign
 
 - job-template:
@@ -361,10 +470,17 @@
     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'
@@ -447,18 +563,12 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_auth-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_cli-run'
-              <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_cli_serial-run'
-              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_cluster_lifecycle-run'
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_instrumentation-run'
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_network-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_network_serial-run'
-              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_node-run'
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_scheduling_serial-run'
@@ -521,7 +631,7 @@
     <<: *functest-kubernetes-containers
     ref_arg: '{ref_arg}'
     path: '{path}'
-    buildargs: '{buildargs}'
+    build_args: '{build_args}'
     from: '{from}'
 
 - builder:
@@ -537,8 +647,9 @@
             image={repo}:{port}/{container}:{tag}
           fi
           build_args=""
-          if [ "{buildargs}" != "None" ]; then
-            build_args="{buildargs}"
+          if [ "{build_args}" != "None" ]; then
+            for i in $(echo {build_args} | tr -d '[]' |sed "s/, / /g" ); \
+              do build_args="--build-arg $i $build_args"; done
           fi
           if [ "{ref_arg}" != "None" ]; then
             build_args="$build_args --build-arg {ref_arg}={ref}"
@@ -630,11 +741,15 @@
     builders:
       - shell: |
           set +x
-          apt-get update && apt-get install \
-            software-properties-common gpg -y
+          apt-get update && \
+          DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y
+          DEBIAN_FRONTEND=noninteractive \
+          apt-get install software-properties-common gpg -y
           add-apt-repository -y ppa:deadsnakes/ppa
-          apt-get update && apt-get install python3.8 \
-            python3.8-dev python3.8-distutils \
+          apt-get update && DEBIAN_FRONTEND=noninteractive \
+          apt-get install \
+            python3.9 python3.9-dev python3.9-distutils \
+            python3.8 python3.8-dev python3.8-distutils \
             python3.7 python3.7-dev python3.6 python3.6-dev \
             python python-dev python3-pip enchant -y
           pip3 install tox tox-pip-version
@@ -673,7 +788,7 @@
       - functest-kubernetes-build-containers:
           <<: *functest-kubernetes-build-containers
           ref: $GERRIT_REFSPEC
-          buildargs: '{buildargs}'
+          build_args: '{build_args}'
 
 - project:
     name: functest-kubernetes-opnfv-functest-kubernetes-core-{tag}-gate
@@ -846,18 +961,12 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_auth-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_cli-run'
-              <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_cli_serial-run'
-              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_cluster_lifecycle-run'
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_instrumentation-run'
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_network-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_network_serial-run'
-              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_node-run'
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-sig_scheduling_serial-run'
@@ -954,7 +1063,7 @@
       - functest-kubernetes-build-containers:
           <<: *functest-kubernetes-build-containers
           ref: '{branch}'
-          buildargs: '{buildargs}'
+          build_args: '{build_args}'
       - functest-kubernetes-push-containers:
           <<: *functest-kubernetes-build-containers
           ref: '{branch}'
@@ -1072,7 +1181,8 @@
     name: functest-kubernetes-trivy
     builders:
       - shell: |
-          apt-get update && apt-get install curl -y
+          apt-get update && DEBIAN_FRONTEND=noninteractive \
+          apt-get install curl -y
 
           curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b .
           if [ "{repo}" = "_" ]; then