From 7f5dd855c6099a73eb5752ab246303c5aac29ce9 Mon Sep 17 00:00:00 2001
From: Masayuki Igawa <masayuki@igawa.io>
Date: Thu, 16 May 2019 18:48:59 +0900
Subject: [PATCH] Add cyborg-tempest-plugin to required-projects and remove
 octavia

This commit adds opendev.org/openstack/cyborg-tempest-plugin to
required-projects to pass the plugin-sanity-check job. It's a new
tempest plugin. It doesn't work properly on master yet. So, I put it on
the BLACKLIST.

And this commit also removes octavia because octavia tempest tests were
already migrated to octavia-tempest-plugin, and there is no tempest test
in the octavia repo. The removal patch[0] in octavia was already merged.

[0] https://review.opendev.org/#/c/659516/

Change-Id: Ied13dbf774472e1c36dca4ccca157104a81fbf9d
---
 .zuul.yaml                     | 2 +-
 tools/tempest-plugin-sanity.sh | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index e3210fe39d..cdeefe12f3 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -363,6 +363,7 @@
       - opendev.org/openstack/cinder-tempest-plugin
       - opendev.org/openstack/cloudkitty-tempest-plugin
       - opendev.org/openstack/congress-tempest-plugin
+      - opendev.org/openstack/cyborg-tempest-plugin
       - opendev.org/openstack/designate-tempest-plugin
       - opendev.org/openstack/ec2api-tempest-plugin
       - opendev.org/openstack/freezer
@@ -405,7 +406,6 @@
       - opendev.org/openstack/neutron-vpnaas
       - opendev.org/x/nova-lxd
       - opendev.org/x/novajoin-tempest-plugin
-      - opendev.org/openstack/octavia
       - opendev.org/openstack/octavia-tempest-plugin
       - opendev.org/openstack/oswin-tempest-plugin
       - opendev.org/openstack/panko
diff --git a/tools/tempest-plugin-sanity.sh b/tools/tempest-plugin-sanity.sh
index 500ff026b7..6bb87c51f1 100644
--- a/tools/tempest-plugin-sanity.sh
+++ b/tools/tempest-plugin-sanity.sh
@@ -47,6 +47,7 @@ PROJECT_LIST="$(python tools/generate-tempest-plugins-list.py)"
 # (6 months or more)
 # TODO(masayukig): Some of these can be removed from BLACKLIST in the future.
 # barbican-tempest-plugin: https://review.openstack.org/#/c/634631/
+# cyborg-tempest-plugin: https://review.opendev.org/659687
 # intel-nfv-ci-tests: https://review.openstack.org/#/c/634640/
 # networking-ansible: https://review.openstack.org/#/c/634647/
 # networking-generic-switch: https://review.openstack.org/#/c/634846/
@@ -61,6 +62,7 @@ PROJECT_LIST="$(python tools/generate-tempest-plugins-list.py)"
 # vitrage-tempest-plugin: https://review.openstack.org/#/c/639003/
 BLACKLIST="
 barbican-tempest-plugin
+cyborg-tempest-plugin
 intel-nfv-ci-tests
 networking-ansible
 networking-generic-switch