Split build-wheel-mirror into 2 jobs

It is hard to trace 4 nodes going at once, so group these into
ubuntu-trusty and ubuntu-xenial for now.  Once everything is working
as expected, we could consider rolling this back. But honestly, 4
nodes is a little much.

Change-Id: I2cdc2ded48ee50491df7ee9c3b84c6f60c870318
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger
2017-11-13 15:40:15 -05:00
parent 73e3ca2698
commit 50a9cadc62
2 changed files with 33 additions and 17 deletions

View File

@ -777,24 +777,10 @@
max: 1
- job:
name: build-wheel-mirror
name: build-wheel-mirror-base
pre-run: playbooks/wheel/pre.yaml
run: playbooks/wheel/build.yaml
post-run: playbooks/wheel/release.yaml
nodeset:
# NOTE: The python2 and python3 suffix are important, they select the
# version of python to build in each job. (we pull the last character of
# the inventory_hostname)
# TODO(mordred): Replace the suffix with host_vars once we have them.
nodes:
- name: wheel-mirror-ubuntu-xenial-python2
label: ubuntu-xenial
- name: wheel-mirror-ubuntu-trusty-python2
label: ubuntu-trusty
- name: wheel-mirror-ubuntu-xenial-python3
label: ubuntu-xenial
- name: wheel-mirror-ubuntu-trusty-python3
label: ubuntu-trusty
# 2.5 hours
timeout: 9000
# The job iterates over all branches, so we only need to run it on
@ -815,6 +801,34 @@
- name: afs
secret: wheel_keytab
- job:
name: build-wheel-mirror-ubuntu-trusty
parent: build-wheel-mirror-base
nodeset:
# NOTE: The python2 and python3 suffix are important, they select the
# version of python to build in each job. (we pull the last character of
# the inventory_hostname)
# TODO(mordred): Replace the suffix with host_vars once we have them.
nodes:
- name: wheel-mirror-ubuntu-trusty-python2
label: ubuntu-trusty
- name: wheel-mirror-ubuntu-trusty-python3
label: ubuntu-trusty
- job:
name: build-wheel-mirror-ubuntu-xenial
parent: build-wheel-mirror-base
nodeset:
# NOTE: The python2 and python3 suffix are important, they select the
# version of python to build in each job. (we pull the last character of
# the inventory_hostname)
# TODO(mordred): Replace the suffix with host_vars once we have them.
nodes:
- name: wheel-mirror-ubuntu-xenial-python2
label: ubuntu-xenial
- name: wheel-mirror-ubuntu-xenial-python3
label: ubuntu-xenial
- job:
name: release-wheel-mirror
run: playbooks/wheel/release.yaml

View File

@ -22657,10 +22657,12 @@
- publish-loci-requirements
periodic:
jobs:
- build-wheel-mirror
- build-wheel-mirror-ubuntu-trusty
- build-wheel-mirror-ubuntu-xenial
- release-wheel-mirror:
dependencies:
- build-wheel-mirror
- build-wheel-mirror-ubuntu-trusty
- build-wheel-mirror-ubuntu-xenial
- propose-updates:
branches: master
vars: