From 5dd672c58c322e142b0e187da82267ffde606450 Mon Sep 17 00:00:00 2001 From: Carlos Goncalves Date: Mon, 4 May 2020 18:53:00 +0200 Subject: [PATCH] Do not run Tempest in octavia-grenade job Change-Id: I2ede4bacd0aa4f97b2e50a8cefda45317289d86c --- playbooks/legacy/grenade-devstack-octavia/run.yaml | 11 +---------- zuul.d/jobs.yaml | 1 - 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/playbooks/legacy/grenade-devstack-octavia/run.yaml b/playbooks/legacy/grenade-devstack-octavia/run.yaml index 9d88b472fb..81848555ee 100644 --- a/playbooks/legacy/grenade-devstack-octavia/run.yaml +++ b/playbooks/legacy/grenade-devstack-octavia/run.yaml @@ -32,28 +32,19 @@ export PROJECTS="openstack/grenade $PROJECTS" export PROJECTS="openstack/octavia $PROJECTS" export PROJECTS="openstack/octavia-lib $PROJECTS" - export PROJECTS="openstack/octavia-tempest-plugin $PROJECTS" export PROJECTS="openstack/python-octaviaclient $PROJECTS" export DEVSTACK_PROJECT_FROM_GIT="python-octaviaclient $DEVSTACK_PROJECT_FROM_GIT" export GRENADE_PLUGINRC="enable_grenade_plugin octavia https://opendev.org/openstack/octavia" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"export TEMPEST_PLUGINS='/opt/stack/new/octavia-tempest-plugin'" export DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|/etc/octavia/octavia.conf]]"$'\n'"[DEFAULT]"$'\n'"debug = True" - export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST=0 export DEVSTACK_GATE_GRENADE=pullup export BRANCH_OVERRIDE=default if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE fi - # Add configuration values for enabling security features in local.conf - function pre_test_hook { - if [ -f /opt/stack/old/octavia-tempest-plugin/tools/pre_test_hook.sh ] ; then - . /opt/stack/old/octavia-tempest-plugin/tools/pre_test_hook.sh - fi - } - export -f pre_test_hook cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index b01d1d2479..1f7a94ad10 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -90,5 +90,4 @@ - openstack/devstack-gate - openstack/octavia - openstack/octavia-lib - - openstack/octavia-tempest-plugin - openstack/python-octaviaclient