summaryrefslogtreecommitdiffstats
path: root/jjb/functest/xtesting.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/functest/xtesting.yaml')
-rw-r--r--jjb/functest/xtesting.yaml19
1 files changed, 18 insertions, 1 deletions
diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 07b0eb3a9..e4000a45b 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -75,6 +75,7 @@
network: '{network}'
uid: '{uid}'
gid: '{gid}'
+ published_ports: '{published_ports}'
- builder:
name: xtesting-pull-containers
@@ -105,6 +106,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}
@@ -120,6 +126,7 @@
--network={network} \
$volumes \
$env \
+ $published_ports \
-e S3_ENDPOINT_URL=https://storage.googleapis.com \
-e S3_DST_URL=s3://artifacts.opnfv.org/xtesting/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
-e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
@@ -207,6 +214,7 @@
<<: *xtesting-params
volumes:
env:
+ published_ports:
container: 'xtesting'
test:
- first
@@ -246,6 +254,7 @@
<<: *xtesting-params
volumes:
env:
+ published_ports:
container: 'xtesting-mts'
test:
- seventh
@@ -271,6 +280,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}
@@ -284,6 +298,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/xtesting \
-e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting \
@@ -308,12 +323,14 @@
env: '{env}'
uid: '{uid}'
gid: '{gid}'
+ published_ports: '{published_ports}'
- project:
name: 'xtesting-{tag}-zip'
<<: *xtesting-params
volumes:
env:
+ published_ports:
container: 'xtesting'
uid: 1000
gid: 1000
@@ -830,7 +847,7 @@
else
image={repo}:{port}/{container}:{tag}
fi
- ./trivy --exit-code 1 $image
+ ./trivy $image
- job-template:
name: 'xtesting-{repo}-{container}-{tag}-trivy'