X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Fxtesting.yaml;h=1239ad0bec46f75e47368f5e9d1b59032ac4e48e;hb=54ee9047e99b3e26358ed431131a578762c19cc8;hp=5c444d428f5400694d0932b50664f634adb1779e;hpb=7c2184df65920a05d8ba420969d027b217f3c900;p=releng.git

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 5c444d428..1239ad0be 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,29 +12,39 @@
     port:
     tag:
       - latest:
+          from:
+          buildargs:
           branch: master
           slave: lf-virtual1
           dependency: 3.13
+      - wallaby:
+          from:
+          buildargs:
+          branch: stable/wallaby
+          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:
-          branch: stable/iruya
-          slave: lf-virtual1
-          dependency: 3.9
-      - hunter:
-          branch: stable/hunter
-          slave: lf-virtual1
-          dependency: 3.9
+
+- xtesting-jobs: &xtesting-jobs
+    name: 'xtesting-jobs'
+    current-parameters: true
 
 - parameter:
     name: xtesting-slave
@@ -47,13 +60,6 @@
           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-run-containers'
     <<: *xtesting-containers
@@ -116,43 +122,6 @@
           fi
           sudo docker rmi $image || true
 
-- xtesting-build-containers: &xtesting-build-containers
-    name: 'xtesting-build-containers'
-    <<: *xtesting-containers
-    ref_arg: '{ref_arg}'
-    path: '{path}'
-
-- 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
-          if [ "{ref_arg}" = "None" ]; then
-            build_arg=""
-          else
-            build_arg="--build-arg {ref_arg}={ref}"
-          fi
-          cd {path}
-          sudo docker build $build_arg \
-            --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}'
-
 - job-template:
     name: 'xtesting-{repo}-{container}-{tag}-pull'
     parameters:
@@ -221,8 +190,13 @@
       - fourth
       - fifth
       - sixth
+      - eighth
     privileged: 'false'
     network: bridge
+    exclude:
+      - {'tag': 'leguer', 'test': 'eighth'}
+      - {'tag': 'kali', 'test': 'eighth'}
+      - {'tag': 'jerma', 'test': 'eighth'}
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-{test}-run'
 
@@ -243,6 +217,7 @@
     builders:
       - shell: |
           set +x
+          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -294,7 +269,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^xtesting-{tag}-(daily|review)$'
+            - '^xtesting-{tag}-(daily|docker|review)$'
     builders:
       - multijob:
           name: remove former images
@@ -325,6 +300,8 @@
               <<: *xtesting-jobs
             - name: 'xtesting-opnfv-xtesting-{tag}-sixth-run'
               <<: *xtesting-jobs
+            - name: 'xtesting-opnfv-xtesting-{tag}-eighth-run'
+              <<: *xtesting-jobs
       - multijob:
           name: opnfv/xtesting-mts:{tag}
           projects:
@@ -336,6 +313,68 @@
             - 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}'
@@ -350,10 +389,10 @@
           set +x
           if [ "_" = "_" ]; then
             image=alpine:{dependency}
-          elif [ "_" = "None" ]; then
+          elif [ "" = "None" ]; then
             image=_/alpine:{dependency}
           else
-            image=_:/alpine{dependency}
+            image=_:/alpine:{dependency}
           fi
           sudo docker pull $image || true
 
@@ -364,10 +403,10 @@
           set +x
           if [ "_" = "_" ]; then
             image=alpine:{dependency}
-          elif [ "_" = "None" ]; then
+          elif [ "" = "None" ]; then
             image=_/alpine:{dependency}
           else
-            image=_:/alpine{dependency}
+            image=_:/alpine:{dependency}
           fi
           sudo docker rmi $image || true
 
@@ -406,13 +445,15 @@
     builders:
       - shell: |
           set +x
-          sudo apt-get update && apt-get install software-properties-common gpg -y
+          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 && apt-get install python3.8 python3.8-dev \
-            python3.8-distutils \
+          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:
@@ -435,6 +476,20 @@
     jobs:
       - 'xtesting-{tag}-tox'
 
+- job-template:
+    name: 'xtesting-{repo}-{container}-{tag}-gate'
+    parameters:
+      - xtesting-slave:
+          slave: '{slave}'
+    scm:
+      - xtesting-scm:
+          ref: $GERRIT_REFSPEC
+    builders:
+      - xtesting-build-containers:
+          <<: *xtesting-build-containers
+          ref: $GERRIT_REFSPEC
+          buildargs: '{buildargs}'
+
 - project:
     name: xtesting-opnfv-xtesting-{tag}-gate
     <<: *xtesting-params
@@ -454,19 +509,6 @@
       - 'xtesting-{repo}-{container}-{tag}-gate'
 
 
-- job-template:
-    name: 'xtesting-{repo}-{container}-{tag}-gate'
-    parameters:
-      - xtesting-slave:
-          slave: '{slave}'
-    scm:
-      - xtesting-scm:
-          ref: $GERRIT_REFSPEC
-    builders:
-      - xtesting-build-containers:
-          <<: *xtesting-build-containers
-          ref: $GERRIT_REFSPEC
-
 - trigger:
     name: xtesting-patchset-created
     triggers:
@@ -500,7 +542,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^xtesting-{tag}-(daily|review)$'
+            - '^xtesting-{tag}-(daily|docker|review)$'
     builders:
       - multijob:
           name: remove former images
@@ -544,12 +586,44 @@
               <<: *xtesting-jobs
             - name: 'xtesting-opnfv-xtesting-{tag}-sixth-run'
               <<: *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'
               <<: *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:
@@ -582,6 +656,7 @@
       - xtesting-build-containers:
           <<: *xtesting-build-containers
           ref: '{branch}'
+          buildargs: '{buildargs}'
       - xtesting-push-containers:
           <<: *xtesting-build-containers
           ref: '{branch}'
@@ -616,6 +691,12 @@
     parameters:
       - xtesting-slave:
           slave: '{slave}'
+    properties:
+      - build-blocker:
+          use-build-blocker: true
+          blocking-level: 'NODE'
+          blocking-jobs:
+            - '^xtesting-{tag}-(daily|docker|review)$'
     builders:
       - multijob:
           name: remove dependency
@@ -642,6 +723,8 @@
     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}
@@ -654,6 +737,8 @@
 
 - job-template:
     name: 'xtesting-{repo}-{container}-{tag}-trivy'
+    triggers:
+      - timed: '@daily'
     parameters:
       - xtesting-slave:
           slave: '{slave}'
@@ -667,6 +752,7 @@
     container: 'xtesting'
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-trivy'
+
 - project:
     name: 'xtesting-opnfv-xtesting-mts-trivy'
     <<: *xtesting-params
@@ -678,47 +764,8 @@
     name: 'xtesting'
     <<: *xtesting-params
     jobs:
-      - 'xtesting-{tag}-daily'
-      - 'xtesting-{tag}-review'
       - 'xtesting-{tag}-docker'
 
-
-- view:
-    name: xtesting-daily
-    view-type: list
-    columns:
-      - status
-      - weather
-      - job
-      - last-success
-      - last-failure
-      - last-duration
-    regex: ^xtesting-[a-z-]+-daily$
-
-- view:
-    name: xtesting-review
-    view-type: list
-    columns:
-      - status
-      - weather
-      - job
-      - last-success
-      - last-failure
-      - last-duration
-    regex: ^xtesting-[a-z-]+-review$
-
-- view:
-    name: xtesting-tox
-    view-type: list
-    columns:
-      - status
-      - weather
-      - job
-      - last-success
-      - last-failure
-      - last-duration
-    regex: ^xtesting-[a-z-]+-tox$
-
 - view:
     name: xtesting-docker
     view-type: list
@@ -729,7 +776,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtesting-[a-z-]+-docker$
+    regex: ^xtesting-[a-z0-9.]+-docker$
 
 - view:
     name: xtesting-trivy
@@ -741,4 +788,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtesting-[a-z-]+-trivy$
+    regex: (?!xtesting-pi)^xtesting-[a-z-0-9.]+-trivy$