X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes.yaml;h=2a1f229b4956de66e9955a2206a0a0818055b029;hb=913e09383a46803dcc96da4b52304a6d48421f14;hp=349feb376525e3017fe9897f42bd4f280c08eb90;hpb=480bbef4fbe5b2ff73b1dccff4843357fc056e0c;p=releng.git

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 349feb376..2a1f229b4 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -15,31 +15,37 @@
           from:
           build_args:
           branch: master
-          slave: lf-virtual1-9
-          dependency: 3.15
+          node: lf-virtual1-9
+          dependency: 3.16
+      - v1.26:
+          from:
+          build_args:
+          branch: stable/v1.26
+          node: lf-virtual1-1
+          dependency: 3.16
       - v1.25:
           from:
           build_args:
           branch: stable/v1.25
-          slave: lf-virtual1-8
-          dependency: 3.15
+          node: lf-virtual1-8
+          dependency: 3.16
       - v1.24:
           from:
           build_args:
           branch: stable/v1.24
-          slave: lf-virtual1-7
-          dependency: 3.15
+          node: lf-virtual1-7
+          dependency: 3.16
       - v1.23:
           from:
           build_args:
           branch: stable/v1.23
-          slave: lf-virtual1-6
+          node: lf-virtual1-6
           dependency: 3.14
       - v1.22:
           from:
           build_args:
           branch: stable/v1.22
-          slave: lf-virtual1-5
+          node: lf-virtual1-5
           dependency: 3.14
 
 - functest-kubernetes-jobs: &functest-kubernetes-jobs
@@ -47,11 +53,11 @@
     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
@@ -134,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
@@ -156,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
@@ -200,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
@@ -244,8 +250,8 @@
 - 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:
@@ -277,8 +283,8 @@
 - 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:
@@ -323,8 +329,8 @@
 - 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:
@@ -357,8 +363,8 @@
 - 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:
@@ -390,8 +396,8 @@
 - 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:
@@ -468,8 +474,8 @@
 - 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:
@@ -504,8 +510,8 @@
     triggers:
       - timed: '@weekly'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
       - functest-kubernetes-build_tag:
           build_tag: ''
       - functest-kubernetes-DEPLOY_SCENARIO:
@@ -516,7 +522,8 @@
     properties:
       - build-blocker:
           blocking-jobs:
-          - ^functest-kubernetes-(pi-)*.*-(daily|docker|review)$
+          - ^functest-kubernetes-(pi-)*.*-(daily|review)$
+          - ^functest-kubernetes-(pi-)*{tag}-docker$
     # yamllint enable rule:indentation
     builders:
       - multijob:
@@ -724,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
@@ -739,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
@@ -783,8 +790,8 @@
       - functest-kubernetes-patchset-created:
           branch: '{branch}'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
     builders:
       - functest-kubernetes-tox:
 
@@ -797,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
@@ -886,8 +893,8 @@
       - 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:
@@ -898,7 +905,8 @@
     properties:
       - build-blocker:
           blocking-jobs:
-          - ^functest-kubernetes-(pi-)*.*-(daily|docker|review)$
+          - ^functest-kubernetes-(pi-)*.*-(daily|review)$
+          - ^functest-kubernetes-(pi-)*{tag}-docker$
     # yamllint enable rule:indentation
     builders:
       - multijob:
@@ -1074,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}'
@@ -1151,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-)*.*-(daily|docker|review)$
+          - ^functest-kubernetes-(pi-)*{tag}-(daily|review)$
     # yamllint enable rule:indentation
     builders:
       - multijob:
@@ -1226,8 +1234,8 @@
     triggers:
       - timed: '@weekly'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
     builders:
       - functest-kubernetes-trivy:
           <<: *functest-kubernetes-containers
@@ -1303,8 +1311,8 @@
     triggers:
       - timed: '@weekly'
     parameters:
-      - functest-kubernetes-slave:
-          slave: '{slave}'
+      - functest-kubernetes-node:
+          node: '{node}'
     builders:
       - functest-kubernetes-grype:
           <<: *functest-kubernetes-containers
@@ -1357,6 +1365,84 @@
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-grype'
 
+- builder:
+    name: functest-kubernetes-sbom
+    builders:
+      - shell: |
+          apt-get -o DPkg::Lock::Timeout=300 update && \
+          DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 install curl -y
+
+          mkdir -p ~/.docker
+          curl -sSfL https://raw.githubusercontent.com/docker/sbom-cli-plugin/main/install.sh | sh -s --
+          if [ "{repo}" = "_" ]; then
+            image={container}:{tag}
+          elif [ "{port}" = "None" ]; then
+            image={repo}/{container}:{tag}
+          else
+            image={repo}:{port}/{container}:{tag}
+          fi
+          docker sbom $image
+
+- job-template:
+    name: 'functest-kubernetes-{repo}-{container}-{tag}-sbom'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-kubernetes-node:
+          node: '{node}'
+    builders:
+      - functest-kubernetes-sbom:
+          <<: *functest-kubernetes-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-core-sbom'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-core'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-sbom'
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-sbom'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-healthcheck'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-sbom'
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-sbom'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-cnf'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-sbom'
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-sbom'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-security'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-sbom'
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-sbom'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-smoke'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-sbom'
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-sbom'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-benchmarking'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-sbom'
+
 - project:
     name: 'functest-kubernetes'
     <<: *functest-kubernetes-params
@@ -1398,3 +1484,15 @@
       - last-failure
       - last-duration
     regex: (?!functest-kubernetes-pi)(?!functest-kubernetes-ng)^functest-kubernetes-[a-z-0-9.]+-grype$
+
+- view:
+    name: functest-kubernetes-sbom
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+    regex: (?!functest-kubernetes-pi)(?!functest-kubernetes-ng)^functest-kubernetes-[a-z-0-9.]+-sbom$