From 1dcdd82a06564350a070b20a02936dd46f1c81c1 Mon Sep 17 00:00:00 2001
From: yangshaoxue <yang.shaoxue@99cloud.net>
Date: Wed, 9 Mar 2022 11:21:10 +0800
Subject: [PATCH] fix: Fix the e2e job

Change the skyline-apiserver and skyline-console project from
skyline group to openstack group.

The devstack plugin has wrong permission for dir_log. So it depends
on the commit for skyline-apiserver.

Depends-On: https://review.opendev.org/c/openstack/skyline-apiserver/+/833528

Change-Id: I1e914f1a6e92fd2fd5463bd36872231837e91746
---
 .zuul.yaml                                   | 16 ++++++++--------
 playbooks/devstack/compute/run-devstack.yaml |  2 +-
 playbooks/devstack/network/run-devstack.yaml |  2 +-
 playbooks/devstack/other/run-devstack.yaml   |  2 +-
 playbooks/devstack/pre.yaml                  |  4 ++--
 playbooks/devstack/storage/run-devstack.yaml |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 4325a748..4909edee 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -23,8 +23,8 @@
       - openstack/placement
       - openstack/requirements
       - openstack/virtualbmc
-      - skyline/skyline-apiserver
-      - skyline/skyline-console
+      - openstack/skyline-apiserver
+      - openstack/skyline-console
     timeout: 10800
     vars:
       devstack_services:
@@ -209,8 +209,8 @@
       - openstack/placement
       - openstack/python-octaviaclient
       - openstack/requirements
-      - skyline/skyline-apiserver
-      - skyline/skyline-console
+      - openstack/skyline-apiserver
+      - openstack/skyline-console
     timeout: 10800
     vars:
       devstack_services:
@@ -316,8 +316,8 @@
       - openstack/nova
       - openstack/placement
       - openstack/requirements
-      - skyline/skyline-apiserver
-      - skyline/skyline-console
+      - openstack/skyline-apiserver
+      - openstack/skyline-console
     timeout: 10800
     vars:
       devstack_services:
@@ -413,8 +413,8 @@
       - openstack/placement
       - openstack/requirements
       - openstack/swift
-      - skyline/skyline-apiserver
-      - skyline/skyline-console
+      - openstack/skyline-apiserver
+      - openstack/skyline-console
     timeout: 10800
     vars:
       devstack_services:
diff --git a/playbooks/devstack/compute/run-devstack.yaml b/playbooks/devstack/compute/run-devstack.yaml
index e830fcfb..d4f7d3c8 100644
--- a/playbooks/devstack/compute/run-devstack.yaml
+++ b/playbooks/devstack/compute/run-devstack.yaml
@@ -6,7 +6,7 @@
         executable: /bin/bash
         cmd: |
           local_conf="/opt/stack/devstack/local.conf"
-          sed -i '1a enable_plugin skyline-apiserver https://opendev.org/skyline/skyline-apiserver' $local_conf
+          sed -i '1a enable_plugin skyline-apiserver https://opendev.org/openstack/skyline-apiserver' $local_conf
           sed -i '1a enable_plugin ironic https://opendev.org/openstack/ironic' $local_conf
           sed -i '1a enable_plugin neutron https://opendev.org/openstack/neutron' $local_conf
       become: yes
diff --git a/playbooks/devstack/network/run-devstack.yaml b/playbooks/devstack/network/run-devstack.yaml
index 651b5573..e7e2b6f1 100644
--- a/playbooks/devstack/network/run-devstack.yaml
+++ b/playbooks/devstack/network/run-devstack.yaml
@@ -6,7 +6,7 @@
         executable: /bin/bash
         cmd: |
           local_conf="/opt/stack/devstack/local.conf"
-          sed -i '1a enable_plugin skyline-apiserver https://opendev.org/skyline/skyline-apiserver' $local_conf
+          sed -i '1a enable_plugin skyline-apiserver https://opendev.org/openstack/skyline-apiserver' $local_conf
           sed -i '1a enable_plugin neutron-vpnaas https://opendev.org/openstack/neutron-vpnaas' $local_conf
           sed -i '1a enable_plugin octavia https://opendev.org/openstack/octavia' $local_conf
           sed -i '1a enable_plugin neutron https://opendev.org/openstack/neutron' $local_conf
diff --git a/playbooks/devstack/other/run-devstack.yaml b/playbooks/devstack/other/run-devstack.yaml
index 16384c81..6b18f522 100644
--- a/playbooks/devstack/other/run-devstack.yaml
+++ b/playbooks/devstack/other/run-devstack.yaml
@@ -6,7 +6,7 @@
         executable: /bin/bash
         cmd: |
           local_conf="/opt/stack/devstack/local.conf"
-          sed -i '1a enable_plugin skyline-apiserver https://opendev.org/skyline/skyline-apiserver' $local_conf
+          sed -i '1a enable_plugin skyline-apiserver https://opendev.org/openstack/skyline-apiserver' $local_conf
           sed -i '1a enable_plugin heat https://opendev.org/openstack/heat' $local_conf
           sed -i '1a enable_plugin neutron https://opendev.org/openstack/neutron' $local_conf
       become: yes
diff --git a/playbooks/devstack/pre.yaml b/playbooks/devstack/pre.yaml
index 6004255d..4191d93a 100644
--- a/playbooks/devstack/pre.yaml
+++ b/playbooks/devstack/pre.yaml
@@ -10,8 +10,8 @@
     - name: Copy skyline-apiserver repos into devstack working directory
       command: rsync -a {{ item }} {{ devstack_base_dir }}
       with_items:
-        - src/opendev.org/skyline/skyline-apiserver
-        - src/opendev.org/skyline/skyline-console
+        - src/opendev.org/openstack/skyline-apiserver
+        - src/opendev.org/openstack/skyline-console
       become: yes
 
     - name: Remove the old skyline-console in skyline-apiserver/libs
diff --git a/playbooks/devstack/storage/run-devstack.yaml b/playbooks/devstack/storage/run-devstack.yaml
index 6eb50172..e0fe9abd 100644
--- a/playbooks/devstack/storage/run-devstack.yaml
+++ b/playbooks/devstack/storage/run-devstack.yaml
@@ -6,7 +6,7 @@
         executable: /bin/bash
         cmd: |
           local_conf="/opt/stack/devstack/local.conf"
-          sed -i '1a enable_plugin skyline-apiserver https://opendev.org/skyline/skyline-apiserver' $local_conf
+          sed -i '1a enable_plugin skyline-apiserver https://opendev.org/openstack/skyline-apiserver' $local_conf
           sed -i '1a enable_plugin neutron https://opendev.org/openstack/neutron' $local_conf
       become: yes