Allowing seding from in Dockerfile

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

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index d259f44..00ed5b1 100644 (file)
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -12,36 +12,42 @@
     port:
     tag:
       - latest:
+          from:
           buildargs:
           branch: master
           slave: lf-virtual9
           DASHBOARD_URL: http://172.30.13.94
           dependency: 3.13
       - leguer:
+          from:
           buildargs:
           branch: stable/leguer
           slave: lf-virtual9
           DASHBOARD_URL: http://172.30.13.94
           dependency: 3.12
       - kali:
+          from:
           buildargs:
           branch: stable/kali
           slave: lf-pod4-3
           DASHBOARD_URL: http://172.30.12.88
           dependency: 3.11
       - jerma:
+          from:
           buildargs:
           branch: stable/jerma
           slave: lf-pod4
           DASHBOARD_URL: http://172.30.12.83
           dependency: 3.10
       - iruya:
+          from:
           buildargs:
           branch: stable/iruya
           slave: lf-virtual4
           DASHBOARD_URL: http://172.30.13.89
           dependency: 3.9
       - hunter:
+          from:
           buildargs:
           branch: stable/hunter
           slave: lf-virtual6
@@ -685,6 +691,7 @@
     ref_arg: '{ref_arg}'
     path: '{path}'
     buildargs: '{buildargs}'
+    from: '{from}'
 
 - builder:
     name: functest-build-containers
@@ -706,6 +713,10 @@
             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 \
             -t $image .