X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Fxtesting.yaml;h=5484a59f7dc67e7ae6175ec9f8aeea201663fdf4;hb=6de2ba5b3c93036fe7ff2a1b92b2045eb77b06e2;hp=97911fcfdae5bc05be68a35801572341fdb1d17c;hpb=d1a590abb5d3f3e5c80cc195c7bc6438adcba62d;p=releng.git

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 97911fcfd..5484a59f7 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -1,7 +1,10 @@
 ---
-- xtesting-jobs: &xtesting-jobs
-    name: 'xtesting-jobs'
-    current-parameters: true
+- xtesting-containers: &xtesting-containers
+    name: 'xtesting-containers'
+    repo: '{repo}'
+    port: '{port}'
+    container: '{container}'
+    tag: '{tag}'
 
 - xtesting-params: &xtesting-params
     name: 'xtesting-params'
@@ -9,43 +12,66 @@
     port:
     tag:
       - latest:
+          from:
+          buildargs:
           branch: master
+          slave: lf-virtual1
+          dependency: 3.13
+      - leguer:
+          from:
+          buildargs:
+          branch: stable/leguer
+          slave: lf-virtual1
+          dependency: 3.12
+      - kali:
+          from:
+          buildargs:
+          branch: stable/kali
+          slave: lf-virtual1
+          dependency: 3.11
+      - jerma:
+          from:
+          buildargs:
+          branch: stable/jerma
+          slave: lf-virtual1
+          dependency: 3.10
+      - iruya:
+          from:
+          buildargs:
+          branch: stable/iruya
+          slave: lf-virtual1
+          dependency: 3.9
       - hunter:
+          from:
+          buildargs:
           branch: stable/hunter
-      - gambia:
-          branch: stable/gambia
+          slave: lf-virtual1
+          dependency: 3.9
+
+- xtesting-jobs: &xtesting-jobs
+    name: 'xtesting-jobs'
+    current-parameters: true
 
 - parameter:
     name: xtesting-slave
     parameters:
       - label:
           name: slave
-          default: lf-build2
+          default: '{slave}'
 
 - parameter:
-    name: xtesting-branch
+    name: xtesting-build_tag
     parameters:
-      - string:
-          name: branch
-          default: '{branch}'
+      - random-string:
+          name: build_tag
 
-- xtesting-containers: &xtesting-containers
-    name: 'xtesting-containers'
-    repo: '{repo}'
-    port: '{port}'
-    container: '{container}'
-    tag: '{tag}'
 
 - xtesting-run-containers: &xtesting-run-containers
-    name: 'xtesting-build-containers'
+    name: 'xtesting-run-containers'
     <<: *xtesting-containers
     test: '{test}'
-
-- xtesting-build-containers: &xtesting-build-containers
-    name: 'xtesting-build-containers'
-    <<: *xtesting-containers
-    ref_arg: '{ref_arg}'
-    path: '{path}'
+    privileged: '{privileged}'
+    network: '{network}'
 
 - builder:
     name: xtesting-pull-containers
@@ -61,29 +87,12 @@
           fi
           sudo docker pull $image
 
-- builder:
-    name: xtesting-build-containers
-    builders:
-      - shell: |
-          set +x
-          if [ "{repo}" = "_" ]; then
-            image={container}:{tag}
-          elif [ "{port}" = "None" ]; then
-            image={repo}/{container}:{tag}
-          else
-            image={repo}:{port}/{container}:{tag}
-          fi
-          cd {path}
-          sudo docker build --build-arg {ref_arg}={ref} \
-            --pull=false --no-cache --force-rm=true \
-            -t $image .
-
 - builder:
     name: xtesting-run-containers
     builders:
       - shell: |
-          set +ex
-          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
+          set +x
+          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -92,15 +101,18 @@
             image={repo}:{port}/{container}:{tag}
           fi
           sudo docker run --rm \
+            --privileged={privileged} \
+            --network={network} \
+            -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 /home/opnfv/xtesting/.boto:/root/.boto \
+            -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 BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-            $image run_tests -t {test}
-          res=$?
-          gsutil -m cp -r $WORKSPACE/ \
-            gs://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID > /dev/null 2>&1
-          find $WORKSPACE -type f \
-            -printf \
-            "http://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID/%P\n"
-          exit $res
+            $image run_tests -t {test} -p -r
 
 - builder:
     name: xtesting-remove-images
@@ -116,55 +128,65 @@
           fi
           sudo docker rmi $image || true
 
-- scm:
-    name: xtesting-scm
-    scm:
-      - git:
-          url: https://gerrit.opnfv.org/gerrit/functest-xtesting
-          refspec: '+refs/changes/*:refs/changes/*'
-          branches:
-            - '{ref}'
-
 - job-template:
-    name: '{repo}-{container}-{tag}-pull'
+    name: 'xtesting-{repo}-{container}-{tag}-pull'
     parameters:
-      - xtesting-slave
+      - xtesting-slave:
+          slave: '{slave}'
     builders:
       - xtesting-pull-containers:
           <<: *xtesting-containers
 
 - project:
-    name: 'opnfv-xtesting-pull'
+    name: 'xtesting-opnfv-xtesting-pull'
     <<: *xtesting-params
     container: 'xtesting'
     jobs:
-      - '{repo}-{container}-{tag}-pull'
+      - '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: '{repo}-{container}-{tag}-rmi'
+    name: 'xtesting-{repo}-{container}-{tag}-rmi'
     parameters:
-      - xtesting-slave
+      - xtesting-slave:
+          slave: '{slave}'
     builders:
       - xtesting-remove-images:
           <<: *xtesting-containers
 
 - project:
-    name: 'opnfv-xtesting-rmi'
+    name: 'xtesting-opnfv-xtesting-rmi'
     <<: *xtesting-params
     container: 'xtesting'
     jobs:
-      - '{repo}-{container}-{tag}-rmi'
+      - '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: '{repo}-{container}-{tag}-{test}-run'
+    name: 'xtesting-{repo}-{container}-{tag}-{test}-run'
     parameters:
-      - xtesting-slave
+      - xtesting-slave:
+          slave: '{slave}'
+      - xtesting-build_tag:
+          build_tag: ''
     builders:
       - xtesting-run-containers:
           <<: *xtesting-run-containers
 
 - project:
-    name: 'opnfv-xtesting'
+    name: 'xtesting-opnfv-xtesting'
     <<: *xtesting-params
     container: 'xtesting'
     test:
@@ -173,8 +195,65 @@
       - third
       - fourth
       - fifth
+      - sixth
+    privileged: 'false'
+    network: bridge
     jobs:
-      - '{repo}-{container}-{tag}-{test}-run'
+      - 'xtesting-{repo}-{container}-{tag}-{test}-run'
+
+- project:
+    name: 'xtesting-opnfv-xtesting-mts'
+    <<: *xtesting-params
+    container: 'xtesting-mts'
+    test:
+      - seventh
+    privileged: 'false'
+    network: bridge
+    jobs:
+      - 'xtesting-{repo}-{container}-{tag}-{test}-run'
+
+
+- builder:
+    name: xtesting-zip
+    builders:
+      - shell: |
+          set +x
+          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
+          if [ "{repo}" = "_" ]; then
+            image={container}:{tag}
+          elif [ "{port}" = "None" ]; then
+            image={repo}/{container}:{tag}
+          else
+            image={repo}:{port}/{container}:{tag}
+          fi
+          sudo docker run --rm \
+            -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 /home/opnfv/xtesting/.boto:/root/.boto \
+            -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 \
+            -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+            $image zip_campaign
+
+- job-template:
+    name: 'xtesting-{tag}-zip'
+    parameters:
+      - xtesting-slave:
+          slave: '{slave}'
+      - xtesting-build_tag:
+          build_tag: ''
+    builders:
+      - xtesting-zip:
+          <<: *xtesting-containers
+
+- project:
+    name: 'xtesting-{tag}-zip'
+    <<: *xtesting-params
+    container: 'xtesting'
+    jobs:
+      - 'xtesting-{tag}-zip'
 
 - job-template:
     name: 'xtesting-{tag}-daily'
@@ -182,222 +261,519 @@
     triggers:
       - timed: '@daily'
     parameters:
-      - xtesting-slave
+      - xtesting-slave:
+          slave: '{slave}'
+      - xtesting-build_tag:
+          build_tag: ''
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^xtesting-.*-[a-z0-9]*$'
+            - '^xtesting-{tag}-(daily|docker|review)$'
     builders:
       - multijob:
           name: remove former images
           projects:
-            - name: 'opnfv-xtesting-{tag}-rmi'
+            - name: 'xtesting-opnfv-xtesting-{tag}-rmi'
+              <<: *xtesting-jobs
+            - name: 'xtesting-opnfv-xtesting-mts-{tag}-rmi'
               <<: *xtesting-jobs
       - multijob:
           name: pull containers
           projects:
-            - name: 'opnfv-xtesting-{tag}-pull'
+            - name: 'xtesting-opnfv-xtesting-{tag}-pull'
+              <<: *xtesting-jobs
+            - name: 'xtesting-opnfv-xtesting-mts-{tag}-pull'
               <<: *xtesting-jobs
       - multijob:
           name: opnfv/xtesting:{tag}
           projects:
-            - name: 'opnfv-xtesting-{tag}-first-run'
+            - name: 'xtesting-opnfv-xtesting-{tag}-first-run'
+              <<: *xtesting-jobs
+            - name: 'xtesting-opnfv-xtesting-{tag}-second-run'
               <<: *xtesting-jobs
-            - name: 'opnfv-xtesting-{tag}-second-run'
+            - name: 'xtesting-opnfv-xtesting-{tag}-third-run'
               <<: *xtesting-jobs
-            - name: 'opnfv-xtesting-{tag}-third-run'
+            - name: 'xtesting-opnfv-xtesting-{tag}-fourth-run'
               <<: *xtesting-jobs
-            - name: 'opnfv-xtesting-{tag}-fourth-run'
+            - name: 'xtesting-opnfv-xtesting-{tag}-fifth-run'
               <<: *xtesting-jobs
-            - name: 'opnfv-xtesting-{tag}-fifth-run'
+            - name: 'xtesting-opnfv-xtesting-{tag}-sixth-run'
               <<: *xtesting-jobs
+      - multijob:
+          name: opnfv/xtesting-mts:{tag}
+          projects:
+            - name: 'xtesting-opnfv-xtesting-mts-{tag}-seventh-run'
+              <<: *xtesting-jobs
+      - multijob:
+          name: dump all campaign data
+          projects:
+            - name: 'xtesting-{tag}-zip'
+              <<: *xtesting-jobs
+
+- project:
+    name: 'xtesting-daily'
+    <<: *xtesting-params
+    jobs:
+      - 'xtesting-{tag}-daily'
+
+- view:
+    name: xtesting
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+    regex: ^xtesting-[a-z0-9.]+-daily$
+
+- xtesting-build-containers: &xtesting-build-containers
+    name: 'xtesting-build-containers'
+    <<: *xtesting-containers
+    ref_arg: '{ref_arg}'
+    path: '{path}'
+    buildargs: '{buildargs}'
+    from: '{from}'
+
+- builder:
+    name: xtesting-build-containers
+    builders:
+      - shell: |
+          set +x
+          if [ "{repo}" = "_" ]; then
+            image={container}:{tag}
+          elif [ "{port}" = "None" ]; then
+            image={repo}/{container}:{tag}
+          else
+            image={repo}:{port}/{container}:{tag}
+          fi
+          build_args=""
+          if [ "{buildargs}" != "None" ]; then
+            build_args="{buildargs}"
+          fi
+          if [ "{ref_arg}" != "None" ]; then
+            build_args="$build_args --build-arg {ref_arg}={ref}"
+          fi
+          cd {path}
+          if [ "{from}" != "None" ]; then
+              sed -i {from} Dockerfile
+          fi
+          sudo docker build $build_args \
+            --pull=false --no-cache --force-rm=true \
+            -t $image .
+
+- scm:
+    name: xtesting-scm
+    scm:
+      - git:
+          url: 'https://gerrit.opnfv.org/gerrit/functest-xtesting'
+          refspec: '+refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*'
+          branches:
+            - '{ref}'
+
+- xtesting-dep: &xtesting-dep
+    name: 'xtesting-containers'
+    repo: '{repo}'
+    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
+
+- job-template:
+    name: 'xtesting-{repo}-{tag}-dep-pull'
+    parameters:
+      - xtesting-slave:
+          slave: '{slave}'
+    builders:
+      - xtesting-pull-dep-images:
+          <<: *xtesting-dep
+
+- project:
+    name: 'xtesting-{repo}-{tag}-dep-pull'
+    <<: *xtesting-params
+    jobs:
+      - 'xtesting-{repo}-{tag}-dep-pull'
 
 - job-template:
-    name: '{repo}-{container}-{tag}-gate'
+    name: 'xtesting-{repo}-{tag}-dep-rmi'
     parameters:
-      - xtesting-slave
+      - xtesting-slave:
+          slave: '{slave}'
+    builders:
+      - xtesting-remove-dep-images:
+          <<: *xtesting-dep
+
+- project:
+    name: 'xtesting-{repo}-{tag}-dep-rmi'
+    <<: *xtesting-params
+    jobs:
+      - 'xtesting-{repo}-{tag}-dep-rmi'
+
+- builder:
+    name: xtesting-tox
+    builders:
+      - shell: |
+          set +x
+          sudo apt-get update && sudo apt-get install software-properties-common gpg -y
+          sudo add-apt-repository -y ppa:deadsnakes/ppa
+          sudo apt-get update && sudo apt-get install 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
+          sudo pip3 install tox tox-pip-version
+          tox
+
+- job-template:
+    name: 'xtesting-{tag}-tox'
     scm:
       - xtesting-scm:
           ref: $GERRIT_REFSPEC
+    triggers:
+      - xtesting-patchset-created:
+          branch: '{branch}'
+    parameters:
+      - xtesting-slave:
+          slave: '{slave}'
     builders:
-      - xtesting-build-containers:
-          <<: *xtesting-build-containers
-          ref: $GERRIT_REFSPEC
+      - xtesting-tox:
+
+- project:
+    name: xtesting-tox
+    <<: *xtesting-params
+    jobs:
+      - 'xtesting-{tag}-tox'
 
 - job-template:
-    name: '{repo}-{container}-{tag}-check'
+    name: 'xtesting-{repo}-{container}-{tag}-gate'
     parameters:
-      - xtesting-slave
-      - xtesting-branch:
-          branch: '{branch}'
+      - xtesting-slave:
+          slave: '{slave}'
     scm:
       - xtesting-scm:
-          ref: $branch
+          ref: $GERRIT_REFSPEC
     builders:
       - xtesting-build-containers:
           <<: *xtesting-build-containers
-          ref: $branch
-
-- project:
-    name: '_-alpine-3.8-rmi'
-    repo: _
-    port:
-    container: alpine
-    tag: 3.8
-    jobs:
-      - '{repo}-{container}-{tag}-rmi'
+          ref: $GERRIT_REFSPEC
+          buildargs: '{buildargs}'
 
 - project:
-    name: '_-alpine-3.8-pull'
-    repo: _
-    port:
-    container: alpine
-    tag: 3.8
+    name: xtesting-opnfv-xtesting-{tag}-gate
+    <<: *xtesting-params
+    container: xtesting
+    ref_arg: BRANCH
+    path: docker/core
     jobs:
-      - '{repo}-{container}-{tag}-pull'
+      - 'xtesting-{repo}-{container}-{tag}-gate'
 
 - project:
-    name: opnfv-xtesting-{tag}-build
+    name: xtesting-opnfv-xtesting-mts-{tag}-gate
     <<: *xtesting-params
-    container: xtesting
+    container: xtesting-mts
     ref_arg: BRANCH
-    path: docker
+    path: docker/mts
     jobs:
-      - '{repo}-{container}-{tag}-gate'
-      - '{repo}-{container}-{tag}-check'
+      - 'xtesting-{repo}-{container}-{tag}-gate'
+
+
+- trigger:
+    name: xtesting-patchset-created
+    triggers:
+      - gerrit:
+          trigger-on:
+            - patchset-created-event
+            - comment-added-contains-event:
+                comment-contains-value: 'recheck'
+            - comment-added-contains-event:
+                comment-contains-value: 'reverify'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: 'functest-xtesting'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
 
 - job-template:
-    name: 'xtesting-{tag}-check'
+    name: 'xtesting-{tag}-review'
     project-type: multijob
-    parameters:
-      - xtesting-slave
-      - xtesting-branch:
+    triggers:
+      - xtesting-patchset-created:
           branch: '{branch}'
+    parameters:
+      - xtesting-slave:
+          slave: '{slave}'
+      - xtesting-build_tag:
+          build_tag: ''
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^xtesting-.*-[a-z0-9]*$'
+            - '^xtesting-{tag}-(daily|docker|review)$'
     builders:
       - multijob:
           name: remove former images
           projects:
-            - name: 'opnfv-xtesting-{tag}-rmi'
+            - 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'
               <<: *xtesting-jobs
       - multijob:
-          name: remove dependencies
+          name: pull dependency
           projects:
-            - name: '_-alpine-3.8-rmi'
+            - name: 'xtesting-{repo}-{tag}-dep-pull'
               <<: *xtesting-jobs
       - multijob:
-          name: pull dependencies
+          name: opnfv/xtesting
           projects:
-            - name: '_-alpine-3.8-pull'
+            - name: 'xtesting-opnfv-xtesting-{tag}-gate'
               <<: *xtesting-jobs
       - multijob:
-          name: opnfv/functest-xtesting
+          name: opnfv/xtesting-mts
           projects:
-            - name: 'opnfv-xtesting-{tag}-check'
+            - name: 'xtesting-opnfv-xtesting-mts-{tag}-gate'
               <<: *xtesting-jobs
       - multijob:
           name: opnfv/xtesting:{tag}
           projects:
-            - name: 'opnfv-xtesting-{tag}-first-run'
+            - name: 'xtesting-opnfv-xtesting-{tag}-first-run'
+              <<: *xtesting-jobs
+            - name: 'xtesting-opnfv-xtesting-{tag}-second-run'
               <<: *xtesting-jobs
-            - name: 'opnfv-xtesting-{tag}-second-run'
+            - name: 'xtesting-opnfv-xtesting-{tag}-third-run'
               <<: *xtesting-jobs
-            - name: 'opnfv-xtesting-{tag}-third-run'
+            - name: 'xtesting-opnfv-xtesting-{tag}-fourth-run'
               <<: *xtesting-jobs
-            - name: 'opnfv-xtesting-{tag}-fourth-run'
+            - name: 'xtesting-opnfv-xtesting-{tag}-fifth-run'
               <<: *xtesting-jobs
-            - name: 'opnfv-xtesting-{tag}-fifth-run'
+            - name: 'xtesting-opnfv-xtesting-{tag}-sixth-run'
+              <<: *xtesting-jobs
+      - multijob:
+          name: opnfv/xtesting-mts:{tag}
+          projects:
+            - name: 'xtesting-opnfv-xtesting-mts-{tag}-seventh-run'
               <<: *xtesting-jobs
 
+- project:
+    name: 'xtesting-review'
+    <<: *xtesting-params
+    jobs:
+      - 'xtesting-{tag}-review'
+
+- view:
+    name: xtesting-review
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+    regex: ^xtesting-[a-z0-9.]+-review$
+
+- view:
+    name: xtesting-tox
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+    regex: ^xtesting-[a-z0-9.]+-tox$
+
+- builder:
+    name: xtesting-push-containers
+    builders:
+      - shell: |
+          set +x
+          if [ "{repo}" = "_" ]; then
+            image={container}:{tag}
+          elif [ "{port}" = "None" ]; then
+            image={repo}/{container}:{tag}
+          else
+            image={repo}:{port}/{container}:{tag}
+          fi
+          sudo docker push $image
+
 - trigger:
-    name: xtesting-patchset-created
+    name: xtesting-commit
     triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          trigger-on:
-            - patchset-created-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-            - comment-added-contains-event:
-                comment-contains-value: 'reverify'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: 'functest-xtesting'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-          skip-vote:
-            successful: false
-            failed: false
-            unstable: false
-            notbuilt: false
+      - pollscm:
+          cron: "*/30 * * * *"
 
 - job-template:
-    name: 'xtesting-{tag}-gate'
+    name: 'xtesting-{repo}-{container}-{tag}-build'
+    parameters:
+      - xtesting-slave:
+          slave: '{slave}'
+    scm:
+      - xtesting-scm:
+          ref: '{branch}'
+    builders:
+      - xtesting-build-containers:
+          <<: *xtesting-build-containers
+          ref: '{branch}'
+          buildargs: '{buildargs}'
+      - xtesting-push-containers:
+          <<: *xtesting-build-containers
+          ref: '{branch}'
+
+- project:
+    name: xtesting-opnfv-xtesting-{tag}-build
+    <<: *xtesting-params
+    container: xtesting
+    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'
+
+
+- job-template:
+    name: 'xtesting-{tag}-docker'
     project-type: multijob
     triggers:
-      - xtesting-patchset-created:
-          branch: '{branch}'
+      - xtesting-commit
+    scm:
+      - xtesting-scm:
+          ref: '{branch}'
     parameters:
-      - xtesting-slave
+      - xtesting-slave:
+          slave: '{slave}'
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^xtesting-.*-[a-z0-9]*$'
+            - '^xtesting-{tag}-(daily|docker|review)$'
     builders:
       - multijob:
-          name: remove former images
-          projects:
-            - name: 'opnfv-xtesting-{tag}-rmi'
-              <<: *xtesting-jobs
-      - multijob:
-          name: remove dependencies
+          name: remove dependency
           projects:
-            - name: '_-alpine-3.8-rmi'
+            - name: 'xtesting-{repo}-{tag}-dep-rmi'
               <<: *xtesting-jobs
       - multijob:
-          name: pull dependencies
+          name: pull dependency
           projects:
-            - name: '_-alpine-3.8-pull'
+            - name: 'xtesting-{repo}-{tag}-dep-pull'
               <<: *xtesting-jobs
       - multijob:
-          name: opnfv/functest-xtesting
+          name: opnfv/xtesting
           projects:
-            - name: 'opnfv-xtesting-{tag}-gate'
+            - name: 'xtesting-opnfv-xtesting-{tag}-build'
               <<: *xtesting-jobs
       - multijob:
-          name: opnfv/xtesting:{tag}
+          name: opnfv/xtesting-mts
           projects:
-            - name: 'opnfv-xtesting-{tag}-first-run'
-              <<: *xtesting-jobs
-            - name: 'opnfv-xtesting-{tag}-second-run'
-              <<: *xtesting-jobs
-            - name: 'opnfv-xtesting-{tag}-third-run'
-              <<: *xtesting-jobs
-            - name: 'opnfv-xtesting-{tag}-fourth-run'
-              <<: *xtesting-jobs
-            - name: 'opnfv-xtesting-{tag}-fifth-run'
+            - name: 'xtesting-opnfv-xtesting-mts-{tag}-build'
               <<: *xtesting-jobs
 
+- builder:
+    name: xtesting-trivy
+    builders:
+      - shell: |
+          sudo apt-get update && sudo apt-get install curl -y
+          curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b .
+          if [ "{repo}" = "_" ]; then
+            image={container}:{tag}
+          elif [ "{port}" = "None" ]; then
+            image={repo}/{container}:{tag}
+          else
+            image={repo}:{port}/{container}:{tag}
+          fi
+          ./trivy --exit-code 1 $image
+
+- job-template:
+    name: 'xtesting-{repo}-{container}-{tag}-trivy'
+    triggers:
+      - timed: '@daily'
+    parameters:
+      - xtesting-slave:
+          slave: '{slave}'
+    builders:
+      - xtesting-trivy:
+          <<: *xtesting-containers
+
+- project:
+    name: 'xtesting-opnfv-xtesting-trivy'
+    <<: *xtesting-params
+    container: 'xtesting'
+    jobs:
+      - 'xtesting-{repo}-{container}-{tag}-trivy'
+
+- project:
+    name: 'xtesting-opnfv-xtesting-mts-trivy'
+    <<: *xtesting-params
+    container: 'xtesting-mts'
+    jobs:
+      - 'xtesting-{repo}-{container}-{tag}-trivy'
+
 - project:
     name: 'xtesting'
     <<: *xtesting-params
     jobs:
-      - 'xtesting-{tag}-daily'
-      - 'xtesting-{tag}-check'
-      - 'xtesting-{tag}-gate'
+      - 'xtesting-{tag}-docker'
 
 - view:
-    name: xtesting
+    name: xtesting-docker
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+    regex: ^xtesting-[a-z0-9.]+-docker$
+
+- view:
+    name: xtesting-trivy
     view-type: list
     columns:
       - status
@@ -406,4 +782,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtesting-.*-[a-z0-9]*$
+    regex: (?!xtesting-pi)^xtesting-[a-z-0-9.]+-trivy$