tripleo: replace periodic tempest job to use quickstart

Renaming job to periodic-tripleo-ci-centos-7-ovb-nonha-tempest-oooq as
we prefer to test nonha deployment, and we are switching to use
quickstart (oooq)
Added timeout as a variable for default job template, set to the default
of 180 on all existing jobs, set to 300 in tempest job to fit ~2h
installation time + ~3h full tempest

Depends-On: I3084e020e6997efd804306b3350dc9752cda549e
Change-Id: I1a1da54b15d2c8e730e081647d6f656c58db243f
This commit is contained in:
Gabriele Cerami 2017-01-16 12:07:16 +01:00
parent 6c8843dd4b
commit 4615d3e576
3 changed files with 53 additions and 9 deletions

View File

@ -13986,6 +13986,7 @@
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: default
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-ha'
suffix: ''
@ -13993,6 +13994,7 @@
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: default
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-updates'
suffix: '-nv'
@ -14000,6 +14002,7 @@
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: default
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-nonha-convergence'
suffix: ''
@ -14007,6 +14010,7 @@
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: default
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-nonha'
suffix: ''
@ -14014,6 +14018,7 @@
node: 'tripleo-centos-7'
trigger: 'periodic'
branch-override: default
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-ha'
suffix: ''
@ -14021,6 +14026,7 @@
node: 'tripleo-centos-7'
trigger: 'periodic'
branch-override: default
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-updates'
suffix: ''
@ -14028,6 +14034,7 @@
node: 'tripleo-centos-7'
trigger: 'periodic'
branch-override: default
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-ha-newton'
suffix: ''
@ -14035,6 +14042,7 @@
node: 'tripleo-centos-7'
trigger: 'periodic'
branch-override: stable/newton
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-ha-mitaka'
suffix: ''
@ -14042,13 +14050,7 @@
node: 'tripleo-centos-7'
trigger: 'periodic'
branch-override: stable/mitaka
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-ha-tempest'
suffix: ''
type: 'periodic-ovb-ha-tempest'
node: 'tripleo-centos-7'
trigger: 'periodic'
branch-override: default
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-promote-ovb-ha'
suffix: ''
@ -14056,6 +14058,7 @@
node: 'tripleo-centos-7'
trigger: 'periodic'
branch-override: default
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-promote-ovb-nonha'
suffix: ''
@ -14063,6 +14066,16 @@
node: 'tripleo-centos-7'
trigger: 'periodic'
branch-override: default
timeout: 180
# periodic job for testing quickstart with full tempest
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-nonha-tempest-oooq'
suffix: ''
type: 'periodic-ovb-nonha-tempest-oooq'
node: 'tripleo-centos-7'
trigger: 'periodic'
branch-override: default
timeout: 300
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-ha-tempest'
suffix: ''
@ -14070,6 +14083,7 @@
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: default
timeout: 180
# check job for multinode
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-nonha-multinode'
@ -14078,6 +14092,7 @@
node: 'centos-7-2-node'
trigger: 'gate'
branch-override: default
timeout: 180
# non-voting job for multinode with 3 nodes
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-3nodes-multinode'
@ -14086,6 +14101,7 @@
node: 'centos-7-3-node'
trigger: 'gate'
branch-override: default
timeout: 180
# Experimental scenario for multinode with 4 nodes
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-scenario005-multinode'
@ -14094,6 +14110,7 @@
node: 'centos-7-4-node'
trigger: 'gate'
branch-override: default
timeout: 180
# non-voting check job for multinode
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-nonha-multinode'
@ -14102,6 +14119,7 @@
node: 'centos-7-2-node'
trigger: 'gate'
branch-override: default
timeout: 180
# undercloud-only job
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-undercloud'
@ -14110,6 +14128,7 @@
node: 'centos-7'
trigger: 'gate'
branch-override: default
timeout: 180
# Experimental containerized undercloud-only job
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-undercloud-containers'
@ -14118,6 +14137,7 @@
node: 'centos-7'
trigger: 'gate'
branch-override: default
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-scenario001-multinode'
suffix: ''
@ -14125,6 +14145,7 @@
node: 'centos-7-2-node'
trigger: 'gate'
branch-override: default
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-scenario002-multinode'
suffix: ''
@ -14132,6 +14153,7 @@
node: 'centos-7-2-node'
trigger: 'gate'
branch-override: default
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-scenario003-multinode'
suffix: ''
@ -14139,6 +14161,7 @@
node: 'centos-7-2-node'
trigger: 'gate'
branch-override: default
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-scenario004-multinode'
suffix: ''
@ -14146,6 +14169,7 @@
node: 'centos-7-2-node'
trigger: 'gate'
branch-override: default
timeout: 180
# (emilien) Duplicate scenarioXXX-multinode because
# this job only runs when touching some specific files.
# But Zuul v2.5 doesn't allow us to also run the jobs for
@ -14159,6 +14183,7 @@
node: 'centos-7-2-node'
trigger: 'gate'
branch-override: default
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-scenario001-multinode'
suffix: '-puppet-nv'
@ -14166,6 +14191,7 @@
node: 'centos-7-2-node'
trigger: 'gate'
branch-override: default
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-scenario002-multinode'
suffix: '-puppet'
@ -14173,6 +14199,7 @@
node: 'centos-7-2-node'
trigger: 'gate'
branch-override: default
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-scenario003-multinode'
suffix: '-puppet'
@ -14180,6 +14207,7 @@
node: 'centos-7-2-node'
trigger: 'gate'
branch-override: default
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-scenario004-multinode'
suffix: '-puppet'
@ -14187,6 +14215,7 @@
node: 'centos-7-2-node'
trigger: 'gate'
branch-override: default
timeout: 180
# non-voting job for undercloud-only upgrade job
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-undercloud-upgrades'
@ -14195,6 +14224,7 @@
node: 'centos-7'
trigger: 'gate'
branch-override: default
timeout: 180
# non-voting job for overcloud update job
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-nonha-multinode-updates'
@ -14203,6 +14233,7 @@
node: 'centos-7-2-node'
trigger: 'gate'
branch-override: default
timeout: 180
# non-voting job for overcloud upgrade job
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-multinode-upgrades'
@ -14211,6 +14242,7 @@
node: 'centos-7-2-node'
trigger: 'gate'
branch-override: default
timeout: 180
# experimental job for ipv6 testing on HA scenario.
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-ha-ipv6'
@ -14219,6 +14251,7 @@
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: default
timeout: 180
# experimental job for testing TLS CA server on "fake" HA
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-fakeha-caserver'
@ -14227,6 +14260,7 @@
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: default
timeout: 180
# experimental job for testing quickstart with HA
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-ha-oooq'
@ -14235,6 +14269,7 @@
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: default
timeout: 180
# experimental job for testing quickstart with non HA
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-nonha-oooq'
@ -14243,6 +14278,7 @@
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: default
timeout: 180
# experimental job for testing quickstart with multinode
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-nonha-multinode-oooq'
@ -14251,6 +14287,7 @@
node: 'centos-7-2-node'
trigger: 'gate'
branch-override: default
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-containers-oooq'
suffix: ''
@ -14258,6 +14295,7 @@
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: default
timeout: 180
# tripleo-ci is branchless, so we need to test changes against all the
# stable branches as well.
- '{trigger}-tripleo-ci-{jobname}{suffix}':
@ -14267,6 +14305,7 @@
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: 'stable/newton'
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-nonha-mitaka'
suffix: ''
@ -14274,6 +14313,7 @@
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: 'stable/mitaka'
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-ha-mitaka'
suffix: ''
@ -14281,6 +14321,7 @@
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: 'stable/mitaka'
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-ha-newton'
suffix: ''
@ -14288,6 +14329,7 @@
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: 'stable/newton'
timeout: 180
# Jobs required by Puppet OpenStack CI for stable/mitaka and stable/newton
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-nonha-puppet-mitaka'
@ -14296,6 +14338,7 @@
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: 'stable/mitaka'
timeout: 180
- '{trigger}-tripleo-ci-{jobname}{suffix}':
jobname: 'centos-7-ovb-nonha-puppet-newton'
suffix: ''
@ -14303,6 +14346,7 @@
node: 'tripleo-centos-7'
trigger: 'gate'
branch-override: 'stable/newton'
timeout: 180
- project:
name: tripleo-common

View File

@ -135,7 +135,7 @@
wrappers:
- build-timeout:
timeout: 180
timeout: {timeout}
- timestamps
builders:

View File

@ -5008,7 +5008,7 @@ projects:
- periodic-tripleo-ci-centos-7-promote-ovb-nonha
- periodic-tripleo-ci-centos-7-ovb-ha-mitaka
- periodic-tripleo-ci-centos-7-ovb-ha-newton
- periodic-tripleo-ci-centos-7-ovb-ha-tempest
- periodic-tripleo-ci-centos-7-ovb-nonha-tempest-oooq
experimental:
- gate-tripleo-ci-centos-7-nonha-multinode-oooq-nv
- gate-tripleo-ci-centos-7-multinode-upgrades-nv