X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes-ng.yaml;h=ae84749ca8c79f4dcd2351be47b3b474c07a6e4a;hb=be4cbc60da26dc8ba5e1ae605fbe256f76a94996;hp=6f1cb328f639f58d3bbae833b8102fb597a341bd;hpb=90d43f97fc1459a09f7584a87dc7081ec51b6ba1;p=releng.git

diff --git a/jjb/functest/functest-kubernetes-ng.yaml b/jjb/functest/functest-kubernetes-ng.yaml
index 6f1cb328f..ae84749ca 100644
--- a/jjb/functest/functest-kubernetes-ng.yaml
+++ b/jjb/functest/functest-kubernetes-ng.yaml
@@ -16,41 +16,19 @@
           branch: stable/leguer
           slave: lf-virtual1
           dependency: 3.12
+          from: s/:leguer$/:v1.20/g
       - v1.19:
           buildargs:
           branch: stable/kali
           slave: lf-virtual1
           dependency: 3.11
+          from: s/:kali$/:v1.19/g
       - v1.18:
           branch: stable/kali
           slave: lf-virtual1
           dependency: 3.11
           buildargs: --build-arg K8S_TAG=1.18
-      - v1.17:
-          buildargs:
-          branch: stable/jerma
-          slave: lf-virtual1
-          dependency: 3.10
-      - v1.16:
-          branch: stable/jerma
-          slave: lf-virtual1
-          dependency: 3.10
-          buildargs: --build-arg K8S_TAG=1.16
-      - v1.15:
-          buildargs:
-          branch: stable/iruya
-          slave: lf-virtual1
-          dependency: 3.9
-      - v1.14:
-          branch: stable/iruya
-          slave: lf-virtual1
-          dependency: 3.9
-          buildargs: --build-arg K8S_TAG=1.14
-      - v1.13:
-          buildargs:
-          branch: stable/hunter
-          slave: lf-virtual1
-          dependency: 3.9
+          from: s/:kali$/:v1.18/g
 
 - functest-kubernetes-ng-jobs: &functest-kubernetes-ng-jobs
     name: 'functest-kubernetes-ng-jobs'
@@ -70,6 +48,7 @@
     ref_arg: '{ref_arg}'
     path: '{path}'
     buildargs: '{buildargs}'
+    from: '{from}'
 
 - builder:
     name: functest-kubernetes-ng-build-containers
@@ -85,12 +64,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 .
@@ -118,10 +100,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
 
@@ -132,10 +114,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
 
@@ -320,6 +302,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}