X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Fxtesting.yaml;h=cecd047076411202c40dc924d354f8d7459f345f;hb=39104196379b50039ee7801514536837768112ee;hp=a9f1d75c857d56ea0776d9e18e778bbce0a3e71d;hpb=72f6fd79fac2f13c3cc08572f056b0f847916cdd;p=releng.git

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index a9f1d75c8..cecd04707 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -15,31 +15,37 @@
           from:
           build_args:
           branch: master
-          node: lf-virtual1
-          dependency: 3.16
+          node: xtesting
+          dependency: 3.17
+      - 2023.1:
+          from:
+          build_args:
+          branch: stable/2023.1
+          node: xtesting
+          dependency: 3.17
       - zed:
           from:
           build_args:
           branch: stable/zed
-          node: lf-virtual1
+          node: xtesting
           dependency: 3.16
       - yoga:
           from:
           build_args:
           branch: stable/yoga
-          node: lf-virtual1
+          node: xtesting
           dependency: 3.16
       - xena:
           from:
           build_args:
           branch: stable/xena
-          node: lf-virtual1
+          node: xtesting
           dependency: 3.14
       - wallaby:
           from:
           build_args:
           branch: stable/wallaby
-          node: lf-virtual1
+          node: xtesting
           dependency: 3.13
 
 - xtesting-jobs: &xtesting-jobs
@@ -124,7 +130,7 @@
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
             -e S3_DST_URL=s3://artifacts.opnfv.org/xtesting/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
             -e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
-            -v /etc/boto.cfg:/etc/boto.cfg \
+            -v /home/opnfv/xtesting/.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=$node \
@@ -162,13 +168,6 @@
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-pull'
 
-- project:
-    name: 'xtesting-opnfv-xtesting-mts-pull'
-    <<: *xtesting-params
-    container: 'xtesting-mts'
-    jobs:
-      - 'xtesting-{repo}-{container}-{tag}-pull'
-
 - job-template:
     name: 'xtesting-{repo}-{container}-{tag}-rmi'
     parameters:
@@ -185,13 +184,6 @@
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-rmi'
 
-- project:
-    name: 'xtesting-opnfv-xtesting-mts-rmi'
-    <<: *xtesting-params
-    container: 'xtesting-mts'
-    jobs:
-      - 'xtesting-{repo}-{container}-{tag}-rmi'
-
 - job-template:
     name: 'xtesting-opnfv-xtesting-{tag}-{test}-run'
     parameters:
@@ -218,40 +210,19 @@
       - fifth
       - sixth
       - eighth
+      - nineth
     privileged: 'false'
     network: bridge
     uid: 1000
     gid: 1000
+    exclude:
+      - tag: wallaby
+        test: nineth
+      - tag: xena
+        test: nineth
     jobs:
       - 'xtesting-opnfv-xtesting-{tag}-{test}-run'
 
-- job-template:
-    name: 'xtesting-opnfv-xtesting-mts-{tag}-{test}-run'
-    parameters:
-      - xtesting-node:
-          node: '{node}'
-      - xtesting-build_tag:
-          build_tag: ''
-    builders:
-      - xtesting-run-containers:
-          <<: *xtesting-run-containers
-
-- project:
-    name: 'xtesting-opnfv-xtesting-mts'
-    <<: *xtesting-params
-    volumes:
-    env:
-    published_ports:
-    container: 'xtesting-mts'
-    test:
-      - seventh
-    privileged: 'false'
-    network: bridge
-    uid: 1000
-    gid: 1000
-    jobs:
-      - 'xtesting-opnfv-xtesting-mts-{tag}-{test}-run'
-
 - builder:
     name: xtesting-zip
     builders:
@@ -289,7 +260,7 @@
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
             -e S3_DST_URL=s3://artifacts.opnfv.org/xtesting \
             -e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting \
-            -v /etc/boto.cfg:/etc/boto.cfg \
+            -v /home/opnfv/xtesting/.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 BUILD_TAG=$BUILD_TAG \
@@ -348,15 +319,11 @@
           projects:
             - name: 'xtesting-opnfv-xtesting-{tag}-rmi'
               <<: *xtesting-jobs
-            - name: 'xtesting-opnfv-xtesting-mts-{tag}-rmi'
-              <<: *xtesting-jobs
       - multijob:
           name: pull containers
           projects:
             - name: 'xtesting-opnfv-xtesting-{tag}-pull'
               <<: *xtesting-jobs
-            - name: 'xtesting-opnfv-xtesting-mts-{tag}-pull'
-              <<: *xtesting-jobs
       - multijob:
           name: opnfv/xtesting:{tag}
           projects:
@@ -374,10 +341,7 @@
               <<: *xtesting-jobs
             - name: 'xtesting-opnfv-xtesting-{tag}-eighth-run'
               <<: *xtesting-jobs
-      - multijob:
-          name: opnfv/xtesting-mts:{tag}
-          projects:
-            - name: 'xtesting-opnfv-xtesting-mts-{tag}-seventh-run'
+            - name: 'xtesting-opnfv-xtesting-{tag}-nineth-run'
               <<: *xtesting-jobs
       - multijob:
           name: dump all campaign data
@@ -585,15 +549,6 @@
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-gate'
 
-- project:
-    name: xtesting-opnfv-xtesting-mts-{tag}-gate
-    <<: *xtesting-params
-    container: xtesting-mts
-    ref_arg: BRANCH
-    path: docker/mts
-    jobs:
-      - 'xtesting-{repo}-{container}-{tag}-gate'
-
 - trigger:
     name: xtesting-patchset-created
     triggers:
@@ -636,8 +591,6 @@
           projects:
             - name: 'xtesting-opnfv-xtesting-{tag}-rmi'
               <<: *xtesting-jobs
-            - name: 'xtesting-opnfv-xtesting-mts-{tag}-rmi'
-              <<: *xtesting-jobs
       - multijob:
           name: remove dependency
           projects:
@@ -653,11 +606,6 @@
           projects:
             - name: 'xtesting-opnfv-xtesting-{tag}-gate'
               <<: *xtesting-jobs
-      - multijob:
-          name: opnfv/xtesting-mts
-          projects:
-            - name: 'xtesting-opnfv-xtesting-mts-{tag}-gate'
-              <<: *xtesting-jobs
       - multijob:
           name: opnfv/xtesting:{tag}
           projects:
@@ -675,10 +623,7 @@
               <<: *xtesting-jobs
             - name: 'xtesting-opnfv-xtesting-{tag}-eighth-run'
               <<: *xtesting-jobs
-      - multijob:
-          name: opnfv/xtesting-mts:{tag}
-          projects:
-            - name: 'xtesting-opnfv-xtesting-mts-{tag}-seventh-run'
+            - name: 'xtesting-opnfv-xtesting-{tag}-nineth-run'
               <<: *xtesting-jobs
     publishers:
       - email-ext:
@@ -763,15 +708,6 @@
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-build'
 
-- project:
-    name: xtesting-opnfv-xtesting-mts-{tag}-build
-    <<: *xtesting-params
-    container: xtesting-mts
-    ref_arg: BRANCH
-    path: docker/mts
-    jobs:
-      - 'xtesting-{repo}-{container}-{tag}-build'
-
 - job-template:
     name: 'xtesting-{tag}-docker'
     project-type: multijob
@@ -807,11 +743,6 @@
           projects:
             - name: 'xtesting-opnfv-xtesting-{tag}-build'
               <<: *xtesting-jobs
-      - multijob:
-          name: opnfv/xtesting-mts
-          projects:
-            - name: 'xtesting-opnfv-xtesting-mts-{tag}-build'
-              <<: *xtesting-jobs
     publishers:
       - email-ext:
           failure: false
@@ -861,13 +792,6 @@
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-trivy'
 
-- project:
-    name: 'xtesting-opnfv-xtesting-mts-trivy'
-    <<: *xtesting-params
-    container: 'xtesting-mts'
-    jobs:
-      - 'xtesting-{repo}-{container}-{tag}-trivy'
-
 - builder:
     name: xtesting-grype
     builders:
@@ -910,12 +834,48 @@
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-grype'
 
+- builder:
+    name: xtesting-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: 'xtesting-{repo}-{container}-{tag}-sbom'
+    triggers:
+      - timed: '@daily'
+    parameters:
+      - xtesting-node:
+          node: '{node}'
+    builders:
+      - xtesting-sbom:
+          <<: *xtesting-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
+
 - project:
-    name: 'xtesting-opnfv-xtesting-mts-grype'
+    name: 'xtesting-opnfv-xtesting-sbom'
     <<: *xtesting-params
-    container: 'xtesting-mts'
+    container: 'xtesting'
     jobs:
-      - 'xtesting-{repo}-{container}-{tag}-grype'
+      - 'xtesting-{repo}-{container}-{tag}-sbom'
 
 - project:
     name: 'xtesting'
@@ -958,3 +918,15 @@
       - last-failure
       - last-duration
     regex: (?!xtesting-pi)^xtesting-[a-z-0-9.]+-grype$
+
+- view:
+    name: xtesting-sbom
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+    regex: (?!xtesting-pi)^xtesting-[a-z-0-9.]+-sbom$