X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes-ng.yaml;h=15dcf767cf2128397ff7e1fa8d94992757787e75;hb=45a8dd15b1bf241c83460213c743eb666fdab680;hp=3240eeba00ea50b6f6fe19a543e76ee5b5a0edbd;hpb=b4115573dd37fa715f42e889c667dac3dfdbd591;p=releng.git

diff --git a/jjb/functest/functest-kubernetes-ng.yaml b/jjb/functest/functest-kubernetes-ng.yaml
index 3240eeba0..15dcf767c 100644
--- a/jjb/functest/functest-kubernetes-ng.yaml
+++ b/jjb/functest/functest-kubernetes-ng.yaml
@@ -16,41 +16,49 @@
           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
+          from: s/:kali$/:v1.18/g
       - v1.17:
           buildargs:
           branch: stable/jerma
           slave: lf-virtual1
           dependency: 3.10
+          from: s/:jerma$/:v1.17/g
       - v1.16:
           branch: stable/jerma
           slave: lf-virtual1
           dependency: 3.10
           buildargs: --build-arg K8S_TAG=1.16
+          from: s/:jerma$/:v1.16/g
       - v1.15:
           buildargs:
           branch: stable/iruya
           slave: lf-virtual1
           dependency: 3.9
+          from: s/:iruya$/:v1.15/g
       - v1.14:
           branch: stable/iruya
           slave: lf-virtual1
           dependency: 3.9
           buildargs: --build-arg K8S_TAG=1.14
+          from: s/:iruya$/:v1.14/g
       - v1.13:
           buildargs:
           branch: stable/hunter
           slave: lf-virtual1
           dependency: 3.9
+          from: s/:hunter$/:v1.13/g
 
 - functest-kubernetes-ng-jobs: &functest-kubernetes-ng-jobs
     name: 'functest-kubernetes-ng-jobs'
@@ -70,6 +78,7 @@
     ref_arg: '{ref_arg}'
     path: '{path}'
     buildargs: '{buildargs}'
+    from: '{from}'
 
 - builder:
     name: functest-kubernetes-ng-build-containers
@@ -85,12 +94,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 +130,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 +144,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 +332,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}
@@ -342,15 +355,44 @@
           <<: *functest-kubernetes-ng-containers
 
 - project:
-    name: 'functest-kubernetes-ng-opnfv-xtesting-trivy'
+    name: 'functest-kubernetes-ng-opnfv-functest-kubernetes-core-trivy'
+    <<: *functest-kubernetes-ng-params
+    container: 'functest-kubernetes-core'
+    jobs:
+      - 'functest-kubernetes-ng-{repo}-{container}-{tag}-trivy'
+
+- project:
+    name: 'functest-kubernetes-ng-opnfv-functest-kubernetes-healthcheck-trivy'
+    <<: *functest-kubernetes-ng-params
+    container: 'functest-kubernetes-healthcheck'
+    jobs:
+      - 'functest-kubernetes-ng-{repo}-{container}-{tag}-trivy'
+
+- project:
+    name: 'functest-kubernetes-ng-opnfv-functest-kubernetes-cnf-trivy'
     <<: *functest-kubernetes-ng-params
-    container: 'xtesting'
+    container: 'functest-kubernetes-cnf'
     jobs:
       - 'functest-kubernetes-ng-{repo}-{container}-{tag}-trivy'
+
+- project:
+    name: 'functest-kubernetes-ng-opnfv-functest-kubernetes-security-trivy'
+    <<: *functest-kubernetes-ng-params
+    container: 'functest-kubernetes-security'
+    jobs:
+      - 'functest-kubernetes-ng-{repo}-{container}-{tag}-trivy'
+
+- project:
+    name: 'functest-kubernetes-ng-opnfv-functest-kubernetes-smoke-trivy'
+    <<: *functest-kubernetes-ng-params
+    container: 'functest-kubernetes-smoke'
+    jobs:
+      - 'functest-kubernetes-ng-{repo}-{container}-{tag}-trivy'
+
 - project:
-    name: 'functest-kubernetes-ng-opnfv-xtesting-mts-trivy'
+    name: 'functest-kubernetes-ng-opnfv-functest-kubernetes-benchmarking-trivy'
     <<: *functest-kubernetes-ng-params
-    container: 'xtesting-mts'
+    container: 'functest-kubernetes-benchmarking'
     jobs:
       - 'functest-kubernetes-ng-{repo}-{container}-{tag}-trivy'