Merge "Switch tripleo jobs back to rh1"

This commit is contained in:
Jenkins 2016-08-03 19:03:49 +00:00 committed by Gerrit Code Review
commit ad74f4ba0d
1 changed files with 2 additions and 3 deletions

View File

@ -149,7 +149,6 @@ labels:
min-ready: 6
providers:
- name: tripleo-test-cloud-rh1
- name: tripleo-test-cloud-rh2
providers:
- name: rax-dfw
region-name: 'DFW'
@ -627,7 +626,7 @@ providers:
region-name: 'regionOne'
cloud: tripleo-test-cloud-rh1
boot-timeout: 120
max-servers: 2
max-servers: 50
rate: 0.001
clean-floating-ips: true
networks:
@ -644,7 +643,7 @@ providers:
region-name: 'regionOne'
cloud: tripleo-test-cloud-rh2
boot-timeout: 120
max-servers: 15
max-servers: 0
rate: 0.001
clean-floating-ips: true
networks: