From 1d786e2471e3cb368c751d5b4f0bbd164ca3042d Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 14 Dec 2015 19:47:05 +0100 Subject: [PATCH] Rename and templatize ansible functional jobs Rename {pipeline}-{name}-dsvm-functional-{ostype}{job-suffix} to {pipeline}-{name}-dsvm-ansible-functional-{ostype}{job-suffix} as jenkins job. Add print-template-name to it to job-template. In zuul setup: - Rename existing template ansible-role-functional-jobs to ansible-role-functional-jobs-centos7. - Introduce new template ansible-role-functional-jobs-trusty. - Use the new template when appropriate. - Rename jobs for renamed functional jobs. Change-Id: I34b6bbe1230fa08c3e17d904792d58e2d5c69644 --- jenkins/jobs/ansible-role-jobs.yaml | 8 ++- zuul/layout.yaml | 103 +++++++++------------------- 2 files changed, 37 insertions(+), 74 deletions(-) diff --git a/jenkins/jobs/ansible-role-jobs.yaml b/jenkins/jobs/ansible-role-jobs.yaml index 45726b3d2a..3001ab6d40 100644 --- a/jenkins/jobs/ansible-role-jobs.yaml +++ b/jenkins/jobs/ansible-role-jobs.yaml @@ -14,10 +14,12 @@ - console-log - job-template: - name: '{pipeline}-{name}-dsvm-functional-{ostype}{job-suffix}' + name: '{pipeline}-{name}-dsvm-ansible-functional-{ostype}{job-suffix}' node: 'devstack-{ostype}' builders: + - print-template-name: + template-name: "{template-name}" - zuul-git-prep - shell: | # Allow Jenkins user to ssh into localhost @@ -44,13 +46,13 @@ - 'gate-{name}-pep8' - 'gate-{name}-tox-{envlist}': envlist: ansible-lint - - '{pipeline}-{name}-dsvm-functional-{ostype}{job-suffix}': + - '{pipeline}-{name}-dsvm-ansible-functional-{ostype}{job-suffix}': job-suffix: '-nv' ostype: - centos7 - trusty pipeline: gate - - '{pipeline}-{name}-dsvm-functional-{ostype}{job-suffix}': + - '{pipeline}-{name}-dsvm-ansible-functional-{ostype}{job-suffix}': job-suffix: '' ostype: - centos7 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index c95ba51b92..4988db43a9 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -265,11 +265,17 @@ project-templates: - 'gate-{name}-pep8' - 'gate-{name}-tox-ansible-lint' - - name: ansible-role-functional-jobs + - name: ansible-role-functional-jobs-centos7 check: - - 'gate-{name}-dsvm-functional-centos7' + - 'gate-{name}-dsvm-ansible-functional-centos7' 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 check: @@ -3509,35 +3515,35 @@ projects: - name: ansible-role-jobs - name: docs-on-rtfd check: - - gate-ansible-role-diskimage-builder-dsvm-functional-centos7-nv - - gate-ansible-role-diskimage-builder-dsvm-functional-trusty-nv + - gate-ansible-role-diskimage-builder-dsvm-ansible-functional-centos7-nv + - gate-ansible-role-diskimage-builder-dsvm-ansible-functional-trusty-nv - name: openstack/ansible-role-jenkins-job-builder template: - name: merge-check - name: ansible-role-jobs - - name: ansible-role-functional-jobs + - name: ansible-role-functional-jobs-centos7 - name: docs-on-rtfd 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 template: - name: merge-check - name: ansible-role-jobs - - name: ansible-role-functional-jobs + - name: ansible-role-functional-jobs-centos7 - name: docs-on-rtfd check: - - gate-ansible-role-nodepool-dsvm-functional-trusty-nv + - gate-ansible-role-nodepool-dsvm-ansible-functional-trusty-nv - name: openstack/ansible-role-zuul template: - name: merge-check - name: ansible-role-jobs - - name: ansible-role-functional-jobs + - name: ansible-role-functional-jobs-centos7 - name: docs-on-rtfd check: - - gate-ansible-role-zuul-dsvm-functional-trusty-nv + - gate-ansible-role-zuul-dsvm-ansible-functional-trusty-nv - name: openstack/anvil template: @@ -6771,150 +6777,105 @@ projects: - name: merge-check - name: ansible-role-jobs - name: openstack-server-publish-jobs - check: - - gate-openstack-ansible-apt_package_pinning-dsvm-functional-trusty - gate: - - gate-openstack-ansible-apt_package_pinning-dsvm-functional-trusty + - name: ansible-role-functional-jobs-trusty - name: openstack/openstack-ansible-galera_client template: - name: merge-check - name: ansible-role-jobs - name: openstack-server-publish-jobs - check: - - gate-openstack-ansible-security-dsvm-functional-trusty - gate: - - gate-openstack-ansible-security-dsvm-functional-trusty + - name: ansible-role-functional-jobs-trusty - name: openstack/openstack-ansible-galera_server template: - name: merge-check - name: ansible-role-jobs - name: openstack-server-publish-jobs - check: - - gate-openstack-ansible-security-dsvm-functional-trusty - gate: - - gate-openstack-ansible-security-dsvm-functional-trusty + - name: ansible-role-functional-jobs-trusty - name: openstack/openstack-ansible-lxc_container_create template: - name: merge-check - name: ansible-role-jobs - name: openstack-server-publish-jobs - check: - - gate-openstack-ansible-lxc_container_create-dsvm-functional-trusty - gate: - - gate-openstack-ansible-lxc_container_create-dsvm-functional-trusty + - name: ansible-role-functional-jobs-trusty - name: openstack/openstack-ansible-lxc_hosts template: - name: merge-check - name: ansible-role-jobs - name: openstack-server-publish-jobs - check: - - gate-openstack-ansible-lxc_hosts-dsvm-functional-trusty - gate: - - gate-openstack-ansible-lxc_hosts-dsvm-functional-trusty + - name: ansible-role-functional-jobs-trusty - name: openstack/openstack-ansible-memcached_server template: - name: merge-check - name: ansible-role-jobs - name: openstack-server-publish-jobs - check: - - gate-openstack-ansible-security-dsvm-functional-trusty - gate: - - gate-openstack-ansible-security-dsvm-functional-trusty + - name: ansible-role-functional-jobs-trusty - name: openstack/openstack-ansible-openstack_hosts template: - name: merge-check - name: ansible-role-jobs - name: openstack-server-publish-jobs - check: - - gate-openstack-ansible-openstack_hosts-dsvm-functional-trusty - gate: - - gate-openstack-ansible-openstack_hosts-dsvm-functional-trusty + - name: ansible-role-functional-jobs-trusty - name: openstack/openstack-ansible-pip_install template: - name: merge-check - name: ansible-role-jobs - name: openstack-server-publish-jobs - check: - - gate-openstack-ansible-pip_install-dsvm-functional-trusty - gate: - - gate-openstack-ansible-pip_install-dsvm-functional-trusty + - name: ansible-role-functional-jobs-trusty - name: openstack/openstack-ansible-pip_lock_down template: - name: merge-check - name: ansible-role-jobs - name: openstack-server-publish-jobs - check: - - gate-openstack-ansible-pip_install-dsvm-functional-trusty - gate: - - gate-openstack-ansible-pip_install-dsvm-functional-trusty + - name: ansible-role-functional-jobs-trusty - name: openstack/openstack-ansible-py_from_git template: - name: merge-check - name: ansible-role-jobs - name: openstack-server-publish-jobs - check: - - gate-openstack-ansible-py_from_git-dsvm-functional-trusty - gate: - - gate-openstack-ansible-py_from_git-dsvm-functional-trusty + - name: ansible-role-functional-jobs-trusty - name: openstack/openstack-ansible-rabbitmq_server template: - name: merge-check - name: ansible-role-jobs - name: openstack-server-publish-jobs - check: - - gate-openstack-ansible-security-dsvm-functional-trusty - gate: - - gate-openstack-ansible-security-dsvm-functional-trusty + - name: ansible-role-functional-jobs-trusty - name: openstack/openstack-ansible-repo_server template: - name: merge-check - name: ansible-role-jobs - name: openstack-server-publish-jobs - check: - - gate-openstack-ansible-security-dsvm-functional-trusty - gate: - - gate-openstack-ansible-security-dsvm-functional-trusty + - name: ansible-role-functional-jobs-trusty - name: openstack/openstack-ansible-rsyslog_client template: - name: merge-check - name: ansible-role-jobs - name: openstack-server-publish-jobs - check: - - gate-openstack-ansible-rsyslog_client-dsvm-functional-trusty - gate: - - gate-openstack-ansible-rsyslog_client-dsvm-functional-trusty + - name: ansible-role-functional-jobs-trusty - name: openstack/openstack-ansible-rsyslog_server template: - name: merge-check - name: ansible-role-jobs - name: openstack-server-publish-jobs - check: - - gate-openstack-ansible-security-dsvm-functional-trusty - gate: - - gate-openstack-ansible-security-dsvm-functional-trusty + - name: ansible-role-functional-jobs-trusty - name: openstack/openstack-ansible-security template: - name: merge-check - name: ansible-role-jobs - name: openstack-server-publish-jobs - check: - - gate-openstack-ansible-security-dsvm-functional-trusty - gate: - - gate-openstack-ansible-security-dsvm-functional-trusty + - name: ansible-role-functional-jobs-trusty - name: openstack/openstack-ansible-specs template: