openstack/project-config
Code Issues Proposed changes

Merge "Shorten the kolla job names"

Browse Source
This commit is contained in:
Jenkins 2015-11-13 10:08:23 +00:00 committed by Gerrit Code Review
commit 49fc654d99
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jenkins/jobs/kolla.yaml
View File

@ -1,5 +1,5 @@
- job-template: - job-template:
name: '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}' name: '{pipeline}-kolla-dsvm-{action}-{distro}-{type}'
node: '{node}' node: '{node}'
wrappers: wrappers:
@ -14,7 +14,7 @@
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
tests/setup_gate.sh tests/setup_gate.sh
tox -e {action}-images-{distro}-{type} tox -e {action}-{distro}-{type}
publishers: publishers:
- console-log - console-log

14
jenkins/jobs/projects.yaml
View File

@ -2228,43 +2228,43 @@
- openstack-publish-jobs - openstack-publish-jobs
- 'gate-{name}-tox-{envlist}': - 'gate-{name}-tox-{envlist}':
envlist: validate-contents envlist: validate-contents
- '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}': - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
action: build action: build
distro: centos distro: centos
node: 'devstack-centos7' node: 'devstack-centos7'
pipeline: gate pipeline: gate
type: binary type: binary
- '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}': - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
action: deploy action: deploy
distro: centos distro: centos
node: 'devstack-centos7' node: 'devstack-centos7'
pipeline: gate pipeline: gate
type: binary type: binary
- '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}': - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
action: build action: build
distro: centos distro: centos
node: 'devstack-centos7' node: 'devstack-centos7'
pipeline: gate pipeline: gate
type: source type: source
- '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}': - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
action: deploy action: deploy
distro: centos distro: centos
node: 'devstack-centos7' node: 'devstack-centos7'
pipeline: gate pipeline: gate
type: source type: source
- '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}': - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
action: build action: build
distro: ubuntu distro: ubuntu
node: 'devstack-trusty' node: 'devstack-trusty'
pipeline: gate pipeline: gate
type: source type: source
- '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}': - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
action: deploy action: deploy
distro: ubuntu distro: ubuntu
node: 'devstack-trusty' node: 'devstack-trusty'
pipeline: gate pipeline: gate
type: source type: source
- '{pipeline}-kolla-dsvm-{action}-images-{distro}-{type}': - '{pipeline}-kolla-dsvm-{action}-{distro}-{type}':
action: deploy-multinode action: deploy-multinode
distro: ubuntu distro: ubuntu
node: 'devstack-trusty-2-node' node: 'devstack-trusty-2-node'

26
zuul/layout.yaml
View File

@ -1781,22 +1781,22 @@ jobs:
- name: gate-glance_store-python34 - name: gate-glance_store-python34
branch: ^(?!stable/kilo).*$ branch: ^(?!stable/kilo).*$
- name: gate-kolla-dsvm-build-images-centos-binary - name: gate-kolla-dsvm-build-centos-binary
voting: false voting: false
- name: gate-kolla-dsvm-deploy-images-centos-binary - name: gate-kolla-dsvm-deploy-centos-binary
voting: false voting: false
- name: gate-kolla-dsvm-build-images-centos-source - name: gate-kolla-dsvm-build-centos-source
voting: false voting: false
- name: gate-kolla-dsvm-deploy-images-centos-source - name: gate-kolla-dsvm-deploy-centos-source
voting: false voting: false
- name: gate-kolla-dsvm-build-images-ubuntu-source - name: gate-kolla-dsvm-build-ubuntu-source
voting: false voting: false
- name: gate-kolla-dsvm-deploy-images-ubuntu-source - name: gate-kolla-dsvm-deploy-ubuntu-source
voting: false voting: false
- name: ^(gate-)?devstack-publish-docs - name: ^(gate-)?devstack-publish-docs
@ -5685,18 +5685,18 @@ projects:
- gate-kolla-bashate - gate-kolla-bashate
- gate-kolla-pep8 - gate-kolla-pep8
- gate-kolla-tox-validate-contents - gate-kolla-tox-validate-contents
- gate-kolla-dsvm-build-images-centos-binary - gate-kolla-dsvm-build-centos-binary
- gate-kolla-dsvm-deploy-images-centos-binary - gate-kolla-dsvm-deploy-centos-binary
- gate-kolla-dsvm-build-images-centos-source - gate-kolla-dsvm-build-centos-source
- gate-kolla-dsvm-deploy-images-centos-source - gate-kolla-dsvm-deploy-centos-source
- gate-kolla-dsvm-build-images-ubuntu-source - gate-kolla-dsvm-build-ubuntu-source
- gate-kolla-dsvm-deploy-images-ubuntu-source - gate-kolla-dsvm-deploy-ubuntu-source
gate: gate:
- gate-kolla-bashate - gate-kolla-bashate
- gate-kolla-pep8 - gate-kolla-pep8
- gate-kolla-tox-validate-contents - gate-kolla-tox-validate-contents
experimental: experimental:
- experimental-kolla-dsvm-deploy-multinode-images-ubuntu-source - experimental-kolla-dsvm-deploy-multinode-ubuntu-source
- name: openstack/kolla-mesos - name: openstack/kolla-mesos
template: template:

2
zuul/openstack_functions.py
View File

@ -99,7 +99,7 @@ def set_node_options(item, job, params, default):
centos6_re = r'^.*-centos6.*$' centos6_re = r'^.*-centos6.*$'
fedora_re = r'^.*-f(edora-)?2(1|2).*$' fedora_re = r'^.*-f(edora-)?2(1|2).*$'
tripleo_re = r'^.*-tripleo-ci.*$' tripleo_re = r'^.*-tripleo-ci.*$'
kolla_image_re = r'^.*-kolla-dsvm-(build|deploy)-images-.*$' kolla_image_re = r'^.*-kolla-dsvm-(build|deploy)-.*$'
openstack_ansible_re = r'^.*-openstack-ansible-.*$' openstack_ansible_re = r'^.*-openstack-ansible-.*$'
devstack_re = r'^.*-dsvm.*$' devstack_re = r'^.*-dsvm.*$'
puppetunit_re = ( puppetunit_re = (