openstack/project-config
Code Issues Proposed changes

Switch to tripleo-centos-7 for tripleo-ci jobs

Browse Source 
This is a cosmetic change for nodepool, since this image still only
runs on tripleo-test-cloud-rh1, we need the prefix still.

We do this over a series of commits not to affect running jobs.

Change-Id: I12314b577ec78df6ec67948ffca76c3f3b020e08
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-08-07 10:05:28 -04:00
parent a5c6d26fcf
commit b834e92d0e
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
jenkins/jobs/projects.yaml
View File

@ -11147,21 +11147,21 @@
jobname: 'centos-7-ovb-nonha'
suffix: ''
type: 'ovb-nonha'
node: 'tripleo-centos-7-ovb'
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: default
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-ha'
suffix: ''
type: 'ovb-ha2'
node: 'tripleo-centos-7-ovb'
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: default
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-upgrades'
suffix: ''
type: 'ovb-upgrades'
node: 'tripleo-centos-7-ovb'
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: default
@ -11169,49 +11169,49 @@
jobname: 'centos-7-ovb-nonha'
suffix: ''
type: 'periodic-ovb-nonha'
node: 'tripleo-centos-7-ovb'
node: 'tripleo-centos-7'
trigger: 'periodic'
branch-override: default
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-ha'
suffix: ''
type: 'periodic-ovb-ha2'
node: 'tripleo-centos-7-ovb'
node: 'tripleo-centos-7'
trigger: 'periodic'
branch-override: default
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-upgrades'
suffix: ''
type: 'periodic-ovb-upgrades'
node: 'tripleo-centos-7-ovb'
node: 'tripleo-centos-7'
trigger: 'periodic'
branch-override: default
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-ha-liberty'
suffix: ''
type: 'periodic-ovb-ha2-liberty'
node: 'tripleo-centos-7-ovb'
node: 'tripleo-centos-7'
trigger: 'periodic'
branch-override: stable/liberty
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-ha-mitaka'
suffix: ''
type: 'periodic-ovb-ha2-mitaka'
node: 'tripleo-centos-7-ovb'
node: 'tripleo-centos-7'
trigger: 'periodic'
branch-override: stable/mitaka
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-ha-tempest'
suffix: ''
type: 'periodic-ovb-ha2-tempest'
node: 'tripleo-centos-7-ovb'
node: 'tripleo-centos-7'
trigger: 'periodic'
branch-override: default
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-ha-tempest'
suffix: ''
type: 'ovb-ha2-tempest'
node: 'tripleo-centos-7-ovb'
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: default
# Experimental jobs for testing containers
@ -11219,7 +11219,7 @@
jobname: 'centos-7-ovb-containers'
suffix: ''
type: 'ovb-containers'
node: 'tripleo-centos-7-ovb'
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: default
# non-voting check job for multinode
@ -11260,14 +11260,14 @@
jobname: 'centos-7-ovb-ha-liberty'
suffix: ''
type: 'ovb-ha2'
node: 'tripleo-centos-7-ovb'
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: 'stable/liberty'
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-ha-mitaka'
suffix: ''
type: 'ovb-ha2'
node: 'tripleo-centos-7-ovb'
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: 'stable/mitaka'

4
nodepool/nodepool.yaml
View File

@ -146,13 +146,13 @@ labels:
- name: tripleo-centos-7
image: centos-7
ready-script: configure_mirror.sh
min-ready: 1
min-ready: 6
providers:
- name: tripleo-test-cloud-rh1
- name: tripleo-centos-7-ovb
image: centos-7
ready-script: configure_mirror.sh
min-ready: 6
min-ready: 0
providers:
- name: tripleo-test-cloud-rh1
providers: