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-kubernetes.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-kubernetes.yaml')
| -rw-r--r-- | jjb/functest/functest-kubernetes.yaml | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index 91c93e691..6cf3093ad 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -89,6 +89,7 @@ network: '{network}' uid: '{uid}' gid: '{gid}' + published_ports: '{published_ports}' - builder: name: functest-kubernetes-pull-containers @@ -119,6 +120,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" ] && rm -rf $WORKSPACE/results || true if [ "{repo}" = "_" ]; then image={container}:{tag} @@ -134,6 +140,7 @@ --network={network} \ $volumes \ $env \ + $published_ports \ -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 \ @@ -270,6 +277,7 @@ env: - DEPLOY_SCENARIO=$DEPLOY_SCENARIO - E2E_TEST_OPTS=$E2E_TEST_OPTS + published_ports: container: 'functest-kubernetes-healthcheck' test: - k8s_quick @@ -304,6 +312,7 @@ env: - DEPLOY_SCENARIO=$DEPLOY_SCENARIO - E2E_TEST_OPTS=$E2E_TEST_OPTS + published_ports: container: 'functest-kubernetes-smoke' test: - xrally_kubernetes @@ -361,6 +370,7 @@ env: - DEPLOY_SCENARIO=$DEPLOY_SCENARIO - E2E_TEST_OPTS=$E2E_TEST_OPTS + published_ports: container: 'functest-kubernetes-security' test: - kube_hunter @@ -396,6 +406,7 @@ env: - DEPLOY_SCENARIO=$DEPLOY_SCENARIO - E2E_TEST_OPTS=$E2E_TEST_OPTS + published_ports: container: 'functest-kubernetes-benchmarking' test: - xrally_kubernetes_full @@ -430,6 +441,7 @@ env: - DEPLOY_SCENARIO=$DEPLOY_SCENARIO - E2E_TEST_OPTS=$E2E_TEST_OPTS + published_ports: container: 'functest-kubernetes-cnf' test: - k8s_vims @@ -457,6 +469,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" ] && rm -rf $WORKSPACE/results || true if [ "{repo}" = "_" ]; then image={container}:{tag} @@ -470,6 +487,7 @@ docker run --rm \ $volumes \ $env \ + $published_ports \ -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 \ @@ -498,6 +516,7 @@ env: '{env}' uid: '{uid}' gid: '{gid}' + published_ports: '{published_ports}' - project: name: 'functest-kubernetes-{tag}-zip' @@ -507,6 +526,7 @@ env: - DEPLOY_SCENARIO=$DEPLOY_SCENARIO - E2E_TEST_OPTS=$E2E_TEST_OPTS + published_ports: container: 'functest-kubernetes-healthcheck' uid: 1000 gid: 1000 @@ -1241,7 +1261,7 @@ else image={repo}:{port}/{container}:{tag} fi - ./trivy --exit-code 1 $image + ./trivy $image - job-template: name: 'functest-kubernetes-{repo}-{container}-{tag}-trivy' |