From 4a0dc9e70eaa2682fe39b3e8ae03e96648aa426d Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Fri, 19 Apr 2019 23:38:26 -0500
Subject: [PATCH] Followup opendev cleanup and test jobs

Depends-On: https://review.opendev.org/#/c/653964/
Change-Id: Icdd50ca6f1d4b982ca260ea43aafe95ea1e7d117
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
---
 .zuul.yaml                        |  6 +++---
 README.rst                        |  6 +++---
 devstack/lib/{stx-integ => integ} |  0
 devstack/plugin.sh                |  2 +-
 devstack/settings                 | 10 +++++-----
 tox.ini                           |  8 ++++----
 6 files changed, 16 insertions(+), 16 deletions(-)
 rename devstack/lib/{stx-integ => integ} (100%)

diff --git a/.zuul.yaml b/.zuul.yaml
index 414a63b2d..b476390d4 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -30,7 +30,7 @@
       Base job for StarlingX Flock components DevStack tests
     nodeset: openstack-single-node-bionic
     roles:
-      - zuul: openstack-infra/devstack
+      - zuul: openstack/devstack
     timeout: 9000
     required-projects:
       - name: openstack/devstack
@@ -107,8 +107,8 @@
         # StarlingX services
         platform-util: true
       devstack_plugins:
-        stx-integ: https://git.starlingx.io/stx-integ
-        stx-update: https://git.starlingx.io/stx-update
+        integ: https://opendev.org/starlingx/integ
+        update: https://opendev.org/starlingx/update
 
 - job:
     name: stx-integ-pylint
diff --git a/README.rst b/README.rst
index 1cabcf9e0..91d0a28d4 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-=========
-stx-integ
-=========
+=====
+integ
+=====
 
 StarlingX Integration
diff --git a/devstack/lib/stx-integ b/devstack/lib/integ
similarity index 100%
rename from devstack/lib/stx-integ
rename to devstack/lib/integ
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 538985f10..5beb1cb91 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -6,7 +6,7 @@
 echo_summary "stx-integ devstack plugin.sh called: $1/$2"
 
 # check for service enabled
-if is_service_enabled stx-integ; then
+if is_service_enabled integ; then
     if [[ "$1" == "stack" && "$2" == "install" ]]; then
         # Perform installation of source
         echo_summary "Install stx-integ"
diff --git a/devstack/settings b/devstack/settings
index 1eb7532c5..6c7d75dd9 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Devstack settings
 
-# This plugin enables StarlingX stx-integ services and follows the
+# This plugin enables StarlingX integ services and follows the
 # DevStack plugin contract:
 # https://docs.openstack.org/devstack/latest/plugins.html#plugin-sh-contract
 
@@ -11,15 +11,15 @@
 # Defaults
 # --------
 
-STX_INTEG_NAME=stx-integ
+STX_INTEG_NAME=integ
 
 ######### Plugin Specific ##########
 enable_service $STX_INTEG_NAME
 
 # This must not use any variables to work properly in OpenStack's DevStack playbook
-define_plugin stx-integ
+define_plugin integ
 # This works for Zuul jobs using OpenStack's DevStack roles
-plugin_requires stx-integ stx-update
+plugin_requires integ update
 
 # Initial source of lib script
-source $DEST/stx-integ/devstack/lib/stx-integ
+source $DEST/integ/devstack/lib/integ
diff --git a/tox.ini b/tox.ini
index dc73270ae..0b8273af4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -86,10 +86,10 @@ commands =
 [testenv:pylint]
 basepython = python2.7
 deps = -r{toxinidir}/test-requirements.txt
-       -e{[tox]stxdir}/stx-update/tsconfig/tsconfig
-       -e{[tox]stxdir}/stx-fault/fm-api
-       -e{[tox]stxdir}/stx-config/sysinv/sysinv/sysinv
-       -e{[tox]stxdir}/stx-config/sysinv/cgts-client/cgts-client
+       -e{[tox]stxdir}/update/tsconfig/tsconfig
+       -e{[tox]stxdir}/fault/fm-api
+       -e{[tox]stxdir}/config/sysinv/sysinv/sysinv
+       -e{[tox]stxdir}/config/sysinv/cgts-client/cgts-client
        docutils
        keyring
        libvirt-python