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

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index c0c4bac90..5484a59f7 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -12,31 +12,37 @@
     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
@@ -330,6 +336,7 @@
     ref_arg: '{ref_arg}'
     path: '{path}'
     buildargs: '{buildargs}'
+    from: '{from}'
 
 - builder:
     name: xtesting-build-containers
@@ -345,12 +352,15 @@
           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
+          fi
           sudo docker build $build_args \
             --pull=false --no-cache --force-rm=true \
             -t $image .