From eff25491f357e5d3f246e1216e244296310bd46f Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Mon, 3 Feb 2020 14:38:43 +1100
Subject: [PATCH] upload-artifacts-with-afs: use upload-afs-synchronzie role

This role moves the synchronize logic for copying the files into the
upload-afs-synchronize role from the dependent change.

Depends-On: https://review.opendev.org/705368
Change-Id: I7408e0ec9c731f2ae1d40ef3a4526aa67f28d4e0
---
 .../publish/openstack-artifacts-with-afs.yaml | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/playbooks/publish/openstack-artifacts-with-afs.yaml b/playbooks/publish/openstack-artifacts-with-afs.yaml
index 6d5cf6fdb3..a75b5510b4 100644
--- a/playbooks/publish/openstack-artifacts-with-afs.yaml
+++ b/playbooks/publish/openstack-artifacts-with-afs.yaml
@@ -4,22 +4,12 @@
         - name: Create AFS token
           include_role:
             name: create-afs-token
-        # NOTE(ianw): the upload-afs role is somewhat structured
-        # around uploading docs, and requires a .root-marker file,
-        # etc.  In this case, we just want the whole directory
-        # verbatim.
-        - name: Upload contents of the artifacts folder
-          synchronize:
-            src: "{{ zuul.executor.work_root }}/artifacts/"
-            dest: "/afs/.openstack.org/project/tarballs.opendev.org/{{ zuul.project.name}}/"
-            # can't set group permissions on AFS; see upload-afs role
-            archive: false
-            perms: true
-            times: true
-            recursive: true
-            rsync_opts:
-              - '--safe-links'
-              - '--delete-after'
+        - name: Upload to afs
+          include_role:
+            name: upload-afs-synchronize
+          vars:
+            afs_source: "{{ zuul.executor.work_root }}/artifacts/"
+            afs_target: "/afs/.openstack.org/project/tarballs.opendev.org/{{ zuul.project.name}}/"
         - name: Destroy AFS token
           include_role:
             name: destroy-afs-token