From 23b28cb8d91c577796350a833979033d3a2f305d Mon Sep 17 00:00:00 2001 From: Adam Gandelman Date: Tue, 5 Aug 2014 13:13:18 -0700 Subject: [PATCH] Consolidate and rename Ironic jobs This gets rid of the redundant Ironic jobs and configures all Ironic devstack jobs to run with VIRT_DRIVER=ironic. This also configures deploy driver and exposes that in the job name. To avoid copy/paste of the huge Ironic devstack shell builder, a temporary macro s added that will be removed once we can minimally define the Ironic devstack jobs. Change-Id: I3c984aff36a9663b33db13fc21df48a35ea6264c --- .../config/devstack-gate.yaml | 129 +++++++----------- .../jenkins_job_builder/config/projects.yaml | 9 +- .../openstack_project/files/zuul/layout.yaml | 48 +++---- 3 files changed, 67 insertions(+), 119 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml index 50e3fd807c..cbf8b56870 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml @@ -474,96 +474,22 @@ - devstack-logs - console-log - -- job-template: - name: '{pipeline}-tempest-dsvm-ironic{branch-designator}' - node: '{node}' - - wrappers: - - build-timeout: - timeout: 125 - - timestamps - +- builder: + # NOTE(adam_g): This is a temporary macro until we can define the Ironic d-s-g job in a + # standard, minimal fashion. + name: devstack-virtual-ironic builders: - - link-logs - - net-info - - devstack-checkout - - shell: | - #!/bin/bash -xe - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_IRONIC=1 - export DEVSTACK_GATE_SMOKE_SERIAL=1 - export BRANCH_OVERRIDE={branch-override} - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - - publishers: - - devstack-logs - - console-log - - -- job-template: - name: '{pipeline}-tempest-dsvm-ironic-postgres{branch-designator}' - node: '{node}' - - wrappers: - - build-timeout: - timeout: 125 - - timestamps - - builders: - - link-logs - - net-info - - devstack-checkout - - shell: | - #!/bin/bash -xe - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=120 - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_POSTGRES=1 - export DEVSTACK_GATE_IRONIC=1 - export DEVSTACK_GATE_SMOKE_SERIAL=1 - export BRANCH_OVERRIDE={branch-override} - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - - publishers: - - devstack-logs - - console-log - - -- job-template: - name: '{pipeline}-tempest-dsvm-virtual-ironic{branch-designator}' - node: '{node}' - - wrappers: - - build-timeout: - timeout: 125 - - timestamps - - builders: - - link-logs - - net-info - - devstack-checkout - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TEMPEST_DISABLE_TENANT_ISOLATION=1 export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_POSTGRES={postgres} export DEVSTACK_GATE_IRONIC=1 export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_VIRT_DRIVER=ironic + export DEVSTACK_GATE_IRONIC_DRIVER={deploy_driver} export TEMPEST_CONCURRENCY=1 export BRANCH_OVERRIDE={branch-override} if [ "$BRANCH_OVERRIDE" != "default" ] ; then @@ -603,10 +529,48 @@ cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh +- job-template: + name: '{pipeline}-tempest-dsvm-ironic-pxe_ssh{branch-designator}' + node: '{node}' + + wrappers: + - build-timeout: + timeout: 125 + - timestamps + + builders: + - link-logs + - net-info + - devstack-checkout + - devstack-virtual-ironic: + postgres: 0 + deploy_driver: pxe_ssh + branch-override: '{branch-override}' publishers: - devstack-logs - console-log +- job-template: + name: '{pipeline}-tempest-dsvm-ironic-pxe_ssh-postgres{branch-designator}' + node: '{node}' + + wrappers: + - build-timeout: + timeout: 125 + - timestamps + + builders: + - link-logs + - net-info + - devstack-checkout + - devstack-virtual-ironic: + postgres: 1 + deploy_driver: pxe_ssh + branch-override: '{branch-override}' + + publishers: + - devstack-logs + - console-log - job-template: name: '{pipeline}-tempest-dsvm-zaqar{branch-designator}' @@ -1514,9 +1478,8 @@ - '{pipeline}-grenade-dsvm-partial-ncpu{branch-designator}' - '{pipeline}-grenade-dsvm-ironic-sideways{branch-designator}' - '{pipeline}-grenade-dsvm-neutron-sideways{branch-designator}' - - '{pipeline}-tempest-dsvm-ironic{branch-designator}' - - '{pipeline}-tempest-dsvm-ironic-postgres{branch-designator}' - - '{pipeline}-tempest-dsvm-virtual-ironic{branch-designator}' + - '{pipeline}-tempest-dsvm-ironic-pxe_ssh{branch-designator}' + - '{pipeline}-tempest-dsvm-ironic-pxe_ssh-postgres{branch-designator}' - '{pipeline}-tempest-dsvm-zaqar{branch-designator}' - '{pipeline}-tempest-dsvm-all{branch-designator}' - '{pipeline}-tempest-dsvm-coverage{branch-designator}' diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml index c7a916c6c0..d81b7f075e 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -2262,17 +2262,12 @@ - python-jobs - openstack-publish-jobs - translation-jobs - - '{pipeline}-tempest-dsvm-ironic{branch-designator}': + - '{pipeline}-tempest-dsvm-ironic-pxe_ssh{branch-designator}': pipeline: check node: 'devstack-precise || devstack-trusty' branch-designator: '-nv' branch-override: default - - '{pipeline}-tempest-dsvm-ironic-postgres{branch-designator}': - pipeline: check - node: 'devstack-precise || devstack-trusty' - branch-designator: '-nv' - branch-override: default - - '{pipeline}-tempest-dsvm-virtual-ironic{branch-designator}': + - '{pipeline}-tempest-dsvm-ironic-pxe_ssh-postgres{branch-designator}': pipeline: check node: 'devstack-precise || devstack-trusty' branch-designator: '-nv' diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index d6df35ff91..de18b68acf 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -501,12 +501,10 @@ jobs: - name: check-heat-dsvm-functional branch: ^(?!stable/(havana|icehouse)).*$ voting: false - - name: check-tempest-dsvm-ironic-nv + - name: check-tempest-dsvm-ironic-pxe_ssh-nv voting: false - - name: check-tempest-dsvm-ironic-postgres-nv - voting: false - - name: check-tempest-dsvm-virtual-ironic-nv branch: ^(?!stable/havana).*$ + - name: check-tempest-dsvm-ironic-pxe_ssh-postgres-nv voting: false - name: ^(gate|check)-tempest-dsvm-cells$ voting: false @@ -1083,15 +1081,13 @@ projects: - name: check-requirements - name: translation-jobs check: - - check-tempest-dsvm-ironic - - check-tempest-dsvm-ironic-postgres - - check-tempest-dsvm-virtual-ironic + - check-tempest-dsvm-ironic-pxe_ssh + - check-tempest-dsvm-ironic-pxe_ssh-postgres check-tripleo: - check-tripleo-ironic-undercloud-precise-nonha gate: - - gate-tempest-dsvm-ironic - - gate-tempest-dsvm-ironic-postgres - - gate-tempest-dsvm-virtual-ironic + - gate-tempest-dsvm-ironic-pxe_ssh + - gate-tempest-dsvm-ironic-pxe_ssh-postgres experimental: - check-grenade-dsvm-ironic-sideways pre-release: @@ -1259,7 +1255,7 @@ projects: - check-devstack-dsvm-cells - gate-nova-pylint - check-grenade-dsvm-partial-ncpu - - check-tempest-dsvm-virtual-ironic-nv + - check-tempest-dsvm-ironic-pxe_ssh-nv gate: - gate-devstack-dsvm-cells - gate-grenade-dsvm-partial-ncpu @@ -1595,14 +1591,12 @@ projects: - name: publish-to-pypi check: - gate-python-ironicclient-pypy - - check-tempest-dsvm-ironic - - check-tempest-dsvm-virtual-ironic + - check-tempest-dsvm-ironic-pxe_ssh check-tripleo: - check-tripleo-ironic-undercloud-precise-nonha gate: - gate-python-ironicclient-pypy - - gate-tempest-dsvm-ironic - - gate-tempest-dsvm-virtual-ironic + - gate-tempest-dsvm-ironic-pxe_ssh - name: openstack/python-keystoneclient template: @@ -1791,7 +1785,7 @@ projects: - gate-diskimage-builder-pep8 - gate-diskimage-builder-python26 - gate-diskimage-builder-python27 - - check-tempest-dsvm-virtual-ironic + - check-tempest-dsvm-ironic-pxe_ssh check-tripleo: - check-tripleo-novabm-undercloud-precise-nonha - check-tripleo-ironic-undercloud-precise-nonha @@ -1800,7 +1794,7 @@ projects: - gate-diskimage-builder-pep8 - gate-diskimage-builder-python26 - gate-diskimage-builder-python27 - - gate-tempest-dsvm-virtual-ironic + - gate-tempest-dsvm-ironic-pxe_ssh experimental-tripleo: - check-tripleo-novabm-overcloud-precise-nonha post: @@ -2439,8 +2433,8 @@ projects: - gate-tempest-docs - gate-tempest-python27 - check-grenade-dsvm-partial-ncpu - - check-tempest-dsvm-ironic-nv - - check-tempest-dsvm-ironic-postgres-nv + - check-tempest-dsvm-ironic-pxe_ssh-nv + - check-tempest-dsvm-ironic-pxe_ssh-postgres-nv # icehouse compat jobs for tempest master - check-tempest-dsvm-full-icehouse - check-tempest-dsvm-neutron-icehouse @@ -2449,7 +2443,6 @@ projects: - check-grenade-dsvm-neutron-icehouse - check-tempest-dsvm-postgres-full-icehouse - check-tempest-dsvm-neutron-full-icehouse - - check-tempest-dsvm-virtual-ironic-nv - gate-tempest-dsvm-large-ops-icehouse - gate-tempest-dsvm-neutron-large-ops-icehouse - check-grenade-dsvm-partial-ncpu-icehouse @@ -2512,8 +2505,8 @@ projects: - gate-tempest-lib-python34 - gate-tempest-lib-pypy - check-grenade-dsvm-partial-ncpu - - check-tempest-dsvm-ironic-nv - - check-tempest-dsvm-ironic-postgres-nv + - check-tempest-dsvm-ironic-pxe_ssh-nv + - check-tempest-dsvm-ironic-pxe_ssh-postgres-nv # icehouse compat jobs for tempest master - check-tempest-dsvm-full-icehouse - check-tempest-dsvm-neutron-icehouse @@ -2522,7 +2515,6 @@ projects: - check-grenade-dsvm-neutron-icehouse - check-tempest-dsvm-postgres-full-icehouse - check-tempest-dsvm-neutron-full-icehouse - - check-tempest-dsvm-virtual-ironic-nv - gate-tempest-dsvm-large-ops-icehouse - gate-tempest-dsvm-neutron-large-ops-icehouse - check-grenade-dsvm-partial-ncpu-icehouse @@ -2777,9 +2769,8 @@ projects: - check-grenade-dsvm-partial-ncpu - check-neutron-dsvm-functional - check-swift-dsvm-functional - - check-tempest-dsvm-ironic-nv - - check-tempest-dsvm-ironic-postgres-nv - - check-tempest-dsvm-virtual-ironic-nv + - check-tempest-dsvm-ironic-pxe_ssh-nv + - check-tempest-dsvm-ironic-pxe_ssh-postgres-nv - check-tempest-dsvm-f20 gate: - gate-devstack-bashate @@ -2976,9 +2967,8 @@ projects: - check-tempest-dsvm-neutron-havana - check-tempest-dsvm-postgres-full-havana - check-devstack-dsvm-cells-havana - - check-tempest-dsvm-ironic-nv - - check-tempest-dsvm-ironic-postgres-nv - - check-tempest-dsvm-virtual-ironic-nv + - check-tempest-dsvm-ironic-pxe_ssh-nv + - check-tempest-dsvm-ironic-pxe_ssh-postgres-nv - check-tempest-dsvm-f20 gate: - gate-devstack-gate-unittests