Move copy-wheels roles to post-run

Currently, our secrets are not included in the
build-wheel-mirror-base, so this means we cannot access the afs secret
to copy files into /afs/.openstack.org. Move this into pre distro jobs
where the secret lives.

Again, once we have protected final jobs, we can clean this up a bit.

Change-Id: I8e8b92af771bc84a3930a8f98c96c8216388d1cf
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-11-15 23:14:03 -05:00
parent 9373ce5bea
commit 14616db9c5
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
3 changed files with 23 additions and 11 deletions

View File

@ -2,20 +2,9 @@
strategy: free
pre_tasks:
- name: Generate AFS slug
set_fact:
afs_slug: "{{ ansible_distribution|lower }}-{{ ansible_distribution_version }}-{{ ansible_architecture }}"
- name: Set fact for AFS dir
set_fact:
afs_dir: "/afs/.openstack.org/mirror/wheel/{{ afs_slug }}/"
- name: Set fact for wheel dir
set_fact:
wheel_dir: /opt/wheel/workspace
roles:
- build-wheels
- create-afs-token
- copy-wheels
- destroy-afs-token

20
playbooks/wheel/post.yaml Normal file
View File

@ -0,0 +1,20 @@
- hosts: all
strategy: free
pre_tasks:
- name: Generate AFS slug
set_fact:
afs_slug: "{{ ansible_distribution|lower }}-{{ ansible_distribution_version }}-{{ ansible_architecture }}"
- name: Set fact for AFS dir
set_fact:
afs_dir: "/afs/.openstack.org/mirror/wheel/{{ afs_slug }}/"
- name: Set fact for wheel dir
set_fact:
wheel_dir: /opt/wheel/workspace
roles:
- create-afs-token
- copy-wheels
- destroy-afs-token

View File

@ -794,6 +794,7 @@
- job:
name: build-wheel-mirror-centos-7
parent: build-wheel-mirror-base
post-run: playbooks/wheel/post.yaml
final: true
nodeset:
# NOTE: The python2 and python3 suffix are important, they select the
@ -810,6 +811,7 @@
- job:
name: build-wheel-mirror-ubuntu-trusty
parent: build-wheel-mirror-base
post-run: playbooks/wheel/post.yaml
final: true
nodeset:
# NOTE: The python2 and python3 suffix are important, they select the
@ -828,6 +830,7 @@
- job:
name: build-wheel-mirror-ubuntu-xenial
parent: build-wheel-mirror-base
post-run: playbooks/wheel/post.yaml
final: true
nodeset:
# NOTE: The python2 and python3 suffix are important, they select the