Bugfix: Add Apex jobs failed because of wrong regex

JIRA: DOVETAIL-470

Bug log:

https://build.opnfv.org/ci/job/apex-testsuite-os-nosdn-nofeature-ha-baremetal-master/5/console

Can't evaluate expression, false is assumed: groovy.lang.MissingPropertyException:
No such property: DEPLOY_SCENARIO for class: Script1
Skipping dovetail-apex-baremetal-proposed_tests-master. Condition was evaluated to false.

Change-Id: I8295313a3096b603bd390fdb70d451274a5146bb
Signed-off-by: xudan <xudan16@huawei.com>

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 0123d75..fd4dc9f 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -740,7 +740,7 @@
                   predefined-parameters:
                     DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                   kill-phase-on: NEVER
-                  enable-condition: "DEPLOY_SCENARIO =~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/"
+                  enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/"
                   abort-all-job: false
                   git-revision: false
         - conditional-step:

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 7466a83..d7b67c3 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -684,7 +684,7 @@
                   predefined-parameters:
                     DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                   kill-phase-on: NEVER
-                  enable-condition: "DEPLOY_SCENARIO =~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/"
+                  enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/"
                   abort-all-job: false
                   git-revision: false
         - conditional-step: