From: Tim Rozet Date: Tue, 29 May 2018 21:37:41 +0000 (-0400) Subject: Apex: Changes default verify scenario to nosdn X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e20fc538ed2fd242d0db1518289e6be4a2829681;p=releng.git Apex: Changes default verify scenario to nosdn Basically we are getting blocked on merging patches due to ODL breaking and these patches have nothing to do with ODL. So we are changing the default sceanrio to just be nosdn, and then if the change is relatd to ODL we can include an ODL gate run. Change-Id: I61ec224e62e6f3cb6ee40696326bf243788c27d6 Signed-off-by: Tim Rozet --- diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 15ab7e881..e61c0bf9d 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -25,7 +25,7 @@ build-slave: 'apex-build-master' virtual-slave: 'apex-virtual-master' baremetal-slave: 'apex-baremetal-master' - verify-scenario: 'os-odl-nofeature-ha' + verify-scenario: 'os-nosdn-nofeature-ha' scenario_stream: 'master' disable_daily: false disable_promote: false @@ -35,7 +35,7 @@ build-slave: 'apex-build-master' virtual-slave: 'apex-virtual-master' baremetal-slave: 'apex-baremetal-master' - verify-scenario: 'os-odl-nofeature-ha' + verify-scenario: 'os-nosdn-nofeature-ha' scenario_stream: 'fraser' disable_daily: false disable_promote: true diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 533781ec3..34611a75a 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -25,7 +25,7 @@ build-slave: 'apex-build-master' virtual-slave: 'apex-virtual-master' baremetal-slave: 'apex-baremetal-master' - verify-scenario: 'os-odl-nofeature-ha' + verify-scenario: 'os-nosdn-nofeature-ha' scenario_stream: 'master' disable_daily: false disable_promote: false @@ -35,7 +35,7 @@ build-slave: 'apex-build-master' virtual-slave: 'apex-virtual-master' baremetal-slave: 'apex-baremetal-master' - verify-scenario: 'os-odl-nofeature-ha' + verify-scenario: 'os-nosdn-nofeature-ha' scenario_stream: 'fraser' disable_daily: false disable_promote: true