From ff9aab67ffcd1d86cb196d0d4509bcee26ab51d2 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@cleura.com>
Date: Thu, 17 Apr 2025 21:36:23 +0200
Subject: [PATCH] Move OSA sync to integrated repository

At the moment the only valuable asset of tests repo, which we want to
keep is file synchronization.

With that we want to deprecate current tests repository, as it serves
not other purpose. Existing files sync process we aim to move to
openstack-ansible integrated repository and keep it there for now.

Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/947626
Change-Id: Ib8b4e651900d6a74d21dd07bdef6867e9f6bf351
---
 playbooks/proposal/propose_update.sh                   |  8 ++++----
 .../proposal/sync_openstack_ansible_common_files.sh    | 10 +++++-----
 zuul.d/projects.yaml                                   | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/playbooks/proposal/propose_update.sh b/playbooks/proposal/propose_update.sh
index 79be07d4ac..8e1580fc56 100755
--- a/playbooks/proposal/propose_update.sh
+++ b/playbooks/proposal/propose_update.sh
@@ -54,10 +54,10 @@ elif [ "$OWN_PROJECT" == "puppet-openstack-constraints" ] ; then
     function update {
         bash /home/zuul/scripts/generate_puppetfile.sh
     }
-elif [ "$OWN_PROJECT" == "openstack-ansible-tests" ] ; then
-    INITIAL_COMMIT_MSG="Updated from OpenStack Ansible Tests"
-    TOPIC="openstack/openstack-ansible-tests/sync-tests"
-    PROJECTS=$(./gen-projects-list.sh)
+elif [ "$OWN_PROJECT" == "openstack-ansible-sync" ] ; then
+    INITIAL_COMMIT_MSG="Updated from OpenStack Ansible Integrated repository"
+    TOPIC="openstack/openstack-ansible-sync/sync-files"
+    PROJECTS=$(./sync/gen-projects-list.sh)
     function update {
         bash /home/zuul/scripts/sync_openstack_ansible_common_files.sh $1
     }
diff --git a/playbooks/proposal/sync_openstack_ansible_common_files.sh b/playbooks/proposal/sync_openstack_ansible_common_files.sh
index 1318b8e530..3f2e275515 100644
--- a/playbooks/proposal/sync_openstack_ansible_common_files.sh
+++ b/playbooks/proposal/sync_openstack_ansible_common_files.sh
@@ -14,24 +14,24 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-# Copy common files from the openstack-ansible-tests repository
+# Copy common files from the openstack-ansible repository
 set -eu
 
 OSA_PROJECT=${1}
 
 # Careful of what you put here.
-declare -ra files_to_sync=(run_tests.sh bindep.txt Vagrantfile tests/tests-repo-clone.sh .gitignore sync/doc/* sync/tasks/*)
+declare -ra files_to_sync=(run_tests.sh bindep.txt Vagrantfile .gitignore sync/doc/* sync/tasks/*)
 
 excluded_projects=
 exclude_project() {
     excluded_projects+="$1 "
 }
 
-# Always exclude openstack-ansible-tests repository. This is not
-# necessary because OSA_PROJECT should never be "openstack-ansible-tests"
+# Always exclude openstack-ansible repository. This is not
+# necessary because OSA_PROJECT should never be "openstack-ansible"
 # but it can serve as an example for users who may add more
 # projects in the future.
-exclude_project "openstack-ansible-tests"
+exclude_project "openstack-ansible"
 
 check_and_ignore() {
     for z in $(echo ${excluded_projects} | tr ' ' '\n'); do
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index cd845fdc36..c9d4f3ff03 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -2708,6 +2708,11 @@
     templates:
       - official-openstack-repo-jobs
       - translation-jobs-master-only
+    post:
+      jobs:
+        - propose-updates:
+            vars:
+              update_target: openstack-ansible-sync
     release:
       jobs:
         - announce-release
@@ -3079,11 +3084,6 @@
 
 - project:
     name: openstack/openstack-ansible-tests
-    post:
-      jobs:
-        - propose-updates:
-            vars:
-              update_target: openstack-ansible-tests
     templates:
       - official-openstack-repo-jobs