Merge "Rename and templatize ansible functional jobs"

This commit is contained in:
Jenkins 2015-12-16 09:18:50 +00:00 committed by Gerrit Code Review
commit f22e6cce36
2 changed files with 37 additions and 74 deletions

View File

@ -14,10 +14,12 @@
- console-log - console-log
- job-template: - job-template:
name: '{pipeline}-{name}-dsvm-functional-{ostype}{job-suffix}' name: '{pipeline}-{name}-dsvm-ansible-functional-{ostype}{job-suffix}'
node: 'devstack-{ostype}' node: 'devstack-{ostype}'
builders: builders:
- print-template-name:
template-name: "{template-name}"
- zuul-git-prep - zuul-git-prep
- shell: | - shell: |
# Allow Jenkins user to ssh into localhost # Allow Jenkins user to ssh into localhost
@ -44,13 +46,13 @@
- 'gate-{name}-pep8' - 'gate-{name}-pep8'
- 'gate-{name}-tox-{envlist}': - 'gate-{name}-tox-{envlist}':
envlist: ansible-lint envlist: ansible-lint
- '{pipeline}-{name}-dsvm-functional-{ostype}{job-suffix}': - '{pipeline}-{name}-dsvm-ansible-functional-{ostype}{job-suffix}':
job-suffix: '-nv' job-suffix: '-nv'
ostype: ostype:
- centos7 - centos7
- trusty - trusty
pipeline: gate pipeline: gate
- '{pipeline}-{name}-dsvm-functional-{ostype}{job-suffix}': - '{pipeline}-{name}-dsvm-ansible-functional-{ostype}{job-suffix}':
job-suffix: '' job-suffix: ''
ostype: ostype:
- centos7 - centos7

View File

@ -265,11 +265,17 @@ project-templates:
- 'gate-{name}-pep8' - 'gate-{name}-pep8'
- 'gate-{name}-tox-ansible-lint' - 'gate-{name}-tox-ansible-lint'
- name: ansible-role-functional-jobs - name: ansible-role-functional-jobs-centos7
check: check:
- 'gate-{name}-dsvm-functional-centos7' - 'gate-{name}-dsvm-ansible-functional-centos7'
gate: gate:
- 'gate-{name}-dsvm-functional-centos7' - 'gate-{name}-dsvm-ansible-functional-centos7'
- name: ansible-role-functional-jobs-trusty
check:
- 'gate-{name}-dsvm-ansible-functional-trusty'
gate:
- 'gate-{name}-dsvm-ansible-functional-trusty'
- name: python-jobs - name: python-jobs
check: check:
@ -3499,35 +3505,35 @@ projects:
- name: ansible-role-jobs - name: ansible-role-jobs
- name: docs-on-rtfd - name: docs-on-rtfd
check: check:
- gate-ansible-role-diskimage-builder-dsvm-functional-centos7-nv - gate-ansible-role-diskimage-builder-dsvm-ansible-functional-centos7-nv
- gate-ansible-role-diskimage-builder-dsvm-functional-trusty-nv - gate-ansible-role-diskimage-builder-dsvm-ansible-functional-trusty-nv
- name: openstack/ansible-role-jenkins-job-builder - name: openstack/ansible-role-jenkins-job-builder
template: template:
- name: merge-check - name: merge-check
- name: ansible-role-jobs - name: ansible-role-jobs
- name: ansible-role-functional-jobs - name: ansible-role-functional-jobs-centos7
- name: docs-on-rtfd - name: docs-on-rtfd
check: check:
- gate-ansible-role-jenkins-job-builder-dsvm-functional-trusty-nv - gate-ansible-role-jenkins-job-builder-dsvm-ansible-functional-trusty-nv
- name: openstack/ansible-role-nodepool - name: openstack/ansible-role-nodepool
template: template:
- name: merge-check - name: merge-check
- name: ansible-role-jobs - name: ansible-role-jobs
- name: ansible-role-functional-jobs - name: ansible-role-functional-jobs-centos7
- name: docs-on-rtfd - name: docs-on-rtfd
check: check:
- gate-ansible-role-nodepool-dsvm-functional-trusty-nv - gate-ansible-role-nodepool-dsvm-ansible-functional-trusty-nv
- name: openstack/ansible-role-zuul - name: openstack/ansible-role-zuul
template: template:
- name: merge-check - name: merge-check
- name: ansible-role-jobs - name: ansible-role-jobs
- name: ansible-role-functional-jobs - name: ansible-role-functional-jobs-centos7
- name: docs-on-rtfd - name: docs-on-rtfd
check: check:
- gate-ansible-role-zuul-dsvm-functional-trusty-nv - gate-ansible-role-zuul-dsvm-ansible-functional-trusty-nv
- name: openstack/anvil - name: openstack/anvil
template: template:
@ -6782,150 +6788,105 @@ projects:
- name: merge-check - name: merge-check
- name: ansible-role-jobs - name: ansible-role-jobs
- name: openstack-server-publish-jobs - name: openstack-server-publish-jobs
check: - name: ansible-role-functional-jobs-trusty
- gate-openstack-ansible-apt_package_pinning-dsvm-functional-trusty
gate:
- gate-openstack-ansible-apt_package_pinning-dsvm-functional-trusty
- name: openstack/openstack-ansible-galera_client - name: openstack/openstack-ansible-galera_client
template: template:
- name: merge-check - name: merge-check
- name: ansible-role-jobs - name: ansible-role-jobs
- name: openstack-server-publish-jobs - name: openstack-server-publish-jobs
check: - name: ansible-role-functional-jobs-trusty
- gate-openstack-ansible-security-dsvm-functional-trusty
gate:
- gate-openstack-ansible-security-dsvm-functional-trusty
- name: openstack/openstack-ansible-galera_server - name: openstack/openstack-ansible-galera_server
template: template:
- name: merge-check - name: merge-check
- name: ansible-role-jobs - name: ansible-role-jobs
- name: openstack-server-publish-jobs - name: openstack-server-publish-jobs
check: - name: ansible-role-functional-jobs-trusty
- gate-openstack-ansible-security-dsvm-functional-trusty
gate:
- gate-openstack-ansible-security-dsvm-functional-trusty
- name: openstack/openstack-ansible-lxc_container_create - name: openstack/openstack-ansible-lxc_container_create
template: template:
- name: merge-check - name: merge-check
- name: ansible-role-jobs - name: ansible-role-jobs
- name: openstack-server-publish-jobs - name: openstack-server-publish-jobs
check: - name: ansible-role-functional-jobs-trusty
- gate-openstack-ansible-lxc_container_create-dsvm-functional-trusty
gate:
- gate-openstack-ansible-lxc_container_create-dsvm-functional-trusty
- name: openstack/openstack-ansible-lxc_hosts - name: openstack/openstack-ansible-lxc_hosts
template: template:
- name: merge-check - name: merge-check
- name: ansible-role-jobs - name: ansible-role-jobs
- name: openstack-server-publish-jobs - name: openstack-server-publish-jobs
check: - name: ansible-role-functional-jobs-trusty
- gate-openstack-ansible-lxc_hosts-dsvm-functional-trusty
gate:
- gate-openstack-ansible-lxc_hosts-dsvm-functional-trusty
- name: openstack/openstack-ansible-memcached_server - name: openstack/openstack-ansible-memcached_server
template: template:
- name: merge-check - name: merge-check
- name: ansible-role-jobs - name: ansible-role-jobs
- name: openstack-server-publish-jobs - name: openstack-server-publish-jobs
check: - name: ansible-role-functional-jobs-trusty
- gate-openstack-ansible-security-dsvm-functional-trusty
gate:
- gate-openstack-ansible-security-dsvm-functional-trusty
- name: openstack/openstack-ansible-openstack_hosts - name: openstack/openstack-ansible-openstack_hosts
template: template:
- name: merge-check - name: merge-check
- name: ansible-role-jobs - name: ansible-role-jobs
- name: openstack-server-publish-jobs - name: openstack-server-publish-jobs
check: - name: ansible-role-functional-jobs-trusty
- gate-openstack-ansible-openstack_hosts-dsvm-functional-trusty
gate:
- gate-openstack-ansible-openstack_hosts-dsvm-functional-trusty
- name: openstack/openstack-ansible-pip_install - name: openstack/openstack-ansible-pip_install
template: template:
- name: merge-check - name: merge-check
- name: ansible-role-jobs - name: ansible-role-jobs
- name: openstack-server-publish-jobs - name: openstack-server-publish-jobs
check: - name: ansible-role-functional-jobs-trusty
- gate-openstack-ansible-pip_install-dsvm-functional-trusty
gate:
- gate-openstack-ansible-pip_install-dsvm-functional-trusty
- name: openstack/openstack-ansible-pip_lock_down - name: openstack/openstack-ansible-pip_lock_down
template: template:
- name: merge-check - name: merge-check
- name: ansible-role-jobs - name: ansible-role-jobs
- name: openstack-server-publish-jobs - name: openstack-server-publish-jobs
check: - name: ansible-role-functional-jobs-trusty
- gate-openstack-ansible-pip_install-dsvm-functional-trusty
gate:
- gate-openstack-ansible-pip_install-dsvm-functional-trusty
- name: openstack/openstack-ansible-py_from_git - name: openstack/openstack-ansible-py_from_git
template: template:
- name: merge-check - name: merge-check
- name: ansible-role-jobs - name: ansible-role-jobs
- name: openstack-server-publish-jobs - name: openstack-server-publish-jobs
check: - name: ansible-role-functional-jobs-trusty
- gate-openstack-ansible-py_from_git-dsvm-functional-trusty
gate:
- gate-openstack-ansible-py_from_git-dsvm-functional-trusty
- name: openstack/openstack-ansible-rabbitmq_server - name: openstack/openstack-ansible-rabbitmq_server
template: template:
- name: merge-check - name: merge-check
- name: ansible-role-jobs - name: ansible-role-jobs
- name: openstack-server-publish-jobs - name: openstack-server-publish-jobs
check: - name: ansible-role-functional-jobs-trusty
- gate-openstack-ansible-security-dsvm-functional-trusty
gate:
- gate-openstack-ansible-security-dsvm-functional-trusty
- name: openstack/openstack-ansible-repo_server - name: openstack/openstack-ansible-repo_server
template: template:
- name: merge-check - name: merge-check
- name: ansible-role-jobs - name: ansible-role-jobs
- name: openstack-server-publish-jobs - name: openstack-server-publish-jobs
check: - name: ansible-role-functional-jobs-trusty
- gate-openstack-ansible-security-dsvm-functional-trusty
gate:
- gate-openstack-ansible-security-dsvm-functional-trusty
- name: openstack/openstack-ansible-rsyslog_client - name: openstack/openstack-ansible-rsyslog_client
template: template:
- name: merge-check - name: merge-check
- name: ansible-role-jobs - name: ansible-role-jobs
- name: openstack-server-publish-jobs - name: openstack-server-publish-jobs
check: - name: ansible-role-functional-jobs-trusty
- gate-openstack-ansible-rsyslog_client-dsvm-functional-trusty
gate:
- gate-openstack-ansible-rsyslog_client-dsvm-functional-trusty
- name: openstack/openstack-ansible-rsyslog_server - name: openstack/openstack-ansible-rsyslog_server
template: template:
- name: merge-check - name: merge-check
- name: ansible-role-jobs - name: ansible-role-jobs
- name: openstack-server-publish-jobs - name: openstack-server-publish-jobs
check: - name: ansible-role-functional-jobs-trusty
- gate-openstack-ansible-security-dsvm-functional-trusty
gate:
- gate-openstack-ansible-security-dsvm-functional-trusty
- name: openstack/openstack-ansible-security - name: openstack/openstack-ansible-security
template: template:
- name: merge-check - name: merge-check
- name: ansible-role-jobs - name: ansible-role-jobs
- name: openstack-server-publish-jobs - name: openstack-server-publish-jobs
check: - name: ansible-role-functional-jobs-trusty
- gate-openstack-ansible-security-dsvm-functional-trusty
gate:
- gate-openstack-ansible-security-dsvm-functional-trusty
- name: openstack/openstack-ansible-specs - name: openstack/openstack-ansible-specs
template: template: