X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes-ng.yaml;h=15dcf767cf2128397ff7e1fa8d94992757787e75;hb=1b32ec1b908c059b78dcfd3118d24dd44944b730;hp=4b1e4ac23784e04d3ae2d3fb74c7ab2882df6032;hpb=2a0e7d31396e5cfaeb876dd1db3953817e2cdc25;p=releng.git

diff --git a/jjb/functest/functest-kubernetes-ng.yaml b/jjb/functest/functest-kubernetes-ng.yaml
index 4b1e4ac23..15dcf767c 100644
--- a/jjb/functest/functest-kubernetes-ng.yaml
+++ b/jjb/functest/functest-kubernetes-ng.yaml
@@ -12,45 +12,53 @@
     port:
     tag:
       - v1.20:
+          buildargs:
           branch: stable/leguer
           slave: lf-virtual1
           dependency: 3.12
-          docker_args: [{'K8S_TAG': '1.20'}]
+          from: s/:leguer$/:v1.20/g
       - v1.19:
+          buildargs:
           branch: stable/kali
           slave: lf-virtual1
           dependency: 3.11
-          docker_args: []
+          from: s/:kali$/:v1.19/g
       - v1.18:
           branch: stable/kali
           slave: lf-virtual1
           dependency: 3.11
-          docker_args: [{'K8S_TAG': '1.18'}]
+          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
-          docker_args: []
+          from: s/:jerma$/:v1.17/g
       - v1.16:
           branch: stable/jerma
           slave: lf-virtual1
           dependency: 3.10
-          docker_args: [{'K8S_TAG': '1.16'}]
+          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
-          docker_args: []
+          from: s/:iruya$/:v1.15/g
       - v1.14:
           branch: stable/iruya
           slave: lf-virtual1
           dependency: 3.9
-          docker_args: [{'K8S_TAG': '1.14'}]
+          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
-          docker_args: []
+          from: s/:hunter$/:v1.13/g
 
 - functest-kubernetes-ng-jobs: &functest-kubernetes-ng-jobs
     name: 'functest-kubernetes-ng-jobs'
@@ -69,6 +77,8 @@
     <<: *functest-kubernetes-ng-containers
     ref_arg: '{ref_arg}'
     path: '{path}'
+    buildargs: '{buildargs}'
+    from: '{from}'
 
 - builder:
     name: functest-kubernetes-ng-build-containers
@@ -82,13 +92,18 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          if [ "{ref_arg}" = "None" ]; then
-            build_arg=""
-          else
-            build_arg="--build-arg {ref_arg}={ref}"
+          build_args=""
+          if [ "{buildargs}" != "None" ]; then
+            build_args="{buildargs}"
+          fi
+          if [ "{ref_arg}" != "None" ]; then
+            build_args="$build_args --build-arg {ref_arg}={ref}"
           fi
           cd {path}
-          sudo docker build $build_arg \
+          if [ "{from}" != "None" ]; then
+              sed -i {from} Dockerfile
+          fi
+          sudo docker build $build_args \
             --pull=false --no-cache --force-rm=true \
             -t $image .
 
@@ -115,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
 
@@ -129,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
 
@@ -199,6 +214,7 @@
       - functest-kubernetes-ng-build-containers:
           <<: *functest-kubernetes-ng-build-containers
           ref: '{branch}'
+          buildargs: '{buildargs}'
       - functest-kubernetes-ng-push-containers:
           <<: *functest-kubernetes-ng-build-containers
           ref: '{branch}'
@@ -316,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}
@@ -338,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: 'xtesting'
+    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: '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'