Browse Source

Fix Rocky v2 scenario and grenade jobs

Pin octavia-tempest-plugin to latest Python 2 compatible
octavia-tempest-plugin tag to fix v2 scenario jobs.

Also do not run Tempest in octavia-grenade job.

Change-Id: I2ede4bacd0aa4f97b2e50a8cefda45317289d86c
changes/01/725901/2
Carlos Goncalves 2 months ago
parent
commit
06792f3d28
3 changed files with 33 additions and 19 deletions
  1. +1
    -10
      playbooks/legacy/grenade-devstack-octavia/run.yaml
  2. +0
    -1
      zuul.d/jobs.yaml
  3. +32
    -8
      zuul.d/projects.yaml

+ 1
- 10
playbooks/legacy/grenade-devstack-octavia/run.yaml View File

@@ -31,28 +31,19 @@

export PROJECTS="openstack/grenade $PROJECTS"
export PROJECTS="openstack/octavia $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


+ 0
- 1
zuul.d/jobs.yaml View File

@@ -86,5 +86,4 @@
- openstack/grenade
- openstack/devstack-gate
- openstack/octavia
- openstack/octavia-tempest-plugin
- openstack/python-octaviaclient

+ 32
- 8
zuul.d/projects.yaml View File

@@ -47,10 +47,22 @@
voting: false
- octavia-v1-dsvm-scenario-kvm-centos.7:
voting: false
- octavia-v2-dsvm-noop-api
- octavia-v2-dsvm-noop-py35-api
- octavia-v2-dsvm-scenario
- octavia-v2-dsvm-py35-scenario
- octavia-v2-dsvm-noop-api:
required-projects:
- name: openstack/octavia-tempest-plugin
override-checkout: 1.4.0
- octavia-v2-dsvm-noop-py35-api:
required-projects:
- name: openstack/octavia-tempest-plugin
override-checkout: 1.4.0
- octavia-v2-dsvm-scenario:
required-projects:
- name: openstack/octavia-tempest-plugin
override-checkout: 1.4.0
- octavia-v2-dsvm-py35-scenario:
required-projects:
- name: openstack/octavia-tempest-plugin
override-checkout: 1.4.0
- octavia-grenade:
irrelevant-files:
- ^.*\.rst$
@@ -90,10 +102,22 @@
- octavia-v1-dsvm-scenario
- octavia-v1-dsvm-py3x-scenario
- neutron-lbaasv2-dsvm-py3x-api
- octavia-v2-dsvm-noop-api
- octavia-v2-dsvm-noop-py35-api
- octavia-v2-dsvm-scenario
- octavia-v2-dsvm-py35-scenario
- octavia-v2-dsvm-noop-api:
required-projects:
- name: openstack/octavia-tempest-plugin
override-checkout: 1.4.0
- octavia-v2-dsvm-noop-py35-api:
required-projects:
- name: openstack/octavia-tempest-plugin
override-checkout: 1.4.0
- octavia-v2-dsvm-scenario:
required-projects:
- name: openstack/octavia-tempest-plugin
override-checkout: 1.4.0
- octavia-v2-dsvm-py35-scenario:
required-projects:
- name: openstack/octavia-tempest-plugin
override-checkout: 1.4.0
- octavia-grenade:
irrelevant-files:
- ^.*\.rst$


Loading…
Cancel
Save