Commit 6eeec135 authored by Harald Sitter's avatar Harald Sitter

properly set iso relation + disable concurrent builds

calling properties in a jenkinsfile overrides whatever was set in the
xml. this is a problem as running a job that does it will undo the
concurrent disablement done in the tooling templates. so, we also disable
here. tooling is the default value. the values from the jenkinsfile only
get applied after first run

also properly init openqa_series to xenial unless otherwise defined
(which it should be moving forward FTR)
parent 03f1841e
......@@ -12,21 +12,22 @@ if (env.TYPE == null) {
}
}
if (env.OPENQA_SERIES == null) {
env.OPENQA_SERIES = 'xenial'
}
if (env.TYPE == null) {
error 'TYPE param not set. Cannot run install test without a type.'
}
if (env.OPENQA_SERIES == null) {
env.OPENQA_SERIES = 'xenial'
}
// WARNING: these override the XML configs when run!
properties([
disableConcurrentBuilds(),
pipelineTriggers([upstream(threshold: 'UNSTABLE',
upstreamProjects: "iso_neon_${env.OPENQA_SERIES}_${TYPE}_amd64")]),
pipelineTriggers([cron('0 H(9-22) * * *')])
])
lock(inversePrecedence: true, label: 'OPENQA_INSTALL', quantity: 1) {
fancyNode('openqa') {
try {
......
......@@ -17,13 +17,18 @@ if (env.TYPE == null) {
error 'TYPE param not set. Cannot run install test without a type.'
}
if (env.OPENQA_SERIES == null) {
env.OPENQA_SERIES = 'xenial'
}
// WARNING: these override the XML configs when run!
properties([
disableConcurrentBuilds(),
pipelineTriggers([upstream(threshold: 'UNSTABLE',
upstreamProjects: "iso_neon_xenial_${TYPE}_amd64")]),
upstreamProjects: "iso_neon_${env.OPENQA_SERIES}_${TYPE}_amd64")]),
pipelineTriggers([cron('0 H(9-22) * * *')])
])
lock(inversePrecedence: true, label: 'OPENQA_INSTALL', quantity: 1) {
fancyNode('openqa') {
try {
......
......@@ -17,9 +17,15 @@ if (env.TYPE == null) {
error 'TYPE param not set. Cannot run install test without a type.'
}
if (env.OPENQA_SERIES == null) {
env.OPENQA_SERIES = 'xenial'
}
// WARNING: these override the XML configs when run!
properties([
disableConcurrentBuilds(),
pipelineTriggers([upstream(threshold: 'UNSTABLE',
upstreamProjects: "iso_neon_xenial_${TYPE}_amd64")]),
upstreamProjects: "iso_neon_${env.OPENQA_SERIES}_${TYPE}_amd64")]),
pipelineTriggers([cron('0 H(9-22) * * *')])
])
......
......@@ -16,13 +16,18 @@ if (env.TYPE == null) {
error 'TYPE param not set. Cannot run install test without a type.'
}
if (env.OPENQA_SERIES == null) {
env.OPENQA_SERIES = 'xenial'
}
// WARNING: these override the XML configs when run!
properties([
disableConcurrentBuilds(),
pipelineTriggers([upstream(threshold: 'UNSTABLE',
upstreamProjects: "iso_neon_xenial_${TYPE}_amd64")]),
upstreamProjects: "iso_neon_${env.OPENQA_SERIES}_${TYPE}_amd64")]),
pipelineTriggers([cron('0 H(9-22) * * *')])
])
lock(inversePrecedence: true, label: 'OPENQA_INSTALL', quantity: 1) {
fancyNode('openqa') {
try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment