Code Review / releng.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Merge "[barometer] Add moselle jobs"
[releng.git] / jjb / functest / functest.yaml
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 11be70f..509404c 100644 (file)
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -15,8 +15,8 @@
           from:
           build_args:
           branch: master
-          slave: lf-pod4-2
-          DASHBOARD_URL: http://172.30.12.85
+          slave: lf-pod4
+          DASHBOARD_URL: http://172.30.12.83
           dependency: 3.14
       - xena:
           from:
@@ -100,6 +100,9 @@
     volumes: '{volumes}'
     env: '{env}'
     network: '{network}'
+    uid: '{uid}'
+    gid: '{gid}'
+    published_ports: '{published_ports}'
     DASHBOARD_URL: '{DASHBOARD_URL}'
 
 - builder:
@@ -131,6 +134,11 @@
             for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
               do env="-e $i $env"; done
           fi
+          published_ports=;
+          if [ "{published_ports}" != "None" ]; then
+            for i in $(echo {published_ports} | tr -d '[]' |sed "s/, / /g" ); \
+              do published_ports="-p $i $published_ports"; done
+          fi
           [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -139,15 +147,18 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          sudo mkdir -p $WORKSPACE/results
+          sudo chown {uid}:{gid} $WORKSPACE/results
           sudo docker run --rm \
             --privileged={privileged} \
             --network={network} \
             $volumes \
             $env \
+            $published_ports \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
             -e S3_DST_URL=s3://artifacts.opnfv.org/functest/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
             -e HTTP_DST_URL=http://artifacts.opnfv.org/functest/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
-            -v /home/opnfv/functest/.boto:/root/.boto \
+            -v /home/opnfv/functest/.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 \
@@ -299,6 +310,7 @@
       - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
       - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
+    published_ports:
     container: 'functest-healthcheck'
     test:
       - connection_check
@@ -316,6 +328,8 @@
       - tempest_horizon
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-opnfv-functest-healthcheck-{tag}-{test}-run'
 
@@ -346,6 +360,7 @@
       - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
       - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
+    published_ports:
     container: 'functest-smoke'
     test:
       - tempest_neutron
@@ -372,6 +387,8 @@
       - tempest_cyborg
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     exclude:
       - tag: latest
         test: refstack_defcore
@@ -461,6 +478,7 @@
       - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
       - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
+    published_ports:
     container: 'functest-smoke-cntt'
     test:
       - tempest_neutron_cntt
@@ -473,6 +491,8 @@
       - tempest_slow_cntt
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-opnfv-functest-smoke-cntt-{tag}-{test}-run'
 
@@ -503,6 +523,7 @@
       - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
       - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
+    published_ports:
     container: 'functest-benchmarking'
     test:
       - rally_full
@@ -511,6 +532,8 @@
       - shaker
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-opnfv-functest-benchmarking-{tag}-{test}-run'
 
@@ -541,12 +564,15 @@
       - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
       - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
+    published_ports:
     container: 'functest-benchmarking-cntt'
     test:
       - rally_full_cntt
       - rally_jobs_cntt
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-opnfv-functest-benchmarking-cntt-{tag}-{test}-run'
 
@@ -577,6 +603,7 @@
       - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
       - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
+    published_ports:
     container: 'functest-vnf'
     test:
       - cloudify
@@ -586,6 +613,8 @@
       - juju_epc
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-opnfv-functest-vnf-{tag}-{test}-run'
 
@@ -604,6 +633,11 @@
             for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
               do env="-e $i $env"; done
           fi
+          published_ports=;
+          if [ "{published_ports}" != "None" ]; then
+            for i in $(echo {published_ports} | tr -d '[]' |sed "s/, / /g" ); \
+              do published_ports="-p $i $published_ports"; done
+          fi
           [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -612,13 +646,16 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          sudo mkdir -p $WORKSPACE/results
+          sudo chown {uid}:{gid} $WORKSPACE/results
           sudo docker run --rm \
             $volumes \
             $env \
+            $published_ports \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
             -e S3_DST_URL=s3://artifacts.opnfv.org/functest \
             -e HTTP_DST_URL=http://artifacts.opnfv.org/functest \
-            -v /home/opnfv/functest/.boto:/root/.boto \
+            -v /home/opnfv/functest/.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 \
@@ -643,6 +680,9 @@
           <<: *functest-containers
           volumes: '{volumes}'
           env: '{env}'
+          uid: '{uid}'
+          gid: '{gid}'
+          published_ports: '{published_ports}'
 
 - project:
     name: 'functest-{tag}-zip'
@@ -654,7 +694,10 @@
       - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
       - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
+    published_ports:
     container: 'functest-healthcheck'
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-{tag}-zip'
 
@@ -993,6 +1036,7 @@
           sudo apt-get -o DPkg::Lock::Timeout=300 update && \
           sudo DEBIAN_FRONTEND=noninteractive apt-get \
             -o DPkg::Lock::Timeout=300 install \
+            python3.10 python3.10-dev python3.10-distutils \
             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 \
@@ -1570,7 +1614,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          ./trivy --exit-code 1 $image
+          ./trivy image --exit-code 1 $image
 
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-trivy'
@@ -1646,17 +1690,14 @@
       - 'functest-{repo}-{container}-{tag}-trivy'
 
 - builder:
-    name: functest-docker-scan
+    name: functest-grype
     builders:
       - shell: |
-          apt-get -o DPkg::Lock::Timeout=300 update && \
-          DEBIAN_FRONTEND=noninteractive apt-get -o DPkg::Lock::Timeout=300 install \
-            curl docker.io -y
-
-          mkdir -p ~/.docker/cli-plugins && \
-          curl https://github.com/docker/scan-cli-plugin/releases/latest/download/docker-scan_linux_amd64 \
-            -L -s -S -o ~/.docker/cli-plugins/docker-scan &&\
-          chmod +x ~/.docker/cli-plugins/docker-scan
+          sudo apt-get -o DPkg::Lock::Timeout=300 update && \
+          sudo DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 install curl -y
+
+          curl -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh | sudo sh -s -- -b .
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -1664,17 +1705,17 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          docker-scan $image
+          ./grype -q $image
 
 - job-template:
-    name: 'functest-{repo}-{container}-{tag}-docker-scan'
+    name: 'functest-{repo}-{container}-{tag}-grype'
     triggers:
       - timed: '@weekly'
     parameters:
       - functest-slave:
           slave: '{slave}'
     builders:
-      - functest-docker-scan:
+      - functest-grype:
           <<: *functest-containers
     publishers:
       - email-ext:
@@ -1684,60 +1725,60 @@
           recipients: cedric.ollivier@orange.com
 
 - project:
-    name: 'functest-opnfv-functest-core-docker-scan'
+    name: 'functest-opnfv-functest-core-grype'
     <<: *functest-params
     container: 'functest-core'
     jobs:
-      - 'functest-{repo}-{container}-{tag}-docker-scan'
+      - 'functest-{repo}-{container}-{tag}-grype'
 
 - project:
-    name: 'functest-opnfv-functest-tempest-docker-scan'
+    name: 'functest-opnfv-functest-tempest-grype'
     <<: *functest-params
     container: 'functest-tempest'
     jobs:
-      - 'functest-{repo}-{container}-{tag}-docker-scan'
+      - 'functest-{repo}-{container}-{tag}-grype'
 
 - project:
-    name: 'functest-opnfv-functest-healthcheck-docker-scan'
+    name: 'functest-opnfv-functest-healthcheck-grype'
     <<: *functest-params
     container: 'functest-healthcheck'
     jobs:
-      - 'functest-{repo}-{container}-{tag}-docker-scan'
+      - 'functest-{repo}-{container}-{tag}-grype'
 
 - project:
-    name: 'functest-opnfv-functest-smoke-docker-scan'
+    name: 'functest-opnfv-functest-smoke-grype'
     <<: *functest-params
     container: 'functest-smoke'
     jobs:
-      - 'functest-{repo}-{container}-{tag}-docker-scan'
+      - 'functest-{repo}-{container}-{tag}-grype'
 
 - project:
-    name: 'functest-opnfv-functest-benchmarking-docker-scan'
+    name: 'functest-opnfv-functest-benchmarking-grype'
     <<: *functest-params
     container: 'functest-benchmarking'
     jobs:
-      - 'functest-{repo}-{container}-{tag}-docker-scan'
+      - 'functest-{repo}-{container}-{tag}-grype'
 
 - project:
-    name: 'functest-opnfv-functest-vnf-docker-scan'
+    name: 'functest-opnfv-functest-vnf-grype'
     <<: *functest-params
     container: 'functest-vnf'
     jobs:
-      - 'functest-{repo}-{container}-{tag}-docker-scan'
+      - 'functest-{repo}-{container}-{tag}-grype'
 
 - project:
-    name: 'functest-opnfv-functest-smoke-cntt-docker-scan'
+    name: 'functest-opnfv-functest-smoke-cntt-grype'
     <<: *functest-params
     container: 'functest-smoke-cntt'
     jobs:
-      - 'functest-{repo}-{container}-{tag}-docker-scan'
+      - 'functest-{repo}-{container}-{tag}-grype'
 
 - project:
-    name: 'functest-opnfv-functest-benchmarking-cntt-docker-scan'
+    name: 'functest-opnfv-functest-benchmarking-cntt-grype'
     <<: *functest-params
     container: 'functest-benchmarking-cntt'
     jobs:
-      - 'functest-{repo}-{container}-{tag}-docker-scan'
+      - 'functest-{repo}-{container}-{tag}-grype'
 
 - project:
     name: 'functest'
@@ -1770,7 +1811,7 @@
     regex: (?!functest-kubernetes)(?!functest-pi)^functest-[a-z-0-9.]+-trivy$
 
 - view:
-    name: functest-docker-scan
+    name: functest-grype
     view-type: list
     columns:
       - status
@@ -1779,4 +1820,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-[a-z0-9.]+-docker-scan$
+    regex: (?!functest-kubernetes)(?!functest-pi)^functest-[a-z-0-9.]+-grype$