From 464332862166f09e8c702f95d247bc4a73188d1f Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Fri, 4 Oct 2013 18:46:15 +0000 Subject: [PATCH] Check devstack-gate changes on stable branch jobs Since openstack-infra/devstack-gate only has a master branch, changes to it did not previously get tested against stable branches of devstack and tempest and the integrated projects. Reduce this asymmetry by adding non-voting versions of those jobs with appropriate overrides forcing use of the target stable branches. * .../jenkins_job_builder/config/devstack-gate.yaml: Add templates for the stable branch override check jobs which are also running on master, and direct jobs for those which were removed after grizzly. * .../jenkins_job_builder/config/projects.yaml: Apply release names to expand the new job templates. Jobs for grizzly which will also appear in havana have their templates pre-filled for the upcoming release, but note that there are also several post-grizzly jobs which will need templates too when the time comes. * .../zuul/layout.yaml: Add the new folsom and grizzly jobs to the devstack-gate project's check pipeline. Change-Id: I487438cdde84b57d338893800e91bfccd6e49d0a --- .../config/devstack-gate.yaml | 216 ++++++++++++++++++ .../jenkins_job_builder/config/projects.yaml | 24 ++ .../openstack_project/files/zuul/layout.yaml | 28 ++- 3 files changed, 264 insertions(+), 4 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 281b6749dd..e2a03bb739 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 @@ -23,6 +23,32 @@ - console-log +- job: + name: check-tempest-devstack-vm-smoke-stable-folsom + node: devstack-precise-check + + wrappers: + - timeout: + timeout: 120 + fail: true + - timestamps + + builders: + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TEMPEST=1 + export ZUUL_BRANCH=stable/folsom + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + - link-logs + + publishers: + - devstack-logs + - console-log + + - job-template: name: '{pipeline}-tempest-devstack-vm-full' node: '{node}' @@ -49,6 +75,33 @@ - console-log +- job-template: + name: 'check-tempest-devstack-vm-full-stable-{release}' + node: devstack-precise-check + + wrappers: + - timeout: + timeout: 60 + fail: true + - timestamps + + builders: + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST_FULL=1 + export ZUUL_BRANCH=stable/{release} + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + - link-logs + + publishers: + - devstack-logs + - console-log + + - job: name: gate-tempest-devstack-vm-iad-trial node: devstack-precise-iad @@ -185,6 +238,33 @@ - console-log +- job: + name: check-tempest-devstack-vm-cinder-stable-folsom + node: devstack-precise-check + + wrappers: + - timeout: + timeout: 90 + fail: true + - timestamps + + builders: + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_CINDER=1 + export ZUUL_BRANCH=stable/folsom + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + - link-logs + + publishers: + - devstack-logs + - console-log + + - job-template: name: '{pipeline}-tempest-devstack-vm-neutron' node: '{node}' @@ -211,6 +291,33 @@ - console-log +- job-template: + name: 'check-tempest-devstack-vm-neutron-stable-{release}' + node: devstack-precise-check + + wrappers: + - timeout: + timeout: 60 + fail: true + - timestamps + + builders: + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_NEUTRON=1 + export ZUUL_BRANCH=stable/{release} + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + - link-logs + + publishers: + - devstack-logs + - console-log + + - job-template: name: '{pipeline}-tempest-devstack-vm-neutron-pg' node: '{node}' @@ -346,6 +453,33 @@ - console-log +- job-template: + name: 'check-devstack-vm-cells-stable-{release}' + node: devstack-precise-check + + wrappers: + - timeout: + timeout: 60 + fail: true + - timestamps + + builders: + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_CELLS=1 + export DEVSTACK_GATE_EXERCISES=1 + export ZUUL_BRANCH=stable/{release} + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + - link-logs + + publishers: + - devstack-logs + - console-log + + - job-template: name: '{pipeline}-tempest-devstack-vm-cells' node: '{node}' @@ -372,6 +506,33 @@ - console-log +- job-template: + name: 'check-tempest-devstack-vm-cells-stable-{release}' + node: devstack-precise-check + + wrappers: + - timeout: + timeout: 60 + fail: true + - timestamps + + builders: + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_CELLS=1 + export ZUUL_BRANCH=stable/{release} + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + - link-logs + + publishers: + - devstack-logs + - console-log + + - job-template: name: '{pipeline}-tempest-devstack-vm-cells-full' node: '{node}' @@ -398,6 +559,33 @@ - devstack-logs - console-log +- job-template: + name: 'check-tempest-devstack-vm-cells-full-stable-{release}' + node: devstack-precise-check + + wrappers: + - timeout: + timeout: 60 + fail: true + - timestamps + + builders: + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST_FULL=1 + export DEVSTACK_GATE_CELLS=1 + export ZUUL_BRANCH=stable/{release} + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + - link-logs + + publishers: + - devstack-logs + - console-log + - job-template: name: '{pipeline}-tempest-devstack-vm-large-ops' node: '{node}' @@ -744,6 +932,34 @@ - console-log +- job-template: + name: 'check-tempest-devstack-vm-postgres-full-stable-{release}' + node: devstack-precise-check + + wrappers: + - timeout: + timeout: 60 + fail: true + - timestamps + + builders: + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST_FULL=1 + export DEVSTACK_GATE_POSTGRES=1 + export ZUUL_BRANCH=stable/{release} + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + - link-logs + + publishers: + - devstack-logs + - console-log + + - job-template: name: '{pipeline}-grenade-devstack-vm' node: '{node}' 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 c05295fcb8..303633f44f 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -923,6 +923,30 @@ - devstack-jobs: pipeline: check node: 'devstack-precise || devstack-precise-check' + - 'check-devstack-vm-cells-stable-{release}': + release: + - grizzly + - havana + - 'check-tempest-devstack-vm-cells-stable-{release}': + release: + - grizzly + - havana + - 'check-tempest-devstack-vm-cells-full-stable-{release}': + release: + - grizzly + - havana + - 'check-tempest-devstack-vm-full-stable-{release}': + release: + - grizzly + - havana + - 'check-tempest-devstack-vm-neutron-stable-{release}': + release: + - grizzly + - havana + - 'check-tempest-devstack-vm-postgres-full-stable-{release}': + release: + - grizzly + - havana - project: diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 629c8cc8e9..c3ef19f703 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -160,6 +160,22 @@ jobs: branch: ^(?!stable/(folsom|grizzly)).*$ - name: ^(gate|check)-swift-devstack-vm-functional$ branch: ^(?!stable/(folsom|grizzly)).*$ + - name: check-tempest-devstack-vm-cinder-stable-folsom + voting: false + - name: check-tempest-devstack-vm-smoke-stable-folsom + voting: false + - name: check-tempest-devstack-vm-full-stable-grizzly + voting: false + - name: check-tempest-devstack-vm-neutron-stable-grizzly + voting: false + - name: check-tempest-devstack-vm-postgres-full-stable-grizzly + voting: false + - name: check-devstack-vm-cells-stable-grizzly + voting: false + - name: check-tempest-devstack-vm-cells-stable-grizzly + voting: false + - name: check-tempest-devstack-vm-cells-full-stable-grizzly + voting: false - name: gate-nova-pylint voting: false - name: gate-cinder-pylint @@ -1549,18 +1565,22 @@ projects: - name: openstack-infra/devstack-gate check: - - check-tempest-devstack-vm-smoke - check-tempest-devstack-vm-full - - check-tempest-devstack-vm-cinder - check-tempest-devstack-vm-postgres-full - check-tempest-devstack-vm-neutron - gate-tempest-devstack-vm-large-ops - check-grenade-devstack-vm - check-swift-devstack-vm-functional + - check-tempest-devstack-vm-cinder-stable-folsom + - check-tempest-devstack-vm-smoke-stable-folsom + - check-tempest-devstack-vm-full-stable-grizzly + - check-tempest-devstack-vm-neutron-stable-grizzly + - check-tempest-devstack-vm-postgres-full-stable-grizzly + - check-devstack-vm-cells-stable-grizzly + - check-tempest-devstack-vm-cells-stable-grizzly + - check-tempest-devstack-vm-cells-full-stable-grizzly gate: - - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full - - gate-tempest-devstack-vm-cinder - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-neutron - gate-tempest-devstack-vm-large-ops