Publish new Xtesting 2023.2 jobs

[releng.git] / jjb / functest / xtesting.yaml

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 9f38a86..fbd8ba4 100644 (file)
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -8,7 +8,54 @@
 
 - xtesting-params: &xtesting-params
     name: 'xtesting-params'
+    tag:
+      - latest:
+          from:
+          build_args:
+          branch: master
+          node: opnfv-build
+          dependency: 3.17
+      - 2023.2:
+          from:
+          build_args:
+          branch: stable/2023.2
+          node: opnfv-build
+          dependency: 3.17
+      - 2023.1:
+          from:
+          build_args:
+          branch: stable/2023.1
+          node: opnfv-build
+          dependency: 3.17
+      - zed:
+          from:
+          build_args:
+          branch: stable/zed
+          node: opnfv-build
+          dependency: 3.16
+      - yoga:
+          from:
+          build_args:
+          branch: stable/yoga
+          node: opnfv-build
+          dependency: 3.16
+      - xena:
+          from:
+          build_args:
+          branch: stable/xena
+          node: opnfv-build
+          dependency: 3.14
+      - wallaby:
+          from:
+          build_args:
+          branch: stable/wallaby
+          node: opnfv-build
+          dependency: 3.13
+
+- xtesting-opnfv-xtesting-params: &xtesting-opnfv-xtesting-params
+    name: 'xtesting-opnfv-xtesting-params'
     repo: 'opnfv'
+    container: 'xtesting'
     port:
     tag:
       - latest:
@@ -16,7 +63,19 @@
           build_args:
           branch: master
           node: opnfv-build
-          dependency: 3.16
+          dependency: 3.17
+      - 2023.2:
+          from:
+          build_args:
+          branch: stable/2023.2
+          node: opnfv-build
+          dependency: 3.17
+      - 2023.1:
+          from:
+          build_args:
+          branch: stable/2023.1
+          node: opnfv-build
+          dependency: 3.17
       - zed:
           from:
           build_args:
@@ -62,7 +121,6 @@
 - xtesting-run-containers: &xtesting-run-containers
     name: 'xtesting-run-containers'
     <<: *xtesting-containers
-    test: '{test}'
     privileged: '{privileged}'
     volumes: '{volumes}'
     env: '{env}'
@@ -124,7 +182,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 \
@@ -147,7 +205,7 @@
           sudo docker rmi $image || true
 
 - job-template:
-    name: 'xtesting-{repo}-{container}-{tag}-pull'
+    name: 'xtesting-opnfv-xtesting-{tag}-pull'
     parameters:
       - xtesting-node:
           node: '{node}'
@@ -157,20 +215,12 @@
 
 - project:
     name: 'xtesting-opnfv-xtesting-pull'
-    <<: *xtesting-params
-    container: 'xtesting'
-    jobs:
-      - 'xtesting-{repo}-{container}-{tag}-pull'
-
-- project:
-    name: 'xtesting-opnfv-xtesting-mts-pull'
-    <<: *xtesting-params
-    container: 'xtesting-mts'
+    <<: *xtesting-opnfv-xtesting-params
     jobs:
-      - 'xtesting-{repo}-{container}-{tag}-pull'
+      - 'xtesting-opnfv-xtesting-{tag}-pull'
 
 - job-template:
-    name: 'xtesting-{repo}-{container}-{tag}-rmi'
+    name: 'xtesting-opnfv-xtesting-{tag}-rmi'
     parameters:
       - xtesting-node:
           node: '{node}'
@@ -180,17 +230,9 @@
 
 - project:
     name: 'xtesting-opnfv-xtesting-rmi'
-    <<: *xtesting-params
-    container: 'xtesting'
+    <<: *xtesting-opnfv-xtesting-params
     jobs:
-      - 'xtesting-{repo}-{container}-{tag}-rmi'
-
-- project:
-    name: 'xtesting-opnfv-xtesting-mts-rmi'
-    <<: *xtesting-params
-    container: 'xtesting-mts'
-    jobs:
-      - 'xtesting-{repo}-{container}-{tag}-rmi'
+      - 'xtesting-opnfv-xtesting-{tag}-rmi'
 
 - job-template:
     name: 'xtesting-opnfv-xtesting-{tag}-{test}-run'
@@ -202,10 +244,11 @@
     builders:
       - xtesting-run-containers:
           <<: *xtesting-run-containers
+          test: '{test}'
 
 - project:
     name: 'xtesting-opnfv-xtesting'
-    <<: *xtesting-params
+    <<: *xtesting-opnfv-xtesting-params
     volumes:
     env:
     published_ports:
@@ -218,40 +261,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:
@@ -283,15 +305,18 @@
           sudo mkdir -p $WORKSPACE/results
           sudo chown {uid}:{gid} $WORKSPACE/results
           sudo docker run --rm \
+            --privileged={privileged} \
+            --network={network} \
             $volumes \
             $env \
             $published_ports \
             -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 NODE_NAME=$node \
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             $image zip_campaign
@@ -305,20 +330,17 @@
           build_tag: ''
     builders:
       - xtesting-zip:
-          <<: *xtesting-containers
-          volumes: '{volumes}'
-          env: '{env}'
-          uid: '{uid}'
-          gid: '{gid}'
-          published_ports: '{published_ports}'
+          <<: *xtesting-run-containers
 
 - project:
-    name: 'xtesting-{tag}-zip'
-    <<: *xtesting-params
+    name: 'xtesting-zip'
+    <<: *xtesting-opnfv-xtesting-params
     volumes:
     env:
     published_ports:
     container: 'xtesting'
+    privileged: 'false'
+    network: bridge
     uid: 1000
     gid: 1000
     jobs:
@@ -348,15 +370,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 +392,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
@@ -407,7 +422,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtesting-[a-z0-9.]+-daily$
+    regex: ^xtesting-[a-z0-9.-]+-daily$
 
 - xtesting-build-containers: &xtesting-build-containers
     name: 'xtesting-build-containers'
@@ -457,67 +472,60 @@
 - xtesting-dep: &xtesting-dep
     name: 'xtesting-containers'
     repo: '{repo}'
+    container: '{container}'
     port: '{port}'
-    tag: '{tag}'
-    dependency: '{dependency}'
-
-- builder:
-    name: xtesting-pull-dep-images
-    builders:
-      - shell: |
-          set +x
-          if [ "_" = "_" ]; then
-            image=alpine:{dependency}
-          elif [ "" = "None" ]; then
-            image=_/alpine:{dependency}
-          else
-            image=_:/alpine:{dependency}
-          fi
-          sudo docker pull $image || true
-
-- builder:
-    name: xtesting-remove-dep-images
-    builders:
-      - shell: |
-          set +x
-          if [ "_" = "_" ]; then
-            image=alpine:{dependency}
-          elif [ "" = "None" ]; then
-            image=_/alpine:{dependency}
-          else
-            image=_:/alpine:{dependency}
-          fi
-          sudo docker rmi $image || true
+    tag: '{dependency}'
 
 - job-template:
-    name: 'xtesting-{repo}-{tag}-dep-pull'
+    name: 'xtesting-{tag}-dep-pull'
     parameters:
       - xtesting-node:
           node: '{node}'
     builders:
-      - xtesting-pull-dep-images:
+      - xtesting-pull-containers:
           <<: *xtesting-dep
 
+- xtesting-dep-params: &xtesting-dep-params
+    name: 'xtesting-dep-params'
+    repo: '_'
+    container: 'alpine'
+    port:
+    tag:
+      - latest:
+          dependency: 3.17
+      - 2023.2:
+          dependency: 3.17
+      - 2023.1:
+          dependency: 3.17
+      - zed:
+          dependency: 3.16
+      - yoga:
+          dependency: 3.16
+      - xena:
+          dependency: 3.14
+      - wallaby:
+          dependency: 3.13
+
 - project:
-    name: 'xtesting-{repo}-{tag}-dep-pull'
-    <<: *xtesting-params
+    name: 'xtesting-dep-pull'
+    <<: *xtesting-dep-params
     jobs:
-      - 'xtesting-{repo}-{tag}-dep-pull'
+      - 'xtesting-{tag}-dep-pull'
 
 - job-template:
-    name: 'xtesting-{repo}-{tag}-dep-rmi'
+    name: 'xtesting-{tag}-dep-rmi'
     parameters:
       - xtesting-node:
           node: '{node}'
     builders:
-      - xtesting-remove-dep-images:
+      - xtesting-remove-images:
           <<: *xtesting-dep
 
 - project:
-    name: 'xtesting-{repo}-{tag}-dep-rmi'
-    <<: *xtesting-params
+    name: 'xtesting-dep-rmi'
+    <<: *xtesting-dep-params
     jobs:
-      - 'xtesting-{repo}-{tag}-dep-rmi'
+      - 'xtesting-{tag}-dep-rmi'
 
 - builder:
     name: xtesting-tox
@@ -538,7 +546,7 @@
             python3.9 python3.9-dev python3.9-distutils \
             python3.8 python3.8-dev python3.8-distutils \
             python3-pip enchant-2 -y
-          sudo pip3 install tox tox-pip-version
+          sudo pip3 install tox
 
           tox
 
@@ -563,7 +571,7 @@
       - 'xtesting-{tag}-tox'
 
 - job-template:
-    name: 'xtesting-{repo}-{container}-{tag}-gate'
+    name: 'xtesting-opnfv-xtesting-{tag}-gate'
     parameters:
       - xtesting-node:
           node: '{node}'
@@ -577,22 +585,15 @@
           build_args: '{build_args}'
 
 - project:
-    name: xtesting-opnfv-xtesting-{tag}-gate
+    name: xtesting-opnfv-xtesting-gate
     <<: *xtesting-params
+    repo: opnfv
+    port:
     container: xtesting
     ref_arg: BRANCH
     path: docker/core
     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'
+      - 'xtesting-opnfv-xtesting-{tag}-gate'
 
 - trigger:
     name: xtesting-patchset-created
@@ -636,28 +637,21 @@
           projects:
             - name: 'xtesting-opnfv-xtesting-{tag}-rmi'
               <<: *xtesting-jobs
-            - name: 'xtesting-opnfv-xtesting-mts-{tag}-rmi'
-              <<: *xtesting-jobs
       - multijob:
           name: remove dependency
           projects:
-            - name: 'xtesting-{repo}-{tag}-dep-rmi'
+            - name: 'xtesting-{tag}-dep-rmi'
               <<: *xtesting-jobs
       - multijob:
           name: pull dependency
           projects:
-            - name: 'xtesting-{repo}-{tag}-dep-pull'
+            - name: 'xtesting-{tag}-dep-pull'
               <<: *xtesting-jobs
       - multijob:
           name: opnfv/xtesting
           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 +669,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:
@@ -703,7 +694,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtesting-[a-z0-9.]+-review$
+    regex: ^xtesting-[a-z0-9.-]+-review$
 
 - view:
     name: xtesting-tox
@@ -715,7 +706,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtesting-[a-z0-9.]+-tox$
+    regex: ^xtesting-[a-z0-9.-]+-tox$
 
 - builder:
     name: xtesting-push-containers
@@ -738,7 +729,7 @@
           cron: "*/30 * * * *"
 
 - job-template:
-    name: 'xtesting-{repo}-{container}-{tag}-build'
+    name: 'xtesting-opnfv-xtesting-{tag}-build'
     parameters:
       - xtesting-node:
           node: '{node}'
@@ -755,22 +746,15 @@
           ref: '{branch}'
 
 - project:
-    name: xtesting-opnfv-xtesting-{tag}-build
+    name: xtesting-opnfv-xtesting-build
     <<: *xtesting-params
+    repo: opnfv
     container: xtesting
+    port:
     ref_arg: BRANCH
     path: docker/core
     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'
+      - 'xtesting-opnfv-xtesting-{tag}-build'
 
 - job-template:
     name: 'xtesting-{tag}-docker'
@@ -795,23 +779,18 @@
       - multijob:
           name: remove dependency
           projects:
-            - name: 'xtesting-{repo}-{tag}-dep-rmi'
+            - name: 'xtesting-{tag}-dep-rmi'
               <<: *xtesting-jobs
       - multijob:
           name: pull dependency
           projects:
-            - name: 'xtesting-{repo}-{tag}-dep-pull'
+            - name: 'xtesting-{tag}-dep-pull'
               <<: *xtesting-jobs
       - multijob:
           name: opnfv/xtesting
           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
@@ -819,6 +798,12 @@
           fixed: true
           recipients: cedric.ollivier@orange.com
 
+- project:
+    name: 'xtesting-docker'
+    <<: *xtesting-params
+    jobs:
+      - 'xtesting-{tag}-docker'
+
 - builder:
     name: xtesting-trivy
     builders:
@@ -838,7 +823,7 @@
           ./trivy image --exit-code 1 $image
 
 - job-template:
-    name: 'xtesting-{repo}-{container}-{tag}-trivy'
+    name: 'xtesting-opnfv-xtesting-{tag}-trivy'
     triggers:
       - timed: '@daily'
     parameters:
@@ -857,16 +842,11 @@
 - project:
     name: 'xtesting-opnfv-xtesting-trivy'
     <<: *xtesting-params
+    repo: 'opnfv'
     container: 'xtesting'
+    port:
     jobs:
-      - 'xtesting-{repo}-{container}-{tag}-trivy'
-
-- project:
-    name: 'xtesting-opnfv-xtesting-mts-trivy'
-    <<: *xtesting-params
-    container: 'xtesting-mts'
-    jobs:
-      - 'xtesting-{repo}-{container}-{tag}-trivy'
+      - 'xtesting-opnfv-xtesting-{tag}-trivy'
 
 - builder:
     name: xtesting-grype
@@ -887,7 +867,7 @@
           ./grype -q $image
 
 - job-template:
-    name: 'xtesting-{repo}-{container}-{tag}-grype'
+    name: 'xtesting-opnfv-xtesting-{tag}-grype'
     triggers:
       - timed: '@daily'
     parameters:
@@ -906,22 +886,56 @@
 - project:
     name: 'xtesting-opnfv-xtesting-grype'
     <<: *xtesting-params
+    repo: 'opnfv'
     container: 'xtesting'
+    port:
     jobs:
-      - 'xtesting-{repo}-{container}-{tag}-grype'
+      - 'xtesting-opnfv-xtesting-{tag}-grype'
 
-- project:
-    name: 'xtesting-opnfv-xtesting-mts-grype'
-    <<: *xtesting-params
-    container: 'xtesting-mts'
-    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-opnfv-xtesting-{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'
+    name: 'xtesting-opnfv-xtesting-sbom'
     <<: *xtesting-params
+    repo: 'opnfv'
+    container: 'xtesting'
+    port:
     jobs:
-      - 'xtesting-{tag}-docker'
+      - 'xtesting-opnfv-xtesting-{tag}-sbom'
 
 - view:
     name: xtesting-docker
@@ -933,7 +947,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtesting-[a-z0-9.]+-docker$
+    regex: ^xtesting-[a-z0-9.-]+-docker$
 
 - view:
     name: xtesting-trivy
@@ -958,3 +972,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$