X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Fxtesting.yaml;h=508d4f385b5923a13aa1d7f4ac31ad53df5d405f;hb=refs%2Fchanges%2F66%2F72966%2F1;hp=5d2d9bed9ebf81dae616058372900b3f9fe48233;hpb=7704a7556f9796f2a53990c101560c61046bdda7;p=releng.git

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 5d2d9bed9..508d4f385 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,45 @@
     port:
     tag:
       - latest:
+          from:
+          build_args:
           branch: master
           slave: lf-virtual1
+          dependency: 3.14
+      - xena:
+          from:
+          build_args:
+          branch: stable/xena
+          slave: lf-virtual1
+          dependency: 3.14
+      - wallaby:
+          from:
+          build_args:
+          branch: stable/wallaby
+          slave: lf-virtual1
           dependency: 3.13
       - leguer:
+          from:
+          build_args:
           branch: stable/leguer
           slave: lf-virtual1
           dependency: 3.12
       - kali:
+          from:
+          build_args:
           branch: stable/kali
           slave: lf-virtual1
           dependency: 3.11
       - jerma:
+          from:
+          build_args:
           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
@@ -46,19 +65,13 @@
       - 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-run-containers'
     <<: *xtesting-containers
     test: '{test}'
     privileged: '{privileged}'
+    volumes: '{volumes}'
+    env: '{env}'
     network: '{network}'
 
 - builder:
@@ -80,6 +93,16 @@
     builders:
       - shell: |
           set +x
+          volumes=;
+          if [ "{volumes}" != "None" ]; then
+            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); \
+              do volumes="-v $i $volumes"; done
+          fi
+          env=;
+          if [ "{env}" != "None" ]; then
+            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
+              do env="-e $i $env"; done
+          fi
           [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -91,6 +114,8 @@
           sudo docker run --rm \
             --privileged={privileged} \
             --network={network} \
+            $volumes \
+            $env \
             -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 \
@@ -116,43 +141,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:
@@ -200,7 +188,7 @@
       - 'xtesting-{repo}-{container}-{tag}-rmi'
 
 - job-template:
-    name: 'xtesting-{repo}-{container}-{tag}-{test}-run'
+    name: 'xtesting-opnfv-xtesting-{tag}-{test}-run'
     parameters:
       - xtesting-slave:
           slave: '{slave}'
@@ -213,6 +201,8 @@
 - project:
     name: 'xtesting-opnfv-xtesting'
     <<: *xtesting-params
+    volumes:
+    env:
     container: 'xtesting'
     test:
       - first
@@ -221,28 +211,59 @@
       - 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'
+      - 'xtesting-opnfv-xtesting-{tag}-{test}-run'
+
+- job-template:
+    name: 'xtesting-opnfv-xtesting-mts-{tag}-{test}-run'
+    parameters:
+      - xtesting-slave:
+          slave: '{slave}'
+      - xtesting-build_tag:
+          build_tag: ''
+    builders:
+      - xtesting-run-containers:
+          <<: *xtesting-run-containers
 
 - project:
     name: 'xtesting-opnfv-xtesting-mts'
     <<: *xtesting-params
+    volumes:
+    env:
     container: 'xtesting-mts'
     test:
       - seventh
     privileged: 'false'
     network: bridge
     jobs:
-      - 'xtesting-{repo}-{container}-{tag}-{test}-run'
-
+      - 'xtesting-opnfv-xtesting-mts-{tag}-{test}-run'
 
 - builder:
     name: xtesting-zip
     builders:
       - shell: |
           set +x
+          volumes=;
+          if [ "{volumes}" != "None" ]; then
+            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); \
+              do volumes="-v $i $volumes"; done
+          fi
+          env=;
+          if [ "{env}" != "None" ]; then
+            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
+              do env="-e $i $env"; done
+          fi
+          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -251,6 +272,8 @@
             image={repo}:{port}/{container}:{tag}
           fi
           sudo docker run --rm \
+            $volumes \
+            $env \
             -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 \
@@ -271,10 +294,14 @@
     builders:
       - xtesting-zip:
           <<: *xtesting-containers
+          volumes: '{volumes}'
+          env: '{env}'
 
 - project:
     name: 'xtesting-{tag}-zip'
     <<: *xtesting-params
+    volumes:
+    env:
     container: 'xtesting'
     jobs:
       - 'xtesting-{tag}-zip'
@@ -289,12 +316,14 @@
           slave: '{slave}'
       - xtesting-build_tag:
           build_tag: ''
+    # PyYAML and yamllint differ here
+    # see https://github.com/yaml/pyyaml/issues/234
+    # yamllint disable rule:indentation
     properties:
       - build-blocker:
-          use-build-blocker: true
-          blocking-level: 'NODE'
           blocking-jobs:
-            - '^xtesting-{tag}-(daily|docker|review)$'
+          - ^xtesting-(pi-)*{tag}-(daily|docker|review)$
+    # yamllint enable rule:indentation
     builders:
       - multijob:
           name: remove former images
@@ -325,6 +354,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 +367,69 @@
             - 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}'
+    build_args: '{build_args}'
+    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 [ "{build_args}" != "None" ]; then
+            for i in $(echo {build_args} | tr -d '[]' |sed "s/, / /g" ); \
+              do build_args="--build-arg $i $build_args"; done
+          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 +444,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 +458,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 +500,19 @@
     builders:
       - shell: |
           set +x
-          sudo apt-get update && sudo apt-get install software-properties-common gpg -y
+          sudo apt-get update && \
+          sudo DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y
+          sudo DEBIAN_FRONTEND=noninteractive \
+          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 \
+          sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \
+          apt-get install \
+            python3.9 python3.9-dev python3.9-distutils \
+            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 +535,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
+          build_args: '{build_args}'
+
 - project:
     name: xtesting-opnfv-xtesting-{tag}-gate
     <<: *xtesting-params
@@ -453,20 +567,6 @@
     jobs:
       - '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:
@@ -495,12 +595,14 @@
           slave: '{slave}'
       - xtesting-build_tag:
           build_tag: ''
+    # PyYAML and yamllint differ here
+    # see https://github.com/yaml/pyyaml/issues/234
+    # yamllint disable rule:indentation
     properties:
       - build-blocker:
-          use-build-blocker: true
-          blocking-level: 'NODE'
           blocking-jobs:
-            - '^xtesting-{tag}-(daily|docker|review)$'
+          - ^xtesting-(pi-)*{tag}-(daily|docker|review)$
+    # yamllint enable rule:indentation
     builders:
       - multijob:
           name: remove former images
@@ -544,12 +646,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 +716,7 @@
       - xtesting-build-containers:
           <<: *xtesting-build-containers
           ref: '{branch}'
+          build_args: '{build_args}'
       - xtesting-push-containers:
           <<: *xtesting-build-containers
           ref: '{branch}'
@@ -604,7 +739,6 @@
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-build'
 
-
 - job-template:
     name: 'xtesting-{tag}-docker'
     project-type: multijob
@@ -616,12 +750,14 @@
     parameters:
       - xtesting-slave:
           slave: '{slave}'
+    # PyYAML and yamllint differ here
+    # see https://github.com/yaml/pyyaml/issues/234
+    # yamllint disable rule:indentation
     properties:
       - build-blocker:
-          use-build-blocker: true
-          blocking-level: 'NODE'
           blocking-jobs:
-            - '^xtesting-{tag}-(daily|docker|review)$'
+          - ^xtesting-(pi-)*{tag}-(daily|docker|review)$
+    # yamllint enable rule:indentation
     builders:
       - multijob:
           name: remove dependency
@@ -648,7 +784,9 @@
     name: xtesting-trivy
     builders:
       - shell: |
-          sudo apt-get update && sudo apt-get install curl -y
+          sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \
+          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}
@@ -676,6 +814,7 @@
     container: 'xtesting'
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-trivy'
+
 - project:
     name: 'xtesting-opnfv-xtesting-mts-trivy'
     <<: *xtesting-params
@@ -687,46 +826,8 @@
     name: 'xtesting'
     <<: *xtesting-params
     jobs:
-      - 'xtesting-{tag}-daily'
-      - 'xtesting-{tag}-review'
       - 'xtesting-{tag}-docker'
 
-- view:
-    name: xtesting
-    view-type: list
-    columns:
-      - status
-      - weather
-      - job
-      - last-success
-      - last-failure
-      - last-duration
-    regex: ^xtesting-[a-z0-9]+-daily$
-
-- 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$
-
 - view:
     name: xtesting-docker
     view-type: list
@@ -737,7 +838,7 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtesting-[a-z0-9]+-docker$
+    regex: ^xtesting-[a-z0-9.]+-docker$
 
 - view:
     name: xtesting-trivy
@@ -749,4 +850,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtesting-[a-z-0-9]+-trivy$
+    regex: (?!xtesting-pi)^xtesting-[a-z-0-9.]+-trivy$