openstack/project-config
Code Issues Proposed changes

Clean up patrole.yaml jenkins jobs

Browse Source 
Now that a patrole devstack plugin has been written [0], deploying and
testing patrole in the gates can be done exclusively using the
jenkins jobs and the devstack patrole plugin.

[0] https://review.openstack.org/#/c/468511/

Change-Id: I6c7ff9182a6e5792470eb5dfc95225a4d587f31a
This commit is contained in:
Felipe Monteiro 2017-05-26 19:18:43 +01:00
parent beeb812d3c
commit b8839dd29f
1 changed files with 15 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
jenkins/jobs/patrole.yaml
View File

@ -18,38 +18,25 @@
conf: |
[[local|localrc]]
enable_plugin patrole git://git.openstack.org/openstack/patrole
TEMPEST_PLUGINS='/opt/stack/new/patrole'
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
# Ensure that tempest set up is executed, but do not automatically
# execute tempest tests; they are executed in post_test_hook.
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TEMPEST_NOTESTS=1
export DEVSTACK_GATE_TEMPEST_REGEX='(?!.*\[.*\bslow\b.*\])(^patrole_tempest_plugin\.tests\.api)'
export PROJECTS="openstack/patrole $PROJECTS"
# Needed by Patrole devstack plugin
export RBAC_TEST_ROLE={rbac-role}
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
function pre_test_hook {{
source $BASE/new/patrole/contrib/pre_test_hook.sh \
{rbac-role}
}}
export -f pre_test_hook
function post_test_hook {{
source $BASE/new/patrole/contrib/post_test_hook.sh \
{rbac-role}
}}
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
@ -78,6 +65,7 @@
conf: |
[[local|localrc]]
enable_plugin patrole git://git.openstack.org/openstack/patrole
TEMPEST_PLUGINS='/opt/stack/new/patrole'
# Swift is not ready for python3 yet
disable_service s-account
@ -95,30 +83,18 @@
# execute tempest tests; they are executed in post_test_hook.
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TEMPEST_NOTESTS=1
export DEVSTACK_GATE_TEMPEST_REGEX='(?!.*\[.*\bslow\b.*\])(^patrole_tempest_plugin\.tests\.api)'
export PROJECTS="openstack/patrole $PROJECTS"
# Needed by Patrole devstack plugin
export RBAC_TEST_ROLE={rbac-role}
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
function pre_test_hook {{
source $BASE/new/patrole/contrib/pre_test_hook.sh \
{rbac-role}
}}
export -f pre_test_hook
function post_test_hook {{
source $BASE/new/patrole/contrib/post_test_hook.sh \
{rbac-role}
}}
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
@ -147,7 +123,7 @@
conf: |
[[local|localrc]]
enable_plugin patrole git://git.openstack.org/openstack/patrole
enable_plugin heat git://git.openstack.org/openstack/heat
TEMPEST_PLUGINS='/opt/stack/new/patrole'
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
@ -157,30 +133,18 @@
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TOPOLOGY="multinode"
export DEVSTACK_GATE_TEMPEST_NOTESTS=1
export DEVSTACK_GATE_TEMPEST_REGEX='(?=.*\[.*\bslow\b.*\])(^patrole_tempest_plugin\.tests\.api)'
export PROJECTS="openstack/patrole $PROJECTS"
# Needed by Patrole devstack plugin
export RBAC_TEST_ROLE={rbac-role}
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
# Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1
function pre_test_hook {{
source $BASE/new/patrole/contrib/pre_test_hook.sh \
{rbac-role} multinode
}}
export -f pre_test_hook
function post_test_hook {{
source $BASE/new/patrole/contrib/post_test_hook.sh \
{rbac-role} multinode
}}
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
@ -188,4 +152,3 @@
- test-results
- devstack-logs
- console-log