Merge "Move OSA sync to integrated repository"

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
     }

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

zuul.d/projects.yaml

@@ -2699,6 +2699,11 @@
     templates:
       - official-openstack-repo-jobs
       - translation-jobs-master-only
+    post:
+      jobs:
+        - propose-updates:
+            vars:
+              update_target: openstack-ansible-sync
     release:
       jobs:
         - announce-release
@@ -3070,11 +3075,6 @@
 
 - project:
     name: openstack/openstack-ansible-tests
-    post:
-      jobs:
-        - propose-updates:
-            vars:
-              update_target: openstack-ansible-tests
     templates:
       - official-openstack-repo-jobs