Merge "Rework to use new upload-forge module"

This commit is contained in:
Zuul 2019-02-13 17:54:51 +00:00 committed by Gerrit Code Review
commit 6ddb9fa39b
2 changed files with 19 additions and 7 deletions

View File

@ -1,6 +1,18 @@
- hosts: all
roles:
- role: upload-puppetforge
blacksmith_forge_username: "{{ puppetforge.user }}"
blacksmith_forge_password: "{{ puppetforge.password }}"
when: zuul_success | bool
- hosts: localhost
tasks:
- name: Find all puppet tarballs in artifacts
find:
paths: "{{ zuul.executor.work_root }}/artifacts/"
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 }}"

View File

@ -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