Merge "Use zaqar-tempest-plugin for zaqar jobs"

This commit is contained in:
Jenkins 2017-09-22 08:18:58 +00:00 committed by Gerrit Code Review
commit 309ef19592
1 changed files with 14 additions and 0 deletions

View File

@ -15,6 +15,8 @@
conf: |
[[local|localrc]]
enable_plugin zaqar git://git.openstack.org/openstack/zaqar
# Enable Zaqar Tempest Plugin
TEMPEST_PLUGINS='/opt/stack/new/kuryr-tempest-plugin'
- shell: |
#!/bin/bash -xe
export PROJECTS="openstack/python-zaqarclient $PROJECTS"
@ -26,12 +28,14 @@
export DEVSTACK_GATE_EXERCISES=0
export DEVSTACK_GATE_INSTALL_TESTONLY=1
export ENABLED_SERVICES=mysql,key,tempest
export DEVSTACK_GATE_TEMPEST_REGEX="zaqar_tempest_plugin.tests"
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
export PROJECTS="openstack/zaqar-tempest-plugin $PROJECTS"
export ZAQARCLIENT_AUTH_FUNCTIONAL=1
export ZAQARCLIENT_TEST_FUNCTIONAL=1
function post_test_hook {{
@ -113,17 +117,22 @@
conf: |
[[local|localrc]]
enable_plugin zaqar git://git.openstack.org/openstack/zaqar
# Enable Zaqar Tempest plugin
TEMPEST_PLUGINS='/opt/stack/new/zaqar-tempest-plugin'
- shell: |
#!/bin/bash -xe
export PROJECTS="openstack/python-zaqarclient $PROJECTS"
export PYTHONUNBUFFERED=true
export ENABLED_SERVICES=tempest
export DEVSTACK_GATE_TEMPEST_REGEX="zaqar_tempest_plugin.tests"
export DEVSTACK_GATE_TEMPEST=0
function gate_hook {{
cd /opt/stack/new/zaqar/devstack/gate
./gate_hook.sh tempest {backend}
}}
export PROJECTS="openstack/zaqar-tempest-plugin $PROJECTS"
export -f gate_hook
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
@ -151,6 +160,8 @@
conf: |
[[local|localrc]]
enable_plugin zaqar git://git.openstack.org/openstack/zaqar
# Enable Zaqar Tempest plugin
TEMPEST_PLUGINS='/opt/stack/new/zaqar-tempest-plugin'
- shell: |
#!/bin/bash -xe
export PROJECTS="openstack-dev/grenade $PROJECTS"
@ -158,6 +169,7 @@
export PYTHONUNBUFFERED=true
export ENABLED_SERVICES=tempest
export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_TEMPEST_REGEX="zaqar_tempest_plugin.tests"
export DEVSTACK_GATE_GRENADE=pullup
export GRENADE_PLUGINRC="enable_grenade_plugin zaqar https://git.openstack.org/openstack/zaqar"
@ -166,6 +178,8 @@
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
export PROJECTS="openstack/zaqar-tempest-plugin $PROJECTS"
function pre_test_hook {{
cd /opt/stack/new/zaqar/zaqar_upgradetests
./pre_test_hook.sh