From 389f5c470fe7b4777966d44d9d5bc5751c998080 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Fri, 27 Apr 2018 16:09:39 +0000 Subject: [PATCH] Further fix laravel branch/master publish jobs The publish-artifacts-to-fileserver role includes the tree structure of under the artifacts dir, which we don't wish to preserve for the tarballs directory our legacy-laravel-openstackid-release-branch and legacy-laravel-openstackid-release-master jobs create. Instead just copy the contents of the tarballs directory to the artifacts directory (this also allows us to drop fancy filename pattern matching and symlink preservation from our rsync options). Change-Id: I22743c78e286c51067d38efe8c646021e68ca09b --- .../legacy/laravel-openstackid-release-branch/post.yaml | 8 +------- .../legacy/laravel-openstackid-release-master/post.yaml | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/playbooks/legacy/laravel-openstackid-release-branch/post.yaml b/playbooks/legacy/laravel-openstackid-release-branch/post.yaml index 8561447b..d942e170 100644 --- a/playbooks/legacy/laravel-openstackid-release-branch/post.yaml +++ b/playbooks/legacy/laravel-openstackid-release-branch/post.yaml @@ -35,13 +35,7 @@ - name: Copy files from {{ ansible_user_dir }}/workspace/ on node synchronize: - src: '{{ ansible_user_dir }}/workspace/' + src: '{{ ansible_user_dir }}/workspace/tarballs/' dest: '{{ zuul.executor.work_root }}/artifacts/' mode: pull - copy_links: true verify_host: true - rsync_opts: - - --include=/tarballs/*.tar.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/laravel-openstackid-release-master/post.yaml b/playbooks/legacy/laravel-openstackid-release-master/post.yaml index 8561447b..d942e170 100644 --- a/playbooks/legacy/laravel-openstackid-release-master/post.yaml +++ b/playbooks/legacy/laravel-openstackid-release-master/post.yaml @@ -35,13 +35,7 @@ - name: Copy files from {{ ansible_user_dir }}/workspace/ on node synchronize: - src: '{{ ansible_user_dir }}/workspace/' + src: '{{ ansible_user_dir }}/workspace/tarballs/' dest: '{{ zuul.executor.work_root }}/artifacts/' mode: pull - copy_links: true verify_host: true - rsync_opts: - - --include=/tarballs/*.tar.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs