Merge "Remove bare-trusty from nodepool"

This commit is contained in:
Jenkins 2016-03-16 18:56:11 +00:00 committed by Gerrit Code Review
commit 0e23f1126e

@ -52,14 +52,6 @@ labels:
- name: internap-nyj01
- name: vexxhost-ca-ymq-1
- name: osic-cloud1
- name: bare-trusty
image: bare-trusty
ready-script: configure_mirror.sh
min-ready: 0
providers:
- name: rax-dfw
- name: rax-ord
- name: rax-iad
- name: ubuntu-trusty
image: ubuntu-trusty
ready-script: configure_mirror.sh
@ -163,13 +155,6 @@ providers:
setup: prepare_node_devstack.sh
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: bare-trusty
base-image: 'Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)'
min-ram: 8192
name-filter: 'Performance'
setup: prepare_node_bare.sh
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: ubuntu-trusty
min-ram: 8192
diskimage: ubuntu-trusty
@ -222,13 +207,6 @@ providers:
setup: prepare_node_devstack.sh
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: bare-trusty
base-image: 'Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)'
min-ram: 8192
name-filter: 'Performance'
setup: prepare_node_bare.sh
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: ubuntu-trusty
min-ram: 8192
diskimage: ubuntu-trusty
@ -281,13 +259,6 @@ providers:
setup: prepare_node_devstack.sh
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: bare-trusty
base-image: 'Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)'
min-ram: 8192
name-filter: 'Performance'
setup: prepare_node_bare.sh
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: ubuntu-trusty
min-ram: 8192
diskimage: ubuntu-trusty