Merge "Use a job-template for the tripleo jobs"

This commit is contained in:
Jenkins
2014-12-09 17:56:43 +00:00
committed by Gerrit Code Review
2 changed files with 26 additions and 160 deletions

View File

@@ -256,6 +256,26 @@
node: 'devstack-precise || devstack-trusty'
branch-designator: '-nv'
branch-override: default
- 'check-tripleo-{jobname}':
jobname: 'ironic-overcloud-f20-nonha'
type: 'overcloud-f20-nonha'
node: 'tripleo-f20'
- 'check-tripleo-{jobname}':
jobname: 'ironic-overcloud-precise-ha'
type: 'overcloud-precise-ha'
node: 'tripleo-precise'
- 'check-tripleo-{jobname}':
jobname: 'ironic-overcloud-precise-nonha'
type: 'overcloud-precise-nonha'
node: 'tripleo-precise'
- 'check-tripleo-{jobname}':
jobname: 'ironic-undercloud-precise-nonha'
type: 'undercloud-precise-nonha'
node: 'tripleo-precise'
- 'check-tripleo-{jobname}':
jobname: 'ironic-vlan-precise-nonha'
type: 'vlan-precise-nonha'
node: 'tripleo-precise'
- project:
name: ironic-specs

View File

@@ -1,44 +1,6 @@
- job:
name: 'check-tripleo-ironic-undercloud-precise-nonha'
node: 'tripleo-precise'
wrappers:
- build-timeout:
timeout: 125
- timestamps
builders:
- link-logs
- net-info
- devstack-checkout
- shell: |
#!/bin/bash -xe
export TOCI_JOBTYPE=undercloud-precise-nonha
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_EXERCISES=0
sudo chown -hR $(whoami) /opt/git
function gate_hook {
bash -xe /opt/stack/new/tripleo-ci/toci_gate_test.sh
}
export -f gate_hook
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
publishers:
- scp:
site: 'static.openstack.org'
files:
- target: 'logs/$LOG_PATH'
source: 'logs/**'
keep-hierarchy: true
copy-after-failure: true
- console-log
- job:
name: 'check-tripleo-ironic-overcloud-precise-nonha'
node: 'tripleo-precise'
- job-template:
name: 'check-tripleo-{jobname}'
node: '{node}'
wrappers:
- build-timeout:
@@ -51,131 +13,15 @@
- devstack-checkout
- shell: |
#!/bin/bash -xe
export TOCI_JOBTYPE=overcloud-precise-nonha
export TOCI_JOBTYPE={type}
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=170
export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_EXERCISES=0
sudo chown -hR $(whoami) /opt/git
function gate_hook {
function gate_hook {{
bash -xe /opt/stack/new/tripleo-ci/toci_gate_test.sh
}
export -f gate_hook
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
publishers:
- scp:
site: 'static.openstack.org'
files:
- target: 'logs/$LOG_PATH'
source: 'logs/**'
keep-hierarchy: true
copy-after-failure: true
- console-log
- job:
name: 'check-tripleo-ironic-overcloud-f20-nonha'
node: 'tripleo-f20'
wrappers:
- build-timeout:
timeout: 175
- timestamps
builders:
- link-logs
- net-info
- devstack-checkout
- shell: |
#!/bin/bash -xe
export TOCI_JOBTYPE=overcloud-f20-nonha
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=170
export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_EXERCISES=0
sudo chown -hR $(whoami) /opt/git
function gate_hook {
bash -xe /opt/stack/new/tripleo-ci/toci_gate_test.sh
}
export -f gate_hook
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
publishers:
- scp:
site: 'static.openstack.org'
files:
- target: 'logs/$LOG_PATH'
source: 'logs/**'
keep-hierarchy: true
copy-after-failure: true
- console-log
# This job is aiming to become:
# check-tripleo-ironic-undercloud-overcloud-precise-ha-reboot
- job:
name: 'check-tripleo-ironic-overcloud-precise-ha'
node: 'tripleo-precise'
wrappers:
- build-timeout:
timeout: 175
- timestamps
builders:
- link-logs
- net-info
- devstack-checkout
- shell: |
#!/bin/bash -xe
export TOCI_JOBTYPE=overcloud-precise-ha
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=170
export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_EXERCISES=0
sudo chown -hR $(whoami) /opt/git
function gate_hook {
bash -xe /opt/stack/new/tripleo-ci/toci_gate_test.sh
}
export -f gate_hook
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
publishers:
- scp:
site: 'static.openstack.org'
files:
- target: 'logs/$LOG_PATH'
source: 'logs/**'
keep-hierarchy: true
copy-after-failure: true
- console-log
- job:
name: 'check-tripleo-ironic-vlan-precise-nonha'
node: 'tripleo-precise'
wrappers:
- build-timeout:
timeout: 145
- timestamps
builders:
- link-logs
- net-info
- devstack-checkout
- shell: |
#!/bin/bash -xe
export TOCI_JOBTYPE=vlan-precise-nonha
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=140
export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_EXERCISES=0
sudo chown -hR $(whoami) /opt/git
function gate_hook {
bash -xe /opt/stack/new/tripleo-ci/toci_gate_test.sh
}
}}
export -f gate_hook
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh