From a2b4ce30b8710e199f22e9de61b51c5642d5581e Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Tue, 9 Jun 2020 15:01:23 -0500
Subject: [PATCH] Update jobs for interop repos renaming

Interop repos are going under rename from
openstack namespace to osf namespace (Depends-On),
which need update the zuul job to start using the
new location.

Update .gitreview as well.

Disable py27 and py35 jobs, they don't work anymore as is.

Depends-On: https://review.opendev.org/#/c/734669/
Change-Id: Ib6871eaf0735e756f051d14513869fbe7cc6e826
---
 .gitreview                                        |  2 +-
 .zuul.yaml                                        | 15 +++++++++------
 doc/source/conf.py                                |  2 +-
 .../generate-tempestconf-refstack/tasks/main.yaml |  2 +-
 setup_env                                         |  2 +-
 specs/queens/approved/tempest_autoconfig.rst      |  2 +-
 tox.ini                                           |  2 +-
 7 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.gitreview b/.gitreview
index e6588d7..39f9a7e 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
 host=review.opendev.org
 port=29418
-project=openstack/refstack-client.git
+project=osf/refstack-client.git
diff --git a/.zuul.yaml b/.zuul.yaml
index 02316da..791ca8a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,15 +1,18 @@
 - project:
     templates:
-      - openstack-python-jobs
-      - openstack-python35-jobs
+      # Disable until fixed
+      # - openstack-python-jobs
+      # - openstack-python35-jobs
       - openstack-python36-jobs
       - openstack-python37-jobs
     check:
       jobs:
+        - openstack-tox-pep8
         - refstack-client-devstack-tempestconf
         - refstack-client-devstack-tempestconf-py3
     gate:
       jobs:
+        - openstack-tox-pep8
         - refstack-client-devstack-tempestconf
         - refstack-client-devstack-tempestconf-py3
 
@@ -19,15 +22,15 @@
     description: |
       Refstack client job for testing python-tempestconf and RefStack Integration
     required-projects:
-      - openstack/refstack-client
+      - osf/refstack-client
       - openstack/tempest
       - openstack/devstack
-      - openstack/python-tempestconf
+      - osf/python-tempestconf
     roles:
-      - zuul: openstack/python-tempestconf
+      - zuul: osf/python-tempestconf
       - zuul: openstack/tempest
       - zuul: openstack/devstack
-      - zuul: openstack/refstack-client
+      - zuul: osf/refstack-client
     run: playbooks/tempestconf-refstack-devstack.yaml
     vars:
       user: demo
diff --git a/doc/source/conf.py b/doc/source/conf.py
index f4d83b3..33133f4 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -33,7 +33,7 @@ extensions = [
 ]
 
 # openstackdocstheme options
-repository_name = 'openstack/refstack-client'
+repository_name = 'osf/refstack-client'
 bug_project = '879'
 bug_tag = ''
 
diff --git a/roles/generate-tempestconf-refstack/tasks/main.yaml b/roles/generate-tempestconf-refstack/tasks/main.yaml
index 5912736..48af2e7 100644
--- a/roles/generate-tempestconf-refstack/tasks/main.yaml
+++ b/roles/generate-tempestconf-refstack/tasks/main.yaml
@@ -48,4 +48,4 @@
         executable: /bin/bash
 
   vars:
-    refstack_client_src_relative_path: "{{ zuul.projects['opendev.org/openstack/refstack-client'].src_dir }}"
+    refstack_client_src_relative_path: "{{ zuul.projects['opendev.org/osf/refstack-client'].src_dir }}"
diff --git a/setup_env b/setup_env
index 87ffce9..0b81990 100755
--- a/setup_env
+++ b/setup_env
@@ -121,7 +121,7 @@ else
 fi
 
 if [ -z ${TEMPESTCONF_SOURCE} ]; then
-    git clone https://git.openstack.org/openstack/python-tempestconf.git ${TEMPESTCONF_DIR}
+    git clone https://git.openstack.org/osf/python-tempestconf.git ${TEMPESTCONF_DIR}
 fi
 
 git clone https://git.openstack.org/openstack/tempest.git ${TEMPEST_DIR}
diff --git a/specs/queens/approved/tempest_autoconfig.rst b/specs/queens/approved/tempest_autoconfig.rst
index 2b24774..6f5d017 100644
--- a/specs/queens/approved/tempest_autoconfig.rst
+++ b/specs/queens/approved/tempest_autoconfig.rst
@@ -91,7 +91,7 @@ Work Items
 Dependencies
 ============
 
-- Existing script: https://git.openstack.org/cgit/openstack/python-tempestconf
+- Existing script: https://opendev.org/osf/python-tempestconf
 
 Testing
 =======
diff --git a/tox.ini b/tox.ini
index baa45ae..f2aee1d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ setenv = VIRTUAL_ENV={envdir}
          OS_TEST_PATH=./refstack_client/tests/unit
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-       git+https://git.openstack.org/openstack/python-tempestconf@master#egg=python_tempestconf
+       git+https://git.openstack.org/osf/python-tempestconf@master#egg=python_tempestconf
 commands =
   stestr run {posargs}