Take new backported test cases into account

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

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 6678b74..5484a59 100644 (file)
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -12,26 +12,38 @@
     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
           slave: lf-virtual1
           dependency: 3.9
@@ -323,6 +335,8 @@
     <<: *xtesting-containers
     ref_arg: '{ref_arg}'
     path: '{path}'
+    buildargs: '{buildargs}'
+    from: '{from}'
 
 - builder:
     name: xtesting-build-containers
@@ -336,13 +350,18 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          if [ "{ref_arg}" = "None" ]; then
-            build_arg=""
-          else
-            build_arg="--build-arg {ref_arg}={ref}"
+          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}
-          sudo docker build $build_arg \
+          if [ "{from}" != "None" ]; then
+              sed -i {from} Dockerfile
+          fi
+          sudo docker build $build_args \
             --pull=false --no-cache --force-rm=true \
             -t $image .
 
@@ -454,6 +473,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
@@ -473,19 +506,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:
@@ -631,6 +651,7 @@
       - xtesting-build-containers:
           <<: *xtesting-build-containers
           ref: '{branch}'
+          buildargs: '{buildargs}'
       - xtesting-push-containers:
           <<: *xtesting-build-containers
           ref: '{branch}'
@@ -725,6 +746,7 @@
     container: 'xtesting'
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-trivy'
+
 - project:
     name: 'xtesting-opnfv-xtesting-mts-trivy'
     <<: *xtesting-params