X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yaml;h=f91212fed2bf420d88b4b29486e3e41a09d11894;hb=45a8dd15b1bf241c83460213c743eb666fdab680;hp=d259f44e6193da26cd4832154527a96a5a21682e;hpb=90d43f97fc1459a09f7584a87dc7081ec51b6ba1;p=releng.git

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index d259f44e6..f91212fed 100644
--- 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
@@ -700,12 +707,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 .
@@ -733,10 +743,10 @@
           set +x
           if [ "_" = "_" ]; then
             image=alpine:{dependency}
-          elif [ "_" = "None" ]; then
+          elif [ "None" = "None" ]; then
             image=_/alpine:{dependency}
           else
-            image=_:/alpine{dependency}
+            image=_:/alpine:{dependency}
           fi
           sudo docker pull $image || true
 
@@ -747,10 +757,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
 
@@ -789,13 +799,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:
@@ -1338,6 +1350,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}