diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-12-08 19:33:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-08 19:33:32 +0000 |
| commit | 3f84461f80baa8c0c039071678523e03e2d4651c (patch) | |
| tree | fd2531d1d89aaaf0e851cc9ae8218a3b5f7c33f4 /jjb | |
| parent | c8063f1a9ed95e184fe93fdd61b0b537d83e7fce (diff) | |
| parent | 587d33f4dfc291d0adb80b4eb5b79745fd6ca974 (diff) | |
Merge "enable dovetail to run on APEX bgpvpn scenario"
Diffstat (limited to 'jjb')
| -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 43e234ce1..eadfbf9ee 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -543,7 +543,7 @@ predefined-parameters: DEPLOY_SCENARIO=$DEPLOY_SCENARIO kill-phase-on: NEVER - enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/" + enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/" abort-all-job: false git-revision: false - multijob: diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index 6cd9de282..f49c7fa1a 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -419,7 +419,7 @@ predefined-parameters: DEPLOY_SCENARIO=$DEPLOY_SCENARIO kill-phase-on: NEVER - enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|nosdn-kvm|odl_l3-fdio)-ha/" + enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/" abort-all-job: false git-revision: false - multijob: |