From cc6ebc086d10e708b2f33769b7e23ef6473e0542 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 27 Sep 2017 13:20:11 -0400 Subject: [PATCH] Apex: disable daily job for master Even with a timed trigger that shouldn't execute more than once a year, the apex-daily-master job is still triggering every day or so. Using an explicit disable to disable the job. Change-Id: I3b014c0d0899dba617fcb7cfee17ca758b291f9f Signed-off-by: Tim Rozet --- jjb/apex/apex.yml | 5 ++++- jjb/apex/apex.yml.j2 | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 058f18a50..6bd2248bd 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -28,6 +28,7 @@ baremetal-slave: 'apex-baremetal-master' verify-scenario: 'os-odl-nofeature-ha' scenario_stream: 'master' + disable_daily: true - euphrates: &euphrates branch: 'stable/euphrates' gs-pathname: '/euphrates' @@ -36,6 +37,7 @@ baremetal-slave: 'apex-baremetal-master' verify-scenario: 'os-odl-nofeature-ha' scenario_stream: 'euphrates' + disable_daily: false - danube: &danube branch: 'stable/danube' gs-pathname: '/danube' @@ -45,6 +47,7 @@ verify-scenario: 'os-odl_l3-nofeature-ha' scenario_stream: 'danube' disabled: true + disable_daily: true scenario: - 'os-nosdn-nofeature-noha': @@ -899,7 +902,7 @@ node: '{baremetal-slave}' - disabled: false + disabled: '{obj:disable_daily}' scm: - git-scm diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index 09c2f8cf4..6bebf3b5c 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -28,6 +28,7 @@ baremetal-slave: 'apex-baremetal-master' verify-scenario: 'os-odl-nofeature-ha' scenario_stream: 'master' + disable_daily: true - euphrates: &euphrates branch: 'stable/euphrates' gs-pathname: '/euphrates' @@ -36,6 +37,7 @@ baremetal-slave: 'apex-baremetal-master' verify-scenario: 'os-odl-nofeature-ha' scenario_stream: 'euphrates' + disable_daily: false - danube: &danube branch: 'stable/danube' gs-pathname: '/danube' @@ -45,6 +47,7 @@ verify-scenario: 'os-odl_l3-nofeature-ha' scenario_stream: 'danube' disabled: true + disable_daily: true scenario: {%- for stream in scenarios %} @@ -769,7 +772,7 @@ node: '{baremetal-slave}' - disabled: false + disabled: '{obj:disable_daily}' scm: - git-scm -- 2.16.6