diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-05-18 15:50:11 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2017-05-18 15:50:11 -0400 |
| commit | 42e2fa61a4437fadd2884ca20952c5db38a06ef3 (patch) | |
| tree | 33f1a74fde7cb6d31f73fd069d1ce0c32451ee15 | |
| parent | 67fab8844c12845e9948c565b1a2ce24b83360d1 (diff) | |
Apex: fix daily scm passing and yardstick deploy blocking
Change-Id: I5b8fd2784cbf78aec17bab89c9cd1cbf82324739
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rw-r--r-- | jjb/apex/apex.yml | 13 | ||||
| -rw-r--r-- | jjb/apex/apex.yml.j2 | 7 |
2 files changed, 11 insertions, 9 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index de485eb89..f4919e4ad 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -529,6 +529,7 @@ blocking-jobs: - 'apex-deploy.*' - 'functest.*' + - 'yardstick.*' - throttle: max-per-node: 1 max-total: 10 @@ -637,7 +638,7 @@ disabled: false scm: - - git-scm-gerrit + - git-scm parameters: - '{project}-defaults' @@ -663,7 +664,7 @@ current-parameters: false predefined-parameters: | GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_REFSPEC='' GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE node-parameters: true @@ -679,7 +680,7 @@ predefined-parameters: | BUILD_DIRECTORY=apex-build-danube/.build GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_REFSPEC='' GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE node-parameters: true @@ -968,7 +969,7 @@ disabled: false scm: - - git-scm-gerrit + - git-scm parameters: - '{project}-defaults' @@ -994,7 +995,7 @@ current-parameters: false predefined-parameters: | GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_REFSPEC='' GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE node-parameters: true @@ -1010,7 +1011,7 @@ predefined-parameters: | BUILD_DIRECTORY=apex-build-master/.build GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_REFSPEC='' GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE node-parameters: true diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index 4334e5a5d..2466c848a 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -529,6 +529,7 @@ blocking-jobs: - 'apex-deploy.*' - 'functest.*' + - 'yardstick.*' - throttle: max-per-node: 1 max-total: 10 @@ -637,7 +638,7 @@ disabled: false scm: - - git-scm-gerrit + - git-scm parameters: - '{project}-defaults' @@ -663,7 +664,7 @@ current-parameters: false predefined-parameters: | GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_REFSPEC='' GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE node-parameters: true @@ -679,7 +680,7 @@ predefined-parameters: | BUILD_DIRECTORY=apex-build-{{ stream }}/.build GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC + GERRIT_REFSPEC='' GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE node-parameters: true |