Code Review / releng.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Use tox as package by distribution
[releng.git] / jjb / functest / functest-kubernetes.yaml
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 6cf3093..5b23bec 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -15,49 +15,49 @@
           from:
           build_args:
           branch: master
-          slave: lf-virtual1-8
-          dependency: 3.14
-      - v1.23:
+          node: lf-virtual1-9
+          dependency: 3.16
+      - v1.26:
           from:
           build_args:
-          branch: stable/v1.23
-          slave: lf-virtual1-9
-          dependency: 3.14
-      - v1.22:
+          branch: master
+          node: lf-virtual1-1
+          dependency: 3.16
+      - v1.25:
           from:
           build_args:
-          branch: stable/v1.22
-          slave: lf-virtual1-7
-          dependency: 3.14
-      - v1.21:
+          branch: stable/v1.25
+          node: lf-virtual1-8
+          dependency: 3.16
+      - v1.24:
           from:
           build_args:
-          branch: stable/v1.21
-          slave: lf-virtual1-6
-          dependency: 3.13
-      - leguer:
+          branch: stable/v1.24
+          node: lf-virtual1-7
+          dependency: 3.16
+      - v1.23:
           from:
           build_args:
-          branch: stable/leguer
-          slave: lf-virtual1-5
-          dependency: 3.12
-      - kali:
+          branch: stable/v1.23
+          node: lf-virtual1-6
+          dependency: 3.14
+      - v1.22:
           from:
           build_args:
-          branch: stable/kali
-          slave: lf-virtual1-4
-          dependency: 3.11
+          branch: stable/v1.22
+          node: lf-virtual1-5
+          dependency: 3.14
 
 - functest-kubernetes-jobs: &functest-kubernetes-jobs
     name: 'functest-kubernetes-jobs'
     current-parameters: true
 
 - parameter:
-    name: functest-kubernetes-slave
+    name: functest-kubernetes-node
     parameters:
       - label:
-          name: slave
-          default: '{slave}'
+          name: node
+          default: '{node}'
 
 - parameter:
     name: functest-kubernetes-build_tag
@@ -72,13 +72,6 @@
           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
@@ -147,7 +140,7 @@
             -v /home/opnfv/functest-kubernetes/.boto:/etc/boto.cfg \
             -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
             -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
-            -e NODE_NAME=$slave \
+            -e NODE_NAME=$node \
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             $image run_tests -t {test} -p -r
@@ -169,8 +162,8 @@
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-pull'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
     builders:
       - functest-kubernetes-pull-containers:
           <<: *functest-kubernetes-containers
@@ -213,8 +206,8 @@
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
     builders:
       - functest-kubernetes-remove-images:
           <<: *functest-kubernetes-containers
@@ -257,14 +250,12 @@
 - job-template:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-{test}-run'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
       - 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
@@ -274,9 +265,9 @@
     <<: *functest-kubernetes-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+      - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
     env:
       - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     published_ports:
     container: 'functest-kubernetes-healthcheck'
     test:
@@ -292,14 +283,12 @@
 - job-template:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-{test}-run'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
       - 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
@@ -309,14 +298,13 @@
     <<: *functest-kubernetes-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+      - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
     env:
       - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     published_ports:
     container: 'functest-kubernetes-smoke'
     test:
       - xrally_kubernetes
-      - k8s_io
       - k8s_conformance
       - k8s_conformance_serial
       - sig_api_machinery
@@ -335,29 +323,18 @@
     network: bridge
     uid: 1000
     gid: 1000
-    exclude:
-      - tag: latest
-        test: k8s_io
-      - tag: v1.23
-        test: k8s_io
-      - tag: v1.22
-        test: k8s_io
-      - tag: v1.21
-        test: k8s_io
     jobs:
       - '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-node:
+          node: '{node}'
       - 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
@@ -367,9 +344,9 @@
     <<: *functest-kubernetes-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+      - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
     env:
       - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     published_ports:
     container: 'functest-kubernetes-security'
     test:
@@ -386,14 +363,12 @@
 - job-template:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-{test}-run'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
       - 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
@@ -403,9 +378,9 @@
     <<: *functest-kubernetes-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+      - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
     env:
       - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     published_ports:
     container: 'functest-kubernetes-benchmarking'
     test:
@@ -421,14 +396,12 @@
 - job-template:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-{test}-run'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
       - 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
@@ -438,9 +411,9 @@
     <<: *functest-kubernetes-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+      - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
     env:
       - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     published_ports:
     container: 'functest-kubernetes-cnf'
     test:
@@ -501,14 +474,12 @@
 - job-template:
     name: 'functest-kubernetes-{tag}-zip'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
       - 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-zip:
           <<: *functest-kubernetes-containers
@@ -523,9 +494,9 @@
     <<: *functest-kubernetes-params
     volumes:
       - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+      - /home/opnfv/functest-kubernetes/config.{tag}:/home/xtesting/.kube/config
     env:
       - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-      - E2E_TEST_OPTS=$E2E_TEST_OPTS
     published_ports:
     container: 'functest-kubernetes-healthcheck'
     uid: 1000
@@ -539,21 +510,20 @@
     triggers:
       - timed: '@weekly'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
       - 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
     # PyYAML and yamllint differ here
     # see https://github.com/yaml/pyyaml/issues/234
     # yamllint disable rule:indentation
     properties:
       - build-blocker:
           blocking-jobs:
-          - ^functest-kubernetes-(pi-)*{tag}-(daily|docker|review)$
+          - ^functest-kubernetes-(pi-)*.*-(daily|review)$
+          - ^functest-kubernetes-(pi-)*{tag}-docker$
     # yamllint enable rule:indentation
     builders:
       - multijob:
@@ -595,8 +565,6 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-xrally_kubernetes-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_io-run'
-              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance_serial-run'
@@ -763,8 +731,8 @@
 - job-template:
     name: 'functest-kubernetes-{repo}-{tag}-dep-pull'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
     builders:
       - functest-kubernetes-pull-dep-images:
           <<: *functest-kubernetes-dep
@@ -778,8 +746,8 @@
 - job-template:
     name: 'functest-kubernetes-{repo}-{tag}-dep-rmi'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
     builders:
       - functest-kubernetes-remove-dep-images:
           <<: *functest-kubernetes-dep
@@ -804,11 +772,12 @@
           apt-get -o DPkg::Lock::Timeout=300 update && \
           DEBIAN_FRONTEND=noninteractive apt-get \
             -o DPkg::Lock::Timeout=300 install \
+            libxml2-dev libxslt-dev libffi-dev libjpeg-dev \
+            python3.10 python3.10-dev python3.10-distutils python3.10-venv \
             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
+            python3-pip enchant-2 tox -y
+          pip3 install tox-pip-version
 
           tox
 
@@ -821,8 +790,8 @@
       - functest-kubernetes-patchset-created:
           branch: '{branch}'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
     builders:
       - functest-kubernetes-tox:
 
@@ -835,8 +804,8 @@
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-gate'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
     scm:
       - functest-kubernetes-scm:
           ref: $GERRIT_REFSPEC
@@ -924,21 +893,20 @@
       - functest-kubernetes-patchset-created:
           branch: '{branch}'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
       - 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
     # PyYAML and yamllint differ here
     # see https://github.com/yaml/pyyaml/issues/234
     # yamllint disable rule:indentation
     properties:
       - build-blocker:
           blocking-jobs:
-          - ^functest-kubernetes-(pi-)*{tag}-(daily|docker|review)$
+          - ^functest-kubernetes-(pi-)*.*-(daily|review)$
+          - ^functest-kubernetes-(pi-)*{tag}-docker$
     # yamllint enable rule:indentation
     builders:
       - multijob:
@@ -1001,8 +969,6 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-xrally_kubernetes-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_io-run'
-              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance_serial-run'
@@ -1116,8 +1082,8 @@
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-build'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
     scm:
       - functest-kubernetes-scm:
           ref: '{branch}'
@@ -1193,15 +1159,15 @@
       - functest-kubernetes-scm:
           ref: '{branch}'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
     # PyYAML and yamllint differ here
     # see https://github.com/yaml/pyyaml/issues/234
     # yamllint disable rule:indentation
     properties:
       - build-blocker:
           blocking-jobs:
-          - ^functest-kubernetes-(pi-)*{tag}-(daily|docker|review)$
+          - ^functest-kubernetes-(pi-)*{tag}-(daily|review)$
     # yamllint enable rule:indentation
     builders:
       - multijob:
@@ -1261,15 +1227,15 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          ./trivy $image
+          ./trivy image --exit-code 1 $image
 
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
     triggers:
       - timed: '@weekly'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
     builders:
       - functest-kubernetes-trivy:
           <<: *functest-kubernetes-containers
@@ -1345,8 +1311,8 @@
     triggers:
       - timed: '@weekly'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
     builders:
       - functest-kubernetes-grype:
           <<: *functest-kubernetes-containers