summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/airship/airship.yaml30
-rw-r--r--jjb/airship/cntt.yaml91
2 files changed, 117 insertions, 4 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
diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml
index 859a7773d..eb57300c4 100644
--- a/jjb/airship/cntt.yaml
+++ b/jjb/airship/cntt.yaml
@@ -20,6 +20,20 @@
name: slave
default: '{slave}'
+- parameter:
+ name: cntt-DEBUG
+ parameters:
+ - string:
+ name: DEBUG
+ default: 'true'
+
+- parameter:
+ name: cntt-EXTERNAL_NETWORK
+ parameters:
+ - string:
+ name: EXTERNAL_NETWORK
+ default: public
+
- cntt-containers: &cntt-containers
name: 'cntt-containers'
repo: '{repo}'
@@ -69,8 +83,8 @@
-e INSTALLER_TYPE=cntt \
-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 \
@@ -172,6 +186,13 @@
- 'cntt-{repo}-{container}-{tag}-pull'
- project:
+ name: 'cntt-opnfv-functest-smoke-cntt-pull'
+ <<: *cntt-params
+ container: 'functest-smoke-cntt'
+ jobs:
+ - 'cntt-{repo}-{container}-{tag}-pull'
+
+- project:
name: 'cntt-opnfv-functest-benchmarking-pull'
<<: *cntt-params
container: 'functest-benchmarking'
@@ -209,6 +230,13 @@
- 'cntt-{repo}-{container}-{tag}-rmi'
- project:
+ name: 'cntt-opnfv-functest-smoke-cntt-rmi'
+ <<: *cntt-params
+ container: 'functest-smoke-cntt'
+ jobs:
+ - 'cntt-{repo}-{container}-{tag}-rmi'
+
+- project:
name: 'cntt-opnfv-functest-benchmarking-rmi'
<<: *cntt-params
container: 'functest-benchmarking'
@@ -227,6 +255,10 @@
parameters:
- cntt-slave:
slave: '{slave}'
+ - cntt-DEBUG:
+ DEBUG: 'true'
+ - cntt-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
builders:
- cntt-run-containers:
<<: *cntt-run-containers
@@ -270,6 +302,19 @@
- 'cntt-{repo}-{container}-{tag}-{test}-run'
- project:
+ name: 'cntt-opnfv-functest-smoke-cntt'
+ <<: *cntt-params
+ container: 'functest-smoke-cntt'
+ test:
+ - neutron-tempest-plugin-api
+ - tempest_cinder
+ - tempest_keystone
+ - rally_sanity
+ - tempest_full
+ jobs:
+ - 'cntt-{repo}-{container}-{tag}-{test}-run'
+
+- project:
name: 'cntt-opnfv-functest-benchmarking'
<<: *cntt-params
container: 'functest-benchmarking'
@@ -304,6 +349,10 @@
slave: '{slave}'
- cntt-branch:
branch: 'master'
+ - cntt-DEBUG:
+ DEBUG: 'true'
+ - cntt-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
properties:
- build-blocker:
use-build-blocker: true
@@ -323,6 +372,8 @@
<<: *cntt-jobs
- name: 'cntt-opnfv-functest-smoke-{tag}-rmi'
<<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-rmi'
+ <<: *cntt-jobs
- name: 'cntt-opnfv-functest-benchmarking-{tag}-rmi'
<<: *cntt-jobs
- name: 'cntt-opnfv-functest-vnf-{tag}-rmi'
@@ -334,6 +385,8 @@
<<: *cntt-jobs
- name: 'cntt-opnfv-functest-smoke-{tag}-pull'
<<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-pull'
+ <<: *cntt-jobs
- name: 'cntt-opnfv-functest-benchmarking-{tag}-pull'
<<: *cntt-jobs
- name: 'cntt-opnfv-functest-vnf-{tag}-pull'
@@ -391,6 +444,19 @@
- name: 'cntt-opnfv-functest-smoke-{tag}-barbican-run'
<<: *cntt-jobs
- multijob:
+ name: opnfv/functest-smoke-cntt:{tag}
+ projects:
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_full-run'
+ <<: *cntt-jobs
+ - multijob:
name: opnfv/functest-benchmarking:{functest_tag}
condition: ALWAYS
projects:
@@ -451,6 +517,10 @@
parameters:
- cntt-slave:
slave: '{slave}'
+ - cntt-DEBUG:
+ DEBUG: 'true'
+ - cntt-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
properties:
- build-blocker:
use-build-blocker: true
@@ -470,6 +540,8 @@
<<: *cntt-jobs
- name: 'cntt-opnfv-functest-smoke-{tag}-rmi'
<<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-rmi'
+ <<: *cntt-jobs
- name: 'cntt-opnfv-functest-benchmarking-{tag}-rmi'
<<: *cntt-jobs
- name: 'cntt-opnfv-functest-vnf-{tag}-rmi'
@@ -481,6 +553,8 @@
<<: *cntt-jobs
- name: 'cntt-opnfv-functest-smoke-{tag}-pull'
<<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-pull'
+ <<: *cntt-jobs
- name: 'cntt-opnfv-functest-benchmarking-{tag}-pull'
<<: *cntt-jobs
- name: 'cntt-opnfv-functest-vnf-{tag}-pull'
@@ -524,6 +598,19 @@
- name: 'cntt-opnfv-functest-smoke-{tag}-barbican-run'
<<: *cntt-jobs
- multijob:
+ name: opnfv/functest-smoke-cntt:{tag}
+ projects:
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_full-run'
+ <<: *cntt-jobs
+ - multijob:
name: opnfv/functest-benchmarking:{functest_tag}
projects:
- name: 'cntt-opnfv-functest-benchmarking-{tag}-vmtp-run'