diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2022-04-21 16:57:24 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2022-04-21 16:57:24 +0200 |
| commit | fbbbfccd6b83c2a47f9a8ac9b71447d01c5e67a2 (patch) | |
| tree | 6b9a09e28e3a7ff74ea4ff062ea69aef858ef6e3 /jjb/functest/functest-pi.yaml | |
| parent | b3ddb781e5f0e7cf76b101c12da028578034d96c (diff) | |
Fix trivy calls
Trivy remove the exit code option.
It also takes into account last XtestingCI updates.
Change-Id: I33c7a0c8651dc1805af1f3f743cd58618b2b7d3c
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb/functest/functest-pi.yaml')
| -rw-r--r-- | jjb/functest/functest-pi.yaml | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml index 6fb2ed86a..241884e72 100644 --- a/jjb/functest/functest-pi.yaml +++ b/jjb/functest/functest-pi.yaml @@ -114,6 +114,7 @@ network: '{network}' uid: '{uid}' gid: '{gid}' + published_ports: '{published_ports}' DASHBOARD_URL: '{DASHBOARD_URL}' - builder: @@ -145,6 +146,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} @@ -160,6 +166,7 @@ --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 \ @@ -315,6 +322,7 @@ - EXTERNAL_NETWORK=$EXTERNAL_NETWORK - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME - IMAGE_PROPERTIES=$IMAGE_PROPERTIES + published_ports: container: 'functest-healthcheck' test: - connection_check @@ -364,6 +372,7 @@ - EXTERNAL_NETWORK=$EXTERNAL_NETWORK - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME - IMAGE_PROPERTIES=$IMAGE_PROPERTIES + published_ports: container: 'functest-smoke' test: - tempest_neutron @@ -597,6 +606,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 @@ -641,6 +651,7 @@ - EXTERNAL_NETWORK=$EXTERNAL_NETWORK - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME - IMAGE_PROPERTIES=$IMAGE_PROPERTIES + published_ports: container: 'functest-benchmarking' test: - rally_full @@ -681,6 +692,7 @@ - EXTERNAL_NETWORK=$EXTERNAL_NETWORK - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME - IMAGE_PROPERTIES=$IMAGE_PROPERTIES + published_ports: container: 'functest-benchmarking-cntt' test: - rally_full_cntt @@ -719,6 +731,7 @@ - EXTERNAL_NETWORK=$EXTERNAL_NETWORK - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME - IMAGE_PROPERTIES=$IMAGE_PROPERTIES + published_ports: container: 'functest-vnf' test: - cloudify @@ -748,6 +761,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} @@ -761,6 +779,7 @@ 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 \ @@ -791,6 +810,7 @@ env: '{env}' uid: '{uid}' gid: '{gid}' + published_ports: '{published_ports}' - project: name: 'functest-pi-{tag}-zip' @@ -802,6 +822,7 @@ - EXTERNAL_NETWORK=$EXTERNAL_NETWORK - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME - IMAGE_PROPERTIES=$IMAGE_PROPERTIES + published_ports: container: 'functest-healthcheck' uid: 1000 gid: 1000 |