From afbc57f93b3b84dab502b1fa85d5dc40294bc08e Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Thu, 27 Dec 2018 23:40:12 +0100
Subject: [PATCH] Add puppetforge publish and add to puppet release

This adds a new publish playbook that uses the new
upload-puppetforge role that is added in [1].

[1] https://review.openstack.org/#/c/627553/

Depends-On: https://review.openstack.org/#/c/627553/
Change-Id: Iec643ec2af8c6c1567653608ef7851a5ac6e414a
---
 playbooks/publish/puppetforge.yaml |  6 ++++++
 zuul.d/jobs.yaml                   |  6 +++++-
 zuul.d/secrets.yaml                | 16 ++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 playbooks/publish/puppetforge.yaml

diff --git a/playbooks/publish/puppetforge.yaml b/playbooks/publish/puppetforge.yaml
new file mode 100644
index 0000000000..09b8bf689f
--- /dev/null
+++ b/playbooks/publish/puppetforge.yaml
@@ -0,0 +1,6 @@
+- hosts: localhost
+  roles:
+    - role: upload-puppetforge
+      blacksmith_forge_username: "{{ puppetforge.user }}"
+      blacksmith_forge_password: "{{ puppetforge.password }}"
+      when: zuul_success | bool
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index d4978c15ab..e0118c59da 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -172,9 +172,13 @@
       Sign and release puppet tarballs to tarballs.o.o.
     pre-run: playbooks/puppet-tarball/pre.yaml
     run: playbooks/puppet-tarball/run.yaml
-    post-run: playbooks/puppet-tarball/post.yaml
+    post-run:
+      - playbooks/publish/puppetforge.yaml
+      - playbooks/puppet-tarball/post.yaml
     secrets:
       - gpg_key
+      - name: puppetforge
+        secret: openstack_puppetforge_credentials
 
 - job:
     name: release-openstack-python-without-pypi
diff --git a/zuul.d/secrets.yaml b/zuul.d/secrets.yaml
index 7b73d7b0b1..22ca8352d7 100644
--- a/zuul.d/secrets.yaml
+++ b/zuul.d/secrets.yaml
@@ -637,3 +637,19 @@
           ZxPTxlPemfpyASod1S6FatARLicSFyHJj9XQpfZzkxKpDQicG/QmOehFvjN9U1rlEFT5u
           rbkgWewQP2/4BE/dHr5ndXHKQURikqo/RAGH2SqAdLSHs/lL9wB210Ci2PdIsr7ZubqA4
           UtW1IBx1OYB7pkyRad7PkqeC4wC9HjSrf3bJ1INF10mQ0rg2Kpt1vDK48BzDco=
+
+- secret:
+    name: openstack_puppetforge_credentials
+    data:
+      user: 'openstack'
+      password: !encrypted/pkcs1-oaep
+        - T6YiIdaM9sd7EN5gS+qVQaMdI8/kPtr4sj0Ec1dlPyQAZz11pn6M+4Ulm11w6J/a968Rb
+          yiWkXu0PkB+goYEl2ZoTJt/rxYG2CI/KZJ8er8YV/RcbZIrWLTiqh8w8ql2xs2G+bJ1AX
+          lQsha/D2e5sMVMM3fDZ1RQbGy28Rp6xb7M55YCR6f6uKwhhT3rUD2s+SMVWaKkKGlHNKa
+          VB4d1pPjl54YdF1l8o27dd/aXkco93eaBdo5owA0LO0v5PCRfWmXxVxL+egV1DN9Ejom9
+          Tcn7t7YRurIxyjwUog1bU6g1pjO/Vh6dY3AgHY2lZaqA/fyvPysn7oHiJWl6PqVn9IEV8
+          ft17JTHIg0O8pVz+kBcuCJ0SZ1aNSz4CnrjRybMWV7m+5aHkpubgY1KvuF3KVCPA4lJNn
+          hBPxDveStPLePBlHn3PrXLqoUQhHlWQQ2PScfjDYLY8BrKJZlkf5b32rTHMkPpgVPqTed
+          nn55Gx/femCxzSo8zrQs85Zd2YzpSYLnB+6gaKixlscSUrikw0nkJx2B4fIN8NQbrgmg+
+          ODMSny15rZBLGHFBgL7xhMJIBfYfkKE8Yk2EtvAptNUJcv5FXDjbgNzPqcHbfF/MEZCSR
+          QubWk7hfS9a0kRiES8zSrUv8EJTBj2LOJx+9RFRklcd1STyhwkxJQZTI5Re3yE=