From 8e271e7b960f9a05bb0c563883c875d9e83670dc Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Fri, 27 Oct 2017 20:47:07 -0400
Subject: [PATCH] Move publish-openstack-puppet-branch-tarball into ozj

We don't actually need this job in project-config, move to
openstack-zuul-jobs so we can share playbooks with
build-openstack-puppet-tarball.

Change-Id: I43a4ddaf40c48d22448238e62093b2e4d4597494
Depends-On: I7ca54a7045023596ec77682214afad5f210ac964
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 playbooks/puppet-branch-tarball/post.yaml | 9 +++++++++
 zuul.d/jobs.yaml                          | 9 +++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 playbooks/puppet-branch-tarball/post.yaml

diff --git a/playbooks/puppet-branch-tarball/post.yaml b/playbooks/puppet-branch-tarball/post.yaml
new file mode 100644
index 00000000..fba32b5f
--- /dev/null
+++ b/playbooks/puppet-branch-tarball/post.yaml
@@ -0,0 +1,9 @@
+- hosts: all
+  roles:
+    - fetch-puppet-module-output
+
+  pre_tasks:
+    - name: Rename files to branch specific name
+      shell: "mv *.tar.gz {{ zuul.project.short_name }}-{{ zuul.branch | replace('/', '-') }}.tar.gz"
+      args:
+        chdir: "{{ zuul.project.src_dir }}/pkg"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index bd25a6e1..37fed0a9 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -371,6 +371,15 @@
     pre-run: playbooks/puppet-tarball/pre.yaml
     run: playbooks/puppet-tarball/run.yaml
 
+- job:
+    name: publish-openstack-puppet-branch-tarball
+    parent: publish-openstack-artifacts
+    description: |
+      Publish the results of the puppet-tarball job to tarballs.openstack.org.
+    pre-run: playbooks/puppet-tarball/pre.yaml
+    run: playbooks/puppet-tarball/run.yaml
+    post-run: playbooks/puppet-branch-tarball/post.yaml
+
 - job:
     name: publish-openstack-python-tarball
     parent: publish-openstack-artifacts