X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes.yaml;h=91c93e6912293a8b86a89cff916fd81bf7cffa36;hb=4521a0abf54375f59bebab5648991b5ef86d549b;hp=201cb813c16d88c4daccee73884cd4ef14a46b8a;hpb=6d967922375a6cadf14c2a4e458f542b4f9d848a;p=releng.git

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 201cb813c..91c93e691 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -17,6 +17,12 @@
           branch: master
           slave: lf-virtual1-8
           dependency: 3.14
+      - v1.23:
+          from:
+          build_args:
+          branch: stable/v1.23
+          slave: lf-virtual1-9
+          dependency: 3.14
       - v1.22:
           from:
           build_args:
@@ -81,6 +87,8 @@
     volumes: '{volumes}'
     env: '{env}'
     network: '{network}'
+    uid: '{uid}'
+    gid: '{gid}'
 
 - builder:
     name: functest-kubernetes-pull-containers
@@ -119,6 +127,8 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          mkdir -p $WORKSPACE/results
+          chown {uid}:{gid} $WORKSPACE/results
           docker run --rm \
             --privileged={privileged} \
             --network={network} \
@@ -127,7 +137,7 @@
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
             -e S3_DST_URL=s3://artifacts.opnfv.org/functest-kubernetes/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
             -e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
-            -v /home/opnfv/functest-kubernetes/.boto:/root/.boto \
+            -v /home/opnfv/functest-kubernetes/.boto:/etc/boto.cfg \
             -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
             -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
             -e NODE_NAME=$slave \
@@ -266,6 +276,8 @@
       - k8s_smoke
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-{test}-run'
 
@@ -312,9 +324,13 @@
       - sig_storage_serial
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     exclude:
       - tag: latest
         test: k8s_io
+      - tag: v1.23
+        test: k8s_io
       - tag: v1.22
         test: k8s_io
       - tag: v1.21
@@ -352,6 +368,8 @@
       - kube_bench_node
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-{test}-run'
 
@@ -384,6 +402,8 @@
       - netperf
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-{test}-run'
 
@@ -417,6 +437,8 @@
       - cnf_testsuite
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-{test}-run'
 
@@ -443,13 +465,15 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          mkdir -p $WORKSPACE/results
+          chown {uid}:{gid} $WORKSPACE/results
           docker run --rm \
             $volumes \
             $env \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
             -e S3_DST_URL=s3://artifacts.opnfv.org/functest-kubernetes \
             -e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes \
-            -v /home/opnfv/functest-kubernetes/.boto:/root/.boto \
+            -v /home/opnfv/functest-kubernetes/.boto:/etc/boto.cfg \
             -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
             -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
             -e BUILD_TAG=$BUILD_TAG \
@@ -472,6 +496,8 @@
           <<: *functest-kubernetes-containers
           volumes: '{volumes}'
           env: '{env}'
+          uid: '{uid}'
+          gid: '{gid}'
 
 - project:
     name: 'functest-kubernetes-{tag}-zip'
@@ -482,6 +508,8 @@
       - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
       - E2E_TEST_OPTS=$E2E_TEST_OPTS
     container: 'functest-kubernetes-healthcheck'
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-kubernetes-{tag}-zip'
 
@@ -608,7 +636,10 @@
             - name: 'functest-kubernetes-{tag}-zip'
               <<: *functest-kubernetes-jobs
     publishers:
-      - email:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
           recipients: cedric.ollivier@orange.com
 
 - project:
@@ -744,13 +775,15 @@
     builders:
       - shell: |
           set +x
-          apt-get update && \
-          DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y
+          apt-get -o DPkg::Lock::Timeout=300 update && \
+          DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 dist-upgrade -y
           DEBIAN_FRONTEND=noninteractive \
-          apt-get install software-properties-common gpg -y
+          apt-get -o DPkg::Lock::Timeout=300 install software-properties-common gpg -y
           add-apt-repository -y ppa:deadsnakes/ppa
-          apt-get update && DEBIAN_FRONTEND=noninteractive \
-          apt-get install \
+          apt-get -o DPkg::Lock::Timeout=300 update && \
+          DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 install \
             python3.9 python3.9-dev python3.9-distutils \
             python3.8 python3.8-dev python3.8-distutils \
             python3.7 python3.7-dev python3.6 python3.6-dev \
@@ -1004,7 +1037,10 @@
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-cnf_testsuite-run'
               <<: *functest-kubernetes-jobs
     publishers:
-      - email:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
           recipients: cedric.ollivier@orange.com
 
 - project:
@@ -1183,15 +1219,19 @@
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-build'
               <<: *functest-kubernetes-jobs
     publishers:
-      - email:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
           recipients: cedric.ollivier@orange.com
 
 - builder:
     name: functest-kubernetes-trivy
     builders:
       - shell: |
-          apt-get update && DEBIAN_FRONTEND=noninteractive \
-          apt-get install curl -y
+          apt-get -o DPkg::Lock::Timeout=300 update && \
+          DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 install curl -y
 
           curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b .
           if [ "{repo}" = "_" ]; then
@@ -1214,7 +1254,10 @@
       - functest-kubernetes-trivy:
           <<: *functest-kubernetes-containers
     publishers:
-      - email:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
           recipients: cedric.ollivier@orange.com
 
 - project:
@@ -1259,6 +1302,83 @@
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-trivy'
 
+- builder:
+    name: functest-kubernetes-grype
+    builders:
+      - shell: |
+          apt-get -o DPkg::Lock::Timeout=300 update && \
+          DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 install curl -y
+
+          curl -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh | sh -s -- -b .
+          if [ "{repo}" = "_" ]; then
+            image={container}:{tag}
+          elif [ "{port}" = "None" ]; then
+            image={repo}/{container}:{tag}
+          else
+            image={repo}:{port}/{container}:{tag}
+          fi
+          ./grype -q $image
+
+- job-template:
+    name: 'functest-kubernetes-{repo}-{container}-{tag}-grype'
+    triggers:
+      - timed: '@weekly'
+    parameters:
+      - functest-kubernetes-slave:
+          slave: '{slave}'
+    builders:
+      - functest-kubernetes-grype:
+          <<: *functest-kubernetes-containers
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-core-grype'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-core'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-grype'
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-grype'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-healthcheck'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-grype'
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-grype'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-cnf'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-grype'
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-grype'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-security'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-grype'
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-grype'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-smoke'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-grype'
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-grype'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-benchmarking'
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-grype'
+
 - project:
     name: 'functest-kubernetes'
     <<: *functest-kubernetes-params
@@ -1288,3 +1408,15 @@
       - last-failure
       - last-duration
     regex: (?!functest-kubernetes-pi)(?!functest-kubernetes-ng)^functest-kubernetes-[a-z-0-9.]+-trivy$
+
+- view:
+    name: functest-kubernetes-grype
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+    regex: (?!functest-kubernetes-pi)(?!functest-kubernetes-ng)^functest-kubernetes-[a-z-0-9.]+-grype$