From 15710b7c90e14b3295a5a288d416742d7780de91 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 26 Dec 2013 10:51:53 -0800 Subject: [PATCH] Remove devstack-gate-periodic-jobs.yaml Move the remaining periodic-only jobs to devstack-gate.yaml and put them in the standard devstack-jobs group. Invoke the devstack-jobs group with 'periodic' as the pipeline argument to create the periodic jobs. Change-Id: I735ac73274deff92d3ed2706939cf60b5506221b --- .../config/devstack-gate-periodic-jobs.yaml | 102 ------------------ .../config/devstack-gate.yaml | 93 ++++++++++++++++ .../jenkins_job_builder/config/projects.yaml | 12 +-- 3 files changed, 99 insertions(+), 108 deletions(-) delete mode 100644 modules/openstack_project/files/jenkins_job_builder/config/devstack-gate-periodic-jobs.yaml diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate-periodic-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate-periodic-jobs.yaml deleted file mode 100644 index 5c0b212a65..0000000000 --- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate-periodic-jobs.yaml +++ /dev/null @@ -1,102 +0,0 @@ -- job-template: - name: 'periodic-tempest-dsvm-all{branch-designator}' - node: '{node}' - - wrappers: - - timeout: - timeout: 185 - fail: true - - timestamps - - builders: - - devstack-checkout - - shell: | - #!/bin/bash -xe - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=180 - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_ALL=1 - export ZUUL_BRANCH={branch-override} - 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-periodic - - console-log-periodic - - -- job-template: - name: 'periodic-tempest-dsvm-coverage{branch-designator}' - node: '{node}' - - wrappers: - - timeout: - timeout: 185 - fail: true - - timestamps - - builders: - - devstack-checkout - - shell: | - #!/bin/bash -xe - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=180 - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_COVERAGE=1 - export ZUUL_BRANCH={branch-override} - 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-periodic - - console-log-periodic - - -- job-template: - name: 'periodic-tempest-dsvm-stress{branch-designator}' - node: '{node}' - - wrappers: - - timeout: - timeout: 185 - fail: true - - timestamps - - builders: - - devstack-checkout - - shell: | - #!/bin/bash -xe - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TIMEOUT=180 - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_STRESS=1 - export ZUUL_BRANCH={branch-override} - 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-periodic - - console-log-periodic - - -- job-group: - name: devstack-periodic-jobs - jobs: - - '{pipeline}-tempest-dsvm-full{branch-designator}' - - '{pipeline}-tempest-dsvm-postgres-full{branch-designator}' - - '{pipeline}-tempest-dsvm-neutron{branch-designator}' - - 'periodic-tempest-dsvm-all{branch-designator}' - - 'periodic-tempest-dsvm-coverage{branch-designator}' - - 'periodic-tempest-dsvm-stress{branch-designator}' - - '{pipeline}-tempest-dsvm-neutron-pg{branch-designator}' - - '{pipeline}-tempest-dsvm-large-ops{branch-designator}' - - '{pipeline}-tempest-dsvm-neutron-large-ops{branch-designator}' - - '{pipeline}-tempest-dsvm-savanna-full{branch-designator}' - - '{pipeline}-tempest-dsvm-savanna-postgres-full{branch-designator}' - - '{pipeline}-tempest-dsvm-savanna-neutron{branch-designator}' - - '{pipeline}-devstack-dsvm-neutron{branch-designator}' - - '{pipeline}-tempest-dsvm-ironic{branch-designator}' - - '{pipeline}-tempest-dsvm-ironic-postgres{branch-designator}' 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 59edd42c7a..1e655d8f52 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 @@ -876,6 +876,96 @@ - console-log +- job-template: + name: '{pipeline}-tempest-dsvm-all{branch-designator}' + node: '{node}' + + wrappers: + - timeout: + timeout: 185 + fail: true + - timestamps + + builders: + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=180 + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST_ALL=1 + 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 + - link-logs + + publishers: + - devstack-logs + - console-log + + +- job-template: + name: '{pipeline}-tempest-dsvm-coverage{branch-designator}' + node: '{node}' + + wrappers: + - timeout: + timeout: 185 + fail: true + - timestamps + + builders: + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=180 + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST_COVERAGE=1 + 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 + - link-logs + + publishers: + - devstack-logs + - console-log + + +- job-template: + name: '{pipeline}-tempest-dsvm-stress{branch-designator}' + node: '{node}' + + wrappers: + - timeout: + timeout: 185 + fail: true + - timestamps + + builders: + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=180 + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST_STRESS=1 + 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 + - link-logs + + publishers: + - devstack-logs + - console-log + + - job-group: name: devstack-gate-jobs jobs: @@ -912,3 +1002,6 @@ - '{pipeline}-devstack-dsvm-neutron{branch-designator}' - '{pipeline}-tempest-dsvm-ironic{branch-designator}' - '{pipeline}-tempest-dsvm-ironic-postgres{branch-designator}' + - '{pipeline}-tempest-dsvm-all{branch-designator}' + - '{pipeline}-tempest-dsvm-coverage{branch-designator}' + - '{pipeline}-tempest-dsvm-stress{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 efb6fdf527..d3e4adf9f0 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -1084,21 +1084,21 @@ branch-designator: '-havana' branch-override: stable/havana # Periodic jobs for various branches - - devstack-periodic-jobs: + - devstack-jobs: pipeline: periodic + node: devstack-precise branch-designator: '-grizzly' branch-override: stable/grizzly - node: devstack-precise - - devstack-periodic-jobs: + - devstack-jobs: pipeline: periodic + node: devstack-precise branch-designator: '-havana' branch-override: stable/havana - node: devstack-precise - - devstack-periodic-jobs: + - devstack-jobs: pipeline: periodic + node: devstack-precise branch-designator: '-master' branch-override: master - node: devstack-precise # Special jobs for devstack-gate - devstack-gate-jobs: node: devstack-precise