Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Apex: Fix deployment detecting snapshot type
[releng.git]
/
jjb
/
apex
/
apex.yaml.j2
diff --git
a/jjb/apex/apex.yaml.j2
b/jjb/apex/apex.yaml.j2
index
1b8c09c
..
451274c
100644
(file)
--- a/
jjb/apex/apex.yaml.j2
+++ b/
jjb/apex/apex.yaml.j2
@@
-158,7
+158,7
@@
- logrotate-default
- build-blocker:
use-build-blocker: false
- logrotate-default
- build-blocker:
use-build-blocker: false
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
blocking-jobs:
- 'apex-deploy.*'
- throttle:
blocking-jobs:
- 'apex-deploy.*'
- throttle:
@@
-235,7
+235,7
@@
- logrotate-default
- build-blocker:
use-build-blocker: true
- logrotate-default
- build-blocker:
use-build-blocker: true
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
blocking-jobs:
- 'apex-deploy.*'
- 'functest.*'
blocking-jobs:
- 'apex-deploy.*'
- 'functest.*'
@@
-291,7
+291,7
@@
- logrotate-default
- build-blocker:
use-build-blocker: true
- logrotate-default
- build-blocker:
use-build-blocker: true
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
blocking-jobs:
- 'apex-runner.*'
- 'apex-run.*'
blocking-jobs:
- 'apex-runner.*'
- 'apex-run.*'
@@
-387,7
+387,7
@@
- logrotate-default
- build-blocker:
use-build-blocker: true
- logrotate-default
- build-blocker:
use-build-blocker: true
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
@@
-491,7
+491,7
@@
- logrotate-default
- build-blocker:
use-build-blocker: true
- logrotate-default
- build-blocker:
use-build-blocker: true
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
@@
-607,7
+607,7
@@
- logrotate-default
- build-blocker:
use-build-blocker: true
- logrotate-default
- build-blocker:
use-build-blocker: true
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
blocking-jobs:
- 'apex-daily.*'
blocking-jobs:
- 'apex-daily.*'
@@
-741,7
+741,7
@@
properties:
- build-blocker:
use-build-blocker: true
properties:
- build-blocker:
use-build-blocker: true
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
@@
-764,7
+764,7
@@
- name: 'apex-deploy-virtual-{stream}'
current-parameters: true
predefined-parameters: |
- name: 'apex-deploy-virtual-{stream}'
current-parameters: true
predefined-parameters: |
- DEPLOY_SCENARIO=os-{sdn}-{os_scenario}-{topology}
+ DEPLOY_SCENARIO=os-{sdn}-{os_scenario}-{topology}
-{snap_type}
OPNFV_CLEAN=yes
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
OPNFV_CLEAN=yes
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
@@
-792,9
+792,9
@@
- name: cperf-apex-csit-master
predefined-parameters: |
ODL_BRANCH=$ODL_BRANCH
- name: cperf-apex-csit-master
predefined-parameters: |
ODL_BRANCH=$ODL_BRANCH
- RC_FILE_PATH=/tmp/
csit
/overcloudrc
- NODE_FILE_PATH=/tmp/
csit
/node.yaml
- SSH_KEY_PATH=/tmp/
csit
/id_rsa
+ RC_FILE_PATH=/tmp/
snap
/overcloudrc
+ NODE_FILE_PATH=/tmp/
snap
/node.yaml
+ SSH_KEY_PATH=/tmp/
snap
/id_rsa
ODL_CONTAINERIZED=true
OS_VERSION=$OS_VERSION
SKIP_CSIT=$FORCE_PROMOTE
ODL_CONTAINERIZED=true
OS_VERSION=$OS_VERSION
SKIP_CSIT=$FORCE_PROMOTE
@@
-886,7
+886,7
@@
properties:
- build-blocker:
use-build-blocker: true
properties:
- build-blocker:
use-build-blocker: true
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-deploy.*'
blocking-jobs:
- 'apex-verify.*'
- 'apex-deploy.*'
@@
-992,7
+992,7
@@
- logrotate-default
- build-blocker:
use-build-blocker: true
- logrotate-default
- build-blocker:
use-build-blocker: true
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
@@
-1061,7
+1061,7
@@
- logrotate-default
- build-blocker:
use-build-blocker: true
- logrotate-default
- build-blocker:
use-build-blocker: true
- block-level: 'NODE'
+ block
ing
-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'
blocking-jobs:
- 'apex-verify.*'
- 'apex-runner.*'