Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Nothing change to apex job to kick it into working
[releng.git]
/
jjb
/
apex
/
apex.yml.j2
diff --git
a/jjb/apex/apex.yml.j2
b/jjb/apex/apex.yml.j2
index
900002c
..
3ee91ba
100644
(file)
--- a/
jjb/apex/apex.yml.j2
+++ b/
jjb/apex/apex.yml.j2
@@
-26,7
+26,7
@@
baremetal-slave: 'apex-baremetal-master'
verify-scenario: 'os-odl-nofeature-ha'
scenario_stream: 'master'
baremetal-slave: 'apex-baremetal-master'
verify-scenario: 'os-odl-nofeature-ha'
scenario_stream: 'master'
- disable_daily:
tru
e
+ disable_daily:
fals
e
- euphrates: &euphrates
branch: 'stable/euphrates'
gs-pathname: '/euphrates'
- euphrates: &euphrates
branch: 'stable/euphrates'
gs-pathname: '/euphrates'
@@
-35,7
+35,7
@@
baremetal-slave: 'apex-baremetal-master'
verify-scenario: 'os-odl-nofeature-ha'
scenario_stream: 'euphrates'
baremetal-slave: 'apex-baremetal-master'
verify-scenario: 'os-odl-nofeature-ha'
scenario_stream: 'euphrates'
- disable_daily:
fals
e
+ disable_daily:
tru
e
- danube: &danube
branch: 'stable/danube'
gs-pathname: '/danube'
- danube: &danube
branch: 'stable/danube'
gs-pathname: '/danube'
@@
-129,8
+129,6
@@
- job-template:
name: 'apex-deploy-{platform}-{stream}'
- job-template:
name: 'apex-deploy-{platform}-{stream}'
- node: 'apex-{platform}-{stream}'
-
concurrent: true
disabled: false
concurrent: true
disabled: false
@@
-189,10
+187,10
@@
- job-template:
name: 'apex-virtual-{stream}'
- job-template:
name: 'apex-virtual-{stream}'
- node: 'apex-virtual-master'
-
project-type: 'multijob'
project-type: 'multijob'
+ concurrent: true
+
disabled: false
scm:
disabled: false
scm:
@@
-419,7
+417,7
@@
predefined-parameters:
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
kill-phase-on: NEVER
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:
abort-all-job: false
git-revision: false
- multijob:
@@
-455,8
+453,6
@@
# branch: branch (eg. stable)
project-type: 'multijob'
# branch: branch (eg. stable)
project-type: 'multijob'
- node: '{baremetal-slave}'
-
disabled: '{obj:disable_daily}'
scm:
disabled: '{obj:disable_daily}'
scm:
@@
-785,7
+781,7
@@
- string:
name: SSH_KEY
default: /root/.ssh/id_rsa
- string:
name: SSH_KEY
default: /root/.ssh/id_rsa
- description: 'SSH key to use for Apex'
+ description: 'SSH key to use for Apex
.
'
properties:
- logrotate-default
properties:
- logrotate-default
@@
-990,12
+986,12
@@
- trigger:
name: 'apex-master'
triggers:
- trigger:
name: 'apex-master'
triggers:
- - timed: '0
3 1 1 7
'
+ - timed: '0
0 1-31/2 * *
'
- trigger:
name: 'apex-euphrates'
triggers:
- trigger:
name: 'apex-euphrates'
triggers:
- - timed: '0
12 *
* *'
+ - timed: '0
0 2-30/2
* *'
- trigger:
name: 'apex-danube'
- trigger:
name: 'apex-danube'