Merge "Rework to use new upload-forge module"

playbooks/publish/puppetforge.yaml

@@ -1,6 +1,18 @@
-- hosts: all
+- hosts: localhost
-  roles:
+  tasks:
-    - role: upload-puppetforge
+    - name: Find all puppet tarballs in artifacts
-      blacksmith_forge_username: "{{ puppetforge.user }}"
+      find:
-      blacksmith_forge_password: "{{ puppetforge.password }}"
+        paths: "{{ zuul.executor.work_root }}/artifacts/"
-      when: zuul_success | bool
+        patterns: '*.tar.gz'
+        recurse: yes
+      register: tarballs
+    - name: Upload tarballs to PuppetForge
+      include_role:
+        name: upload-forge
+      vars:
+        forge_username: "{{ puppetforge.user }}"
+        forge_password: "{{ puppetforge.password }}"
+        forge_tarball: "{{ item.path }}"
+        forge_url: "https://forgeapi.puppet.com"
+      with_items:
+        - "{{ tarballs.files }}"

zuul.d/jobs.yaml

@@ -87,8 +87,8 @@
     pre-run: playbooks/puppet-tarball/pre.yaml
     run: playbooks/puppet-tarball/run.yaml
     post-run:
-      - playbooks/publish/puppetforge.yaml
       - playbooks/puppet-tarball/post.yaml
+      - playbooks/publish/puppetforge.yaml
     secrets:
       - gpg_key
       - name: puppetforge