From ea807d2045c700af146015b6cb6a189020094d94 Mon Sep 17 00:00:00 2001
From: Armando Migliaccio <armamig@gmail.com>
Date: Fri, 15 Apr 2016 16:22:08 -0700
Subject: [PATCH] Switch gate-neutron-dsvm-scenario job to be invoked via
tempest plugin framework
Similarly to what was done in [1], this is about scenario tests.
The job did not take off in Mitaka, so add the release to the list of skipped branches.
Drop the s suffix for consistency.
[1] If5f7ea82c45494953452f728fabb7403d0b6e14e
Change-Id: I77827d2e6e07fbfb39727d823628094d730fcdd8
---
jenkins/jobs/devstack-gate.yaml | 2 +-
jenkins/jobs/neutron.yaml | 13 +++++++------
zuul/layout.yaml | 7 ++++---
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml
index fd2e34b7fb..255bf1d67f 100644
--- a/jenkins/jobs/devstack-gate.yaml
+++ b/jenkins/jobs/devstack-gate.yaml
@@ -3069,7 +3069,7 @@
- '{pipeline}-tempest-dsvm-neutron-identity-v3-only-full{job-suffix}'
- '{pipeline}-tempest-dsvm-neutron-ovs-native{job-suffix}'
- '{pipeline}-tempest-dsvm-neutron-pg-full{job-suffix}'
- - '{pipeline}-tempest-dsvm-neutron-scenarios{job-suffix}'
+ - '{pipeline}-tempest-dsvm-neutron-scenario{job-suffix}'
- '{pipeline}-tempest-dsvm-neutron{job-suffix}'
- '{pipeline}-tempest-dsvm-nova-v20-api-legacy{job-suffix}'
- '{pipeline}-tempest-dsvm-nova-v20-api{job-suffix}'
diff --git a/jenkins/jobs/neutron.yaml b/jenkins/jobs/neutron.yaml
index a90bb9ab1d..87ea6b18e3 100644
--- a/jenkins/jobs/neutron.yaml
+++ b/jenkins/jobs/neutron.yaml
@@ -490,7 +490,7 @@
- job-template:
- name: '{pipeline}-tempest-dsvm-neutron-scenarios{job-suffix}'
+ name: '{pipeline}-tempest-dsvm-neutron-scenario{job-suffix}'
node: '{node}'
wrappers:
@@ -508,27 +508,28 @@
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
- export DEVSTACK_GATE_TEMPEST_NOTESTS=1
- export DEVSTACK_GATE_EXERCISES=0
export DEVSTACK_GATE_NEUTRON=1
- export DEVSTACK_GATE_INSTALL_TESTONLY=1
+ export DEVSTACK_GATE_EXERCISES=0
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
+ export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
+ export DEVSTACK_GATE_TEMPEST_REGEX="^neutron.tests.tempest.scenario\."
function gate_hook {{
- bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh dsvm-scenarios
+ bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh dsvm-scenario
}}
export -f gate_hook
function post_test_hook {{
- bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh dsvm-scenarios
+ bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh dsvm-scenario
}}
export -f post_test_hook
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
+
publishers:
- test-results
- devstack-logs
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 2857286e5e..c8a3817374 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2627,8 +2627,9 @@ jobs:
- name: gate-tempest-dsvm-neutron-full-ssh
voting: false
- - name: gate-tempest-dsvm-neutron-scenarios
- branch: ^(?!stable/(?:kilo|liberty)).*$
+ - name: gate-tempest-dsvm-neutron-scenario
+ branch: ^(?!stable/(?:kilo|liberty|mitaka)).*$
+ voting: false
- name: ^gate-.*-releasenotes$
success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/releasenotes/build/html/
@@ -7696,7 +7697,7 @@ projects:
- neutron-coverage
experimental:
- gate-neutron-dsvm-functional-py34
- - gate-tempest-dsvm-neutron-scenarios
+ - gate-tempest-dsvm-neutron-scenario
- gate-grenade-dsvm-neutron-forward
- gate-grenade-dsvm-neutron-dvr-multinode
- gate-neutron-vpnaas-dsvm-functional