diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-06-15 19:34:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-06-15 19:34:07 +0000 |
| commit | c31bf107ee40aa74582ffdbfa1d868e3b0b708e4 (patch) | |
| tree | b0f04582eda289659c9cb7ee72f92bddfbf3a0f1 /jjb | |
| parent | 6dd3fcc928d7540c9d725b0bd8b3c72b863eb819 (diff) | |
| parent | d716be206604971c598eb393b60555ebc7df4c84 (diff) | |
Merge "[Dovetail] Increase frequency of Dovetail runs on Apex"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/apex/apex.yaml | 6 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index bb5b53d6d..c84f7f865 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -623,8 +623,7 @@ predefined-parameters: DEPLOY_SCENARIO=$DEPLOY_SCENARIO kill-phase-on: NEVER - enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/ - && $BUILD_NUMBER % 2 == 1" + enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/" abort-all-job: false git-revision: false - multijob: @@ -637,8 +636,7 @@ predefined-parameters: DEPLOY_SCENARIO=$DEPLOY_SCENARIO kill-phase-on: NEVER - enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/ - && $BUILD_NUMBER % 2 == 0" + 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.yaml.j2 b/jjb/apex/apex.yaml.j2 index 3397f1ed2..e7d592254 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -503,8 +503,7 @@ predefined-parameters: DEPLOY_SCENARIO=$DEPLOY_SCENARIO kill-phase-on: NEVER - enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/ - && $BUILD_NUMBER % 2 == 1" + enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/" abort-all-job: false git-revision: false - multijob: @@ -517,8 +516,7 @@ predefined-parameters: DEPLOY_SCENARIO=$DEPLOY_SCENARIO kill-phase-on: NEVER - enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/ - && $BUILD_NUMBER % 2 == 0" + enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/" abort-all-job: false git-revision: false - multijob: |