From ecd577ead664b9f40fa2174631b0c0ae81b44056 Mon Sep 17 00:00:00 2001 From: ghanshyam Date: Thu, 1 Feb 2018 08:31:09 +0000 Subject: [PATCH] Switch ec2-api gate job to use ec2api tempest plugin ec2api tempest plugin[1] is ready to use for testing the ec2-api in gate. This patch moves the 'functional-neutron-dsvm-ec2api' job to run test from plugin. next patch will use the plugin for other job too if needed and remove the in-tree tests on successful execution. .. 1 https://github.com/openstack/ec2api-tempest-plugin Change-Id: I31b59008f76981b832cb2f7a651858c5c02d494f --- .zuul.yaml | 1 + playbooks/legacy/ec2-api-functional-neutron/run.yaml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 7e330ab0..1a7f69c2 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -9,6 +9,7 @@ - openstack/ec2-api - openstack/neutron - openstack/neutron-tempest-plugin + - openstack/ec2api-tempest-plugin - job: name: ec2-api-functional-neutron-full diff --git a/playbooks/legacy/ec2-api-functional-neutron/run.yaml b/playbooks/legacy/ec2-api-functional-neutron/run.yaml index b664c7b2..f9efd3a1 100644 --- a/playbooks/legacy/ec2-api-functional-neutron/run.yaml +++ b/playbooks/legacy/ec2-api-functional-neutron/run.yaml @@ -31,6 +31,7 @@ [[local|localrc]] enable_plugin ec2-api git://git.openstack.org/openstack/ec2-api enable_plugin neutron-tempest-plugin git://git.openstack.org/openstack/neutron-tempest-plugin + TEMPEST_PLUGINS='/opt/stack/new/ec2api-tempest-plugin' EOF executable: /bin/bash @@ -57,8 +58,8 @@ export DEVSTACK_GATE_NEUTRON=0 fi - export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 - export DEVSTACK_GATE_TEMPEST_REGEX="ec2api.tests.functional" + export PROJECTS="openstack/ec2api-tempest-plugin $PROJECTS" + export DEVSTACK_GATE_TEMPEST_REGEX="ec2api_tempest_plugin" cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh