From be4e610e9a0d8371289173f1b432e0100f8e437d Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Fri, 14 Mar 2014 16:34:45 -0700 Subject: [PATCH] Configure large-ops test and add a larger one for testing This uses the devstack-gate change to allow setting the size of the large-ops test. It keeps the existing large-ops test at 50, but also adds a new one at 175 in the experimental queue for us to do some testing with. Change-Id: I98baec6e0890f6b10afbd9858ded933f59db9725 --- .../config/devstack-gate.yaml | 35 +++++++++++++++++-- .../openstack_project/files/zuul/layout.yaml | 1 + 2 files changed, 34 insertions(+), 2 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 47cc165735..5c3ee1ba5e 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 @@ -573,7 +573,37 @@ export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_LARGE_OPS=1 + export DEVSTACK_GATE_TEMPEST_LARGE_OPS=50 + 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-large-ops-testing{branch-designator}' + node: '{node}' + + wrappers: + - timeout: + timeout: 65 + fail: true + - timestamps + + builders: + - link-logs + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TIMEOUT=60 + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST_LARGE_OPS=175 export BRANCH_OVERRIDE={branch-override} if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE @@ -603,7 +633,7 @@ export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_LARGE_OPS=1 + export DEVSTACK_GATE_TEMPEST_LARGE_OPS=50 export DEVSTACK_GATE_NEUTRON=1 export BRANCH_OVERRIDE={branch-override} if [ "$BRANCH_OVERRIDE" != "default" ] ; then @@ -1109,6 +1139,7 @@ - '{pipeline}-tempest-dsvm-cells{branch-designator}' - '{pipeline}-tempest-dsvm-cells-full{branch-designator}' - '{pipeline}-tempest-dsvm-large-ops{branch-designator}' + - '{pipeline}-tempest-dsvm-large-ops-testing{branch-designator}' - '{pipeline}-tempest-dsvm-neutron-large-ops{branch-designator}' - '{pipeline}-tempest-dsvm-postgres{branch-designator}' - '{pipeline}-tempest-dsvm-postgres-full{branch-designator}' diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 0f76c02079..32abf867e1 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -975,6 +975,7 @@ projects: experimental: - gate-grenade-dsvm-forward - check-tempest-dsvm-neutron-pg + - gate-tempest-dsvm-large-ops-testing experimental-tripleo: - check-tripleo-seed-precise - check-tripleo-undercloud-precise