Add experimental Fedora 21 devstack job

Add an experimental devstack f21 job as the first step in bringing up
Fedora 21.

As requested condense this into a job-template for the fedora jobs.
Also add the node matching update; this is kept as a separate regex to
help it show up when grepping.

Change-Id: If084c2cbf058c9adbe0cb706559711a9f3959aa4
Depends-on: If764f676f43c86830b4277adaaf71098e9d4140b
This commit is contained in:
Ian Wienand 2014-12-11 12:03:13 +11:00
parent 397cbe5373
commit fd3c223772
4 changed files with 21 additions and 4 deletions

View File

@ -1445,9 +1445,9 @@
- devstack-logs
- console-log
- job:
name: 'check-tempest-dsvm-f20'
node: 'devstack-f20'
- job-template:
name: '{pipeline}-tempest-dsvm-f{fedora-release}'
node: '{node}'
wrappers:
- build-timeout:

View File

@ -1785,7 +1785,15 @@
node: devstack-precise-dib
branch-designator: '-icehouse-dibtest'
branch-override: stable/icehouse
# fedora jobs
- '{pipeline}-tempest-dsvm-f{fedora-release}':
pipeline: check
fedora-release: 20
node: devstack-f20
- '{pipeline}-tempest-dsvm-f{fedora-release}':
fedora-release: 21
pipeline: check
node: devstack-f21
- project:
name: hacking

View File

@ -595,6 +595,9 @@ jobs:
- name: check-tempest-dsvm-f20
branch: ^(?!stable)
voting: false
- name: check-tempest-dsvm-f21
branch: ^(?!stable)
voting: false
- name: check-tempest-dsvm-centos7
branch: ^(?!stable/icehouse).*$
voting: false
@ -2940,6 +2943,7 @@ projects:
- check-tempest-dsvm-cells
- check-tempest-dsvm-mongodb-zaqar
- gate-grenade-dsvm-forward
- check-tempest-dsvm-f21
- name: openstack-dev/devstack-vagrant
template:

View File

@ -93,6 +93,7 @@ def set_node_options(item, job, params, default):
python26_re = r'^.*-(py(thon)?)?26.*$'
centos6_re = r'^.*-centos6.*$'
f20_re = r'^.*-f20.*$'
f21_re = r'^.*-f21.*$'
python33_re = r'^.*-(py(thon)?33|33).*$'
tripleo_re = r'^.*-tripleo.*$'
devstack_re = r'^.*-dsvm.*$'
@ -112,6 +113,10 @@ def set_node_options(item, job, params, default):
elif re.match(f20_re, job.name):
# Pass because job specified label is always correct.
pass
# Jobs needing fedora 21
elif re.match(f21_re, job.name):
# Pass because job specified label is always correct.
pass
# Jobs needing py33/pypy slaves
elif re.match(python33_re, job.name):
# Pass because job specified label is always correct.