diff options
| author |   xudan <xudan16@huawei.com> | 2017-07-24 03:04:01 -0400 |
|---|---|---|
| committer | xudan <xudan16@huawei.com> | 2017-07-24 03:04:01 -0400 |
| commit | 45899e46e955333c0bbf824a7955022d7e254eea (patch) | |
| tree | e0fd57d66176686efa3bec78f74692ef9c4f833f | |
| parent | 5546db4ff1d6242250fa2b878e841c16c3be6637 (diff) | |
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>
| -rw-r--r-- | jjb/apex/apex.yml | 2 | ||||
| -rw-r--r-- | jjb/apex/apex.yml.j2 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 0123d755a..fd4dc9ff5 100644 --- 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 7466a8301..d7b67c344 100644 --- 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: |