summaryrefslogtreecommitdiffstats
path: root/jjb/airship/airship.yaml
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-11-26 21:18:54 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2019-11-26 21:21:07 +0100
commitfad5ec4d8e2d50edfda3ff0e9b9cae38adfb3f8a (patch)
treee81bbbb6499b7b63cb918e00f917b6b3ea3c7f54 /jjb/airship/airship.yaml
parent714db901681e8218931a40a899190fc121a7879c (diff)
Add API Compliance containers in CNTT jobs
It allows checking the RA and RI compliance thanks to the new CNTT-Compliance containers from Functest. It also updates Airship jobs to take into acocunt the same job parameters. Change-Id: I674c12bbbc83bfbe617296bf9f9361eada66ef6e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb/airship/airship.yaml')
-rw-r--r--jjb/airship/airship.yaml30
1 files changed, 28 insertions, 2 deletions
diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index 48c7a1135..c56891290 100644
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -20,6 +20,20 @@
name: slave
default: '{slave}'
+- parameter:
+ name: airship-DEBUG
+ parameters:
+ - string:
+ name: DEBUG
+ default: 'true'
+
+- parameter:
+ name: airship-EXTERNAL_NETWORK
+ parameters:
+ - string:
+ name: EXTERNAL_NETWORK
+ default: public
+
- airship-containers: &airship-containers
name: 'airship-containers'
repo: '{repo}'
@@ -69,8 +83,8 @@
-e INSTALLER_TYPE=airship \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-v /home/opnfv/functest/.boto:/root/.boto \
- -e DEBUG=True \
- -e EXTERNAL_NETWORK=public \
+ -e DEBUG=$DEBUG \
+ -e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \
-e DEPLOY_SCENARIO=os-nosdn-nofeature-ha \
-v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
-v /home/opnfv/functest/images:/home/opnfv/functest/images \
@@ -226,6 +240,10 @@
parameters:
- airship-slave:
slave: '{slave}'
+ - airship-DEBUG:
+ DEBUG: 'true'
+ - airship-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
builders:
- airship-run-containers:
<<: *airship-run-containers
@@ -303,6 +321,10 @@
slave: '{slave}'
- airship-branch:
branch: 'master'
+ - airship-DEBUG:
+ DEBUG: 'true'
+ - airship-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
properties:
- build-blocker:
use-build-blocker: true
@@ -449,6 +471,10 @@
parameters:
- airship-slave:
slave: '{slave}'
+ - airship-DEBUG:
+ DEBUG: 'true'
+ - airship-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
properties:
- build-blocker:
use-build-blocker: true