Switch some infra jobs to use bare precise nodes

Rename the jjb file to be less anachronistic.

Make these jobs mark their nodes as single-use.

Make sure there are at least enough nodes ready to fully test
one change.

Change-Id: I9bbb7cebf8f3a7b9e69d77f691505efd88972dc5
This commit is contained in:
James E. Blair 2013-12-05 12:38:31 -08:00
parent c26b09021f
commit 84b3182ba4
3 changed files with 23 additions and 5 deletions

View File

@ -1,6 +1,6 @@
- job: - job:
name: config-compare-xml name: config-compare-xml
node: precise node: bare-precise
builders: builders:
- gerrit-git-prep - gerrit-git-prep
@ -12,7 +12,7 @@
- job: - job:
name: gate-config-layout name: gate-config-layout
node: precise node: bare-precise
builders: builders:
- gerrit-git-prep - gerrit-git-prep
@ -27,7 +27,7 @@
# This is a non-standard docs job because it uses SCP instead of FTP # This is a non-standard docs job because it uses SCP instead of FTP
- job: - job:
name: ci-docs name: ci-docs
node: precise node: bare-precise
builders: builders:
- gerrit-git-prep - gerrit-git-prep
@ -47,7 +47,7 @@
- job: - job:
name: gate-ci-docs name: gate-ci-docs
node: precise node: bare-precise
builders: builders:
- gerrit-git-prep - gerrit-git-prep

View File

@ -109,6 +109,12 @@ jobs:
parameter-function: set_log_url parameter-function: set_log_url
- name: ^.*(dsvm|devstack-vm).*$ - name: ^.*(dsvm|devstack-vm).*$
parameter-function: single_use_node parameter-function: single_use_node
- name: gate-config-layout
parameter-function: single_use_node
- name: ci-docs
parameter-function: single_use_node
- name: gate-ci-docs
parameter-function: single_use_node
- name: ^(gate|check)-tempest-dsvm-neutron-pg$ - name: ^(gate|check)-tempest-dsvm-neutron-pg$
branch: ^(?!stable/grizzly).*$ branch: ^(?!stable/grizzly).*$
- name: ^(gate|check)-tempest-dsvm-neutron-isolated$ - name: ^(gate|check)-tempest-dsvm-neutron-isolated$
@ -197,6 +203,7 @@ jobs:
voting: false voting: false
failure-message: Jenkins XML output has changed. failure-message: Jenkins XML output has changed.
success-message: Jenkins XML output is unchanged. success-message: Jenkins XML output is unchanged.
parameter-function: single_use_node
# Continous publishing from master of the following documentation targets: # Continous publishing from master of the following documentation targets:
- name: openstack-admin-guide-cloud - name: openstack-admin-guide-cloud
branch: ^master$ branch: ^master$

View File

@ -75,6 +75,13 @@ providers:
setup: prepare_node_devstack.sh setup: prepare_node_devstack.sh
username: jenkins username: jenkins
private-key: /home/nodepool/.ssh/id_rsa private-key: /home/nodepool/.ssh/id_rsa
- name: bare-precise
base-image: 'Ubuntu 12.04 LTS (Precise Pangolin)'
min-ram: 8192
name-filter: 'Standard'
setup: prepare_node_bare.sh
username: jenkins
private-key: /home/nodepool/.ssh/id_rsa
- name: hpcloud-az1 - name: hpcloud-az1
region-name: 'az-1.region-a.geo-1' region-name: 'az-1.region-a.geo-1'
service-type: 'compute' service-type: 'compute'
@ -186,7 +193,7 @@ targets:
credentials-id: '<%= jenkins_credentials_id %>' credentials-id: '<%= jenkins_credentials_id %>'
images: images:
- name: bare-precise - name: bare-precise
min-ready: 2 min-ready: 3
providers: providers:
- name: rax-ord - name: rax-ord
- name: devstack-precise - name: devstack-precise
@ -213,6 +220,10 @@ targets:
apikey: '<%= jenkins_api_key %>' apikey: '<%= jenkins_api_key %>'
credentials-id: '<%= jenkins_credentials_id %>' credentials-id: '<%= jenkins_credentials_id %>'
images: images:
- name: bare-precise
min-ready: 3
providers:
- name: rax-ord
- name: devstack-precise - name: devstack-precise
min-ready: 20 min-ready: 20
providers: providers: