From b8d80470bcac5afde57604ced84c6965bbb6511f Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 7 Jan 2014 10:01:33 +0800 Subject: [PATCH] Start using jenkins03 and 04 Merge this after all the related systems (touched in the previous change) have updated and are stable. Change-Id: Iacaf3079bb08d57b048844dc460daedb40cd0495 --- .../templates/nodepool/nodepool.yaml.erb | 60 +++++++++++++++++-- 1 file changed, 54 insertions(+), 6 deletions(-) diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb index a3030e246d..6b421f0500 100644 --- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb +++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb @@ -195,17 +195,17 @@ targets: credentials-id: '<%= jenkins_credentials_id %>' images: - name: bare-precise - min-ready: 3 + min-ready: 2 providers: - name: rax-iad - name: devstack-precise - min-ready: 20 + min-ready: 10 providers: - name: hpcloud-az1 - name: hpcloud-az2 - name: hpcloud-az3 - name: devstack-precise-check - min-ready: 10 + min-ready: 5 providers: - name: rax-iad - name: rax-dfw @@ -223,17 +223,17 @@ targets: credentials-id: '<%= jenkins_credentials_id %>' images: - name: bare-precise - min-ready: 3 + min-ready: 2 providers: - name: rax-iad - name: devstack-precise - min-ready: 20 + min-ready: 10 providers: - name: hpcloud-az1 - name: hpcloud-az2 - name: hpcloud-az3 - name: devstack-precise-check - min-ready: 10 + min-ready: 5 providers: - name: rax-iad - name: rax-dfw @@ -243,3 +243,51 @@ targets: min-ready: 1 providers: - name: tripleo-test-cloud + - name: jenkins03 + jenkins: + url: 'https://jenkins03.openstack.org/' + user: '<%= jenkins_api_user %>' + apikey: '<%= jenkins_api_key %>' + credentials-id: '<%= jenkins_credentials_id %>' + images: + - name: bare-precise + min-ready: 2 + providers: + - name: rax-iad + - name: devstack-precise + min-ready: 10 + providers: + - name: hpcloud-az1 + - name: hpcloud-az2 + - name: hpcloud-az3 + - name: devstack-precise-check + min-ready: 5 + providers: + - name: rax-iad + - name: rax-dfw + - name: rax-ord + - name: hpcloud-region-b + - name: jenkins04 + jenkins: + url: 'https://jenkins04.openstack.org/' + user: '<%= jenkins_api_user %>' + apikey: '<%= jenkins_api_key %>' + credentials-id: '<%= jenkins_credentials_id %>' + images: + - name: bare-precise + min-ready: 2 + providers: + - name: rax-iad + - name: devstack-precise + min-ready: 10 + providers: + - name: hpcloud-az1 + - name: hpcloud-az2 + - name: hpcloud-az3 + - name: devstack-precise-check + min-ready: 5 + providers: + - name: rax-iad + - name: rax-dfw + - name: rax-ord + - name: hpcloud-region-b