X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yaml;h=8e9de2d267e2e182cf6f0a83efec3f0ac85d6e25;hb=36b7f40bd9fe8f48d8c6ac75b813fb8a59919ef1;hp=e86d4d5cc3f5b8300d13408fcfd629c90aeded09;hpb=614aee944d328589adc1d2da888462830dd85fac;p=releng.git

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index e86d4d5cc..8e9de2d26 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -15,28 +15,35 @@
           from:
           build_args:
           branch: master
-          slave: lf-pod4
+          node: lf-pod4
           DASHBOARD_URL: http://172.30.12.83
           dependency: 3.14
+      - zed:
+          from:
+          build_args:
+          branch: stable/zed
+          node: lf-virtual9
+          DASHBOARD_URL: http://172.30.13.94
+          dependency: 3.14
       - yoga:
           from:
           build_args:
           branch: stable/yoga
-          slave: lf-pod4-3
+          node: lf-pod4-3
           DASHBOARD_URL: http://172.30.12.88
           dependency: 3.14
       - xena:
           from:
           build_args:
           branch: stable/xena
-          slave: lf-pod4-2
+          node: lf-pod4-2
           DASHBOARD_URL: http://172.30.12.85
           dependency: 3.14
       - wallaby:
           from:
           build_args:
           branch: stable/wallaby
-          slave: lf-virtual6
+          node: lf-virtual6
           DASHBOARD_URL: http://172.30.13.91
           dependency: 3.13
 
@@ -45,11 +52,11 @@
     current-parameters: true
 
 - parameter:
-    name: functest-slave
+    name: functest-node
     parameters:
       - label:
-          name: slave
-          default: '{slave}'
+          name: node
+          default: '{node}'
 
 - parameter:
     name: functest-build_tag
@@ -147,7 +154,7 @@
             -v /home/opnfv/functest/.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 \
             -e DASHBOARD_URL={DASHBOARD_URL} \
@@ -170,8 +177,8 @@
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-pull'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
     builders:
       - functest-pull-containers:
           <<: *functest-containers
@@ -221,8 +228,8 @@
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-rmi'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
     builders:
       - functest-remove-images:
           <<: *functest-containers
@@ -272,8 +279,8 @@
 - job-template:
     name: 'functest-opnfv-functest-healthcheck-{tag}-{test}-run'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
       - functest-build_tag:
           build_tag: ''
       - functest-EXTERNAL_NETWORK:
@@ -322,8 +329,8 @@
 - job-template:
     name: 'functest-opnfv-functest-smoke-{tag}-{test}-run'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
       - functest-build_tag:
           build_tag: ''
       - functest-EXTERNAL_NETWORK:
@@ -377,8 +384,8 @@
 - job-template:
     name: 'functest-opnfv-functest-smoke-cntt-{tag}-{test}-run'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
       - functest-build_tag:
           build_tag: ''
       - functest-EXTERNAL_NETWORK:
@@ -422,8 +429,8 @@
 - job-template:
     name: 'functest-opnfv-functest-benchmarking-{tag}-{test}-run'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
       - functest-build_tag:
           build_tag: ''
       - functest-EXTERNAL_NETWORK:
@@ -463,8 +470,8 @@
 - job-template:
     name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-{test}-run'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
       - functest-build_tag:
           build_tag: ''
       - functest-EXTERNAL_NETWORK:
@@ -502,8 +509,8 @@
 - job-template:
     name: 'functest-opnfv-functest-vnf-{tag}-{test}-run'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
       - functest-build_tag:
           build_tag: ''
       - functest-EXTERNAL_NETWORK:
@@ -588,8 +595,8 @@
 - job-template:
     name: 'functest-{tag}-zip'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
       - functest-build_tag:
           build_tag: ''
       - functest-EXTERNAL_NETWORK:
@@ -630,8 +637,8 @@
     triggers:
       - timed: '@weekly'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
       - functest-build_tag:
           build_tag: ''
       - functest-EXTERNAL_NETWORK:
@@ -910,8 +917,8 @@
 - job-template:
     name: 'functest-{repo}-{tag}-dep-pull'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
     builders:
       - functest-pull-dep-images:
           <<: *functest-dep
@@ -925,8 +932,8 @@
 - job-template:
     name: 'functest-{repo}-{tag}-dep-rmi'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
     builders:
       - functest-remove-dep-images:
           <<: *functest-dep
@@ -955,8 +962,7 @@
             python3.10 python3.10-dev python3.10-distutils \
             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
+            python3-pip enchant-2 -y
           sudo pip3 install tox tox-pip-version
 
           tox
@@ -970,8 +976,8 @@
       - functest-patchset-created:
           branch: '{branch}'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
     builders:
       - functest-tox:
 
@@ -984,8 +990,8 @@
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-gate'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
     scm:
       - functest-scm:
           ref: $GERRIT_REFSPEC
@@ -1004,22 +1010,6 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-gate'
 
-- project:
-    name: functest-opnfv-functest-tempest-{tag}-gate
-    <<: *functest-params
-    container: functest-tempest
-    ref_arg: BRANCH
-    path: docker/tempest
-    exclude:
-      - {'tag': 'latest'}
-      - {'tag': 'xena'}
-      - {'tag': 'wallaby'}
-      - {'tag': 'leguer'}
-      - {'tag': 'kali'}
-      - {'tag': 'jerma'}
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-gate'
-
 - project:
     name: functest-opnfv-functest-healthcheck-{tag}-gate
     <<: *functest-params
@@ -1098,8 +1088,8 @@
       - functest-patchset-created:
           branch: '{branch}'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
       - functest-build_tag:
           build_tag: ''
       - functest-EXTERNAL_NETWORK:
@@ -1147,11 +1137,6 @@
           projects:
             - name: 'functest-opnfv-functest-core-{tag}-gate'
               <<: *functest-jobs
-      - multijob:
-          name: build opnfv/functest-tempest
-          projects:
-            - name: 'functest-opnfv-functest-tempest-{tag}-gate'
-              <<: *functest-jobs
       - multijob:
           name: build containers
           projects:
@@ -1348,8 +1333,8 @@
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-build'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
     scm:
       - functest-scm:
           ref: '{branch}'
@@ -1371,22 +1356,6 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-build'
 
-- project:
-    name: functest-opnfv-functest-tempest-{tag}-build
-    <<: *functest-params
-    container: functest-tempest
-    ref_arg: BRANCH
-    path: docker/tempest
-    exclude:
-      - {'tag': 'latest'}
-      - {'tag': 'xena'}
-      - {'tag': 'wallaby'}
-      - {'tag': 'leguer'}
-      - {'tag': 'kali'}
-      - {'tag': 'jerma'}
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-build'
-
 - project:
     name: functest-opnfv-functest-healthcheck-{tag}-build
     <<: *functest-params
@@ -1450,8 +1419,8 @@
       - functest-scm:
           ref: '{branch}'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
     # PyYAML and yamllint differ here
     # see https://github.com/yaml/pyyaml/issues/234
     # yamllint disable rule:indentation
@@ -1476,11 +1445,6 @@
           projects:
             - name: 'functest-opnfv-functest-core-{tag}-build'
               <<: *functest-jobs
-      - multijob:
-          name: build opnfv/functest-tempest
-          projects:
-            - name: 'functest-opnfv-functest-tempest-{tag}-build'
-              <<: *functest-jobs
       - multijob:
           name: build containers
           projects:
@@ -1529,8 +1493,8 @@
     triggers:
       - timed: '@weekly'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
     builders:
       - functest-trivy:
           <<: *functest-containers
@@ -1548,13 +1512,6 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-trivy'
 
-- project:
-    name: 'functest-opnfv-functest-tempest-trivy'
-    <<: *functest-params
-    container: 'functest-tempest'
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-trivy'
-
 - project:
     name: 'functest-opnfv-functest-healthcheck-trivy'
     <<: *functest-params
@@ -1620,8 +1577,8 @@
     triggers:
       - timed: '@weekly'
     parameters:
-      - functest-slave:
-          slave: '{slave}'
+      - functest-node:
+          node: '{node}'
     builders:
       - functest-grype:
           <<: *functest-containers
@@ -1639,13 +1596,6 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-grype'
 
-- project:
-    name: 'functest-opnfv-functest-tempest-grype'
-    <<: *functest-params
-    container: 'functest-tempest'
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-grype'
-
 - project:
     name: 'functest-opnfv-functest-healthcheck-grype'
     <<: *functest-params
@@ -1688,6 +1638,91 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-grype'
 
+- builder:
+    name: functest-sbom
+    builders:
+      - shell: |
+          sudo apt-get -o DPkg::Lock::Timeout=300 update && \
+          sudo DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 install curl -y
+
+          sudo mkdir -p ~/.docker
+          curl -sSfL https://raw.githubusercontent.com/docker/sbom-cli-plugin/main/install.sh | sudo sh -s --
+          if [ "{repo}" = "_" ]; then
+            image={container}:{tag}
+          elif [ "{port}" = "None" ]; then
+            image={repo}/{container}:{tag}
+          else
+            image={repo}:{port}/{container}:{tag}
+          fi
+          sudo docker sbom $image
+
+- job-template:
+    name: 'functest-{repo}-{container}-{tag}-sbom'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-node:
+          node: '{node}'
+    builders:
+      - functest-sbom:
+          <<: *functest-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
+
+- project:
+    name: 'functest-opnfv-functest-core-sbom'
+    <<: *functest-params
+    container: 'functest-core'
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-sbom'
+
+- project:
+    name: 'functest-opnfv-functest-healthcheck-sbom'
+    <<: *functest-params
+    container: 'functest-healthcheck'
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-sbom'
+
+- project:
+    name: 'functest-opnfv-functest-smoke-sbom'
+    <<: *functest-params
+    container: 'functest-smoke'
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-sbom'
+
+- project:
+    name: 'functest-opnfv-functest-benchmarking-sbom'
+    <<: *functest-params
+    container: 'functest-benchmarking'
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-sbom'
+
+- project:
+    name: 'functest-opnfv-functest-vnf-sbom'
+    <<: *functest-params
+    container: 'functest-vnf'
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-sbom'
+
+- project:
+    name: 'functest-opnfv-functest-smoke-cntt-sbom'
+    <<: *functest-params
+    container: 'functest-smoke-cntt'
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-sbom'
+
+- project:
+    name: 'functest-opnfv-functest-benchmarking-cntt-sbom'
+    <<: *functest-params
+    container: 'functest-benchmarking-cntt'
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-sbom'
+
 - project:
     name: 'functest'
     <<: *functest-params
@@ -1729,3 +1764,15 @@
       - last-failure
       - last-duration
     regex: (?!functest-kubernetes)(?!functest-pi)^functest-[a-z-0-9.]+-grype$
+
+- view:
+    name: functest-sbom
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+    regex: (?!functest-kubernetes)(?!functest-pi)^functest-[a-z-0-9.]+-sbom$