From 5cb12a5d65a1aa1068868467a68f7a937f612825 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Thu, 26 Apr 2018 19:46:32 +0000
Subject: [PATCH] More fix laravel branch and master publish jobs

The tarballs are now building and being copied to the executor
correctly, but need to be published to the tarballs site. Reparent
the legacy-laravel-openstackid-release-branch and
legacy-laravel-openstackid-release-master jobs to
legacy-publish-openstack-artifacts instead of legacy-base so the
additional missing publication tasks will be added. Also update the
artifact transit directory name on the executor to match what the
uploader role will expect.

Change-Id: I941b986ee7bf200e2d5a810ab8cefc62567a5b6a
---
 playbooks/legacy/laravel-openstackid-release-branch/post.yaml | 4 ++--
 playbooks/legacy/laravel-openstackid-release-master/post.yaml | 4 ++--
 zuul.d/zuul-legacy-jobs.yaml                                  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/playbooks/legacy/laravel-openstackid-release-branch/post.yaml b/playbooks/legacy/laravel-openstackid-release-branch/post.yaml
index d2e9d469..f32fe0c5 100644
--- a/playbooks/legacy/laravel-openstackid-release-branch/post.yaml
+++ b/playbooks/legacy/laravel-openstackid-release-branch/post.yaml
@@ -29,14 +29,14 @@
 
     - name: Ensure artifact transit directory exists
       file:
-        path: '{{ zuul.executor.log_root }}/tarballs/{{ zuul.project.short_name}}'
+        path: '{{ zuul.executor.log_root }}/artifacts'
         state: directory
       delegate_to: localhost
 
     - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
       synchronize:
         src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}/tarballs/{{ zuul.project.short_name}}'
+        dest: '{{ zuul.executor.log_root }}/artifacts/'
         mode: pull
         copy_links: true
         verify_host: true
diff --git a/playbooks/legacy/laravel-openstackid-release-master/post.yaml b/playbooks/legacy/laravel-openstackid-release-master/post.yaml
index d2e9d469..f32fe0c5 100644
--- a/playbooks/legacy/laravel-openstackid-release-master/post.yaml
+++ b/playbooks/legacy/laravel-openstackid-release-master/post.yaml
@@ -29,14 +29,14 @@
 
     - name: Ensure artifact transit directory exists
       file:
-        path: '{{ zuul.executor.log_root }}/tarballs/{{ zuul.project.short_name}}'
+        path: '{{ zuul.executor.log_root }}/artifacts'
         state: directory
       delegate_to: localhost
 
     - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
       synchronize:
         src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}/tarballs/{{ zuul.project.short_name}}'
+        dest: '{{ zuul.executor.log_root }}/artifacts/'
         mode: pull
         copy_links: true
         verify_host: true
diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml
index ea81a91d..585380a1 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -681,7 +681,7 @@
 
 - job:
     name: legacy-laravel-openstackid-release-branch
-    parent: legacy-base
+    parent: legacy-publish-openstack-artifacts
     run: playbooks/legacy/laravel-openstackid-release-branch/run.yaml
     post-run: playbooks/legacy/laravel-openstackid-release-branch/post.yaml
     timeout: 1800
@@ -689,7 +689,7 @@
 
 - job:
     name: legacy-laravel-openstackid-release-master
-    parent: legacy-base
+    parent: legacy-publish-openstack-artifacts
     run: playbooks/legacy/laravel-openstackid-release-master/run.yaml
     post-run: playbooks/legacy/laravel-openstackid-release-master/post.yaml
     timeout: 1800