summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-10-29 10:21:41 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2019-10-29 10:54:16 +0100
commitb03c8d2ec246a431b76cea2760fb60483db978ec (patch)
tree9f199d9c38248a4ed1b8f8c71bba445ab870b096 /jjb
parentf8d88e79d7d84e247202a52a854150f3a2dd3183 (diff)
Add latest tempest plugins integrated into Functest
Change-Id: Ic820f7d558be5e5425d2d3b165a8188c1eca13d3 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/functest/functest.yaml46
1 files changed, 46 insertions, 0 deletions
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index fc0718a9c..0490f5958 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -11,15 +11,19 @@
- latest:
branch: master
slave: lf-virtual9
+ dashboard_url: http://172.30.13.94
- jerma:
branch: stable/jerma
slave: lf-virtual4
+ dashboard_url: http://172.30.13.89
- iruya:
branch: stable/iruya
slave: lf-virtual4
+ dashboard_url: http://172.30.13.89
- hunter:
branch: stable/hunter
slave: lf-virtual6
+ dashboard_url: http://172.30.13.91
- parameter:
name: functest-slave
@@ -46,6 +50,7 @@
name: 'functest-build-containers'
<<: *functest-containers
test: '{test}'
+ dashboard_url: '{dashboard_url}'
- functest-build-containers: &functest-build-containers
name: 'functest-build-containers'
@@ -115,6 +120,7 @@
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-e DEBUG=True \
-e EXTERNAL_NETWORK=public \
+ -e DASHBOARD_URL={dashboard_url} \
-v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
-v /home/opnfv/functest/images:/home/opnfv/functest/images \
-v /home/opnfv/functest/tempest_blacklist.yaml:/usr/lib/python$py/\
@@ -254,6 +260,14 @@
- cinder_test
- odl
- tempest_smoke
+ - tempest_horizon
+ exclude:
+ - tag: jerma
+ test: tempest_horizon
+ - tag: iruya
+ test: tempest_horizon
+ - tag: hunter
+ test: tempest_horizon
jobs:
- 'functest-{repo}-{container}-{tag}-{test}-run'
@@ -263,6 +277,8 @@
container: 'functest-smoke'
test:
- neutron-tempest-plugin-api
+ - tempest_keystone
+ - tempest_cinder
- rally_sanity
- refstack_defcore
- refstack_compute
@@ -282,10 +298,18 @@
test: refstack_defcore
- tag: jerma
test: refstack_defcore
+ - tag: jerma
+ test: tempest_keystone
+ - tag: jerma
+ test: tempest_cinder
- tag: iruya
test: refstack_defcore
- tag: iruya
test: octavia
+ - tag: iruya
+ test: tempest_keystone
+ - tag: iruya
+ test: tempest_cinder
- tag: hunter
test: refstack_compute
- tag: hunter
@@ -296,6 +320,10 @@
test: tempest_slow
- tag: hunter
test: octavia
+ - tag: hunter
+ test: tempest_keystone
+ - tag: hunter
+ test: tempest_cinder
jobs:
- 'functest-{repo}-{container}-{tag}-{test}-run'
@@ -388,11 +416,17 @@
<<: *functest-jobs
- name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_horizon-run'
+ <<: *functest-jobs
- multijob:
name: opnfv/functest-smoke:{tag}
projects:
- name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_keystone-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_cinder-run'
+ <<: *functest-jobs
- name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
<<: *functest-jobs
- name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -642,11 +676,17 @@
<<: *functest-jobs
- name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_horizon-run'
+ <<: *functest-jobs
- multijob:
name: opnfv/functest-smoke:{tag}
projects:
- name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_keystone-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_cinder-run'
+ <<: *functest-jobs
- name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
<<: *functest-jobs
- name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -809,11 +849,17 @@
<<: *functest-jobs
- name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_horizon-run'
+ <<: *functest-jobs
- multijob:
name: opnfv/functest-smoke:{tag}
projects:
- name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_keystone-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_cinder-run'
+ <<: *functest-jobs
- name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
<<: *functest-jobs
- name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'