Merge "Protect all clean operations"

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

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index ce823b9..1239ad0 100644 (file)
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -17,6 +17,12 @@
           branch: master
           slave: lf-virtual1
           dependency: 3.13
+      - wallaby:
+          from:
+          buildargs:
+          branch: stable/wallaby
+          slave: lf-virtual1
+          dependency: 3.13
       - leguer:
           from:
           buildargs:
@@ -35,18 +41,6 @@
           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
-          slave: lf-virtual1
-          dependency: 3.9
 
 - xtesting-jobs: &xtesting-jobs
     name: 'xtesting-jobs'
@@ -196,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'
 
@@ -301,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:
@@ -352,15 +353,14 @@
           fi
           build_args=""
           if [ "{buildargs}" != "None" ]; then
-            build_args="{buildargs} "
+            build_args="{buildargs}"
           fi
           if [ "{ref_arg}" != "None" ]; then
-            build_args="--build-arg {ref_arg}={ref}"
+            build_args="$build_args --build-arg {ref_arg}={ref}"
           fi
           cd {path}
           if [ "{from}" != "None" ]; then
               sed -i {from} Dockerfile
-              git diff
           fi
           sudo docker build $build_args \
             --pull=false --no-cache --force-rm=true \
@@ -389,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
 
@@ -403,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
 
@@ -445,13 +445,15 @@
     builders:
       - shell: |
           set +x
-          sudo apt-get update && sudo 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 && sudo 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:
@@ -584,6 +586,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:
@@ -720,6 +724,7 @@
     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}