summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-08-20 18:38:18 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-08-20 18:38:18 +0000
commitaa8d5f7d998c155381c955597171449db22fd2ac (patch)
tree8fdc8e51311f9afd6db5793ca1d1bf5af5f5d5d7
parentd409853531925fa77ad902af24522a00e4415f6f (diff)
parent5785714e5650b727b4e9658812338e6b9697e93c (diff)
Merge "Apex: Add nosdn ipv6 to daily"
-rw-r--r--jjb/apex/apex-jjb-renderer.py4
-rw-r--r--jjb/apex/apex.yaml20
-rw-r--r--jjb/apex/scenarios.yaml.hidden2
3 files changed, 25 insertions, 1 deletions
diff --git a/jjb/apex/apex-jjb-renderer.py b/jjb/apex/apex-jjb-renderer.py
index 0da47b518..58dc4fff9 100644
--- a/jjb/apex/apex-jjb-renderer.py
+++ b/jjb/apex/apex-jjb-renderer.py
@@ -20,7 +20,8 @@ def render_jjb():
gspathname = dict()
branch = dict()
build_slave = dict()
- env = Environment(loader=FileSystemLoader('./'), autoescape=True)
+ env = Environment(loader=FileSystemLoader('./'), autoescape=True,
+ keep_trailing_newline=True)
with open('scenarios.yaml.hidden') as _:
scenarios = yaml.safe_load(_)
@@ -45,5 +46,6 @@ def render_jjb():
with open('./apex.yaml', 'w') as fh:
fh.write(output)
+
if __name__ == "__main__":
render_jjb()
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index b20c469bf..5d5afc1c9 100644
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -123,6 +123,8 @@
<<: *master
- 'os-nosdn-nofeature-ha':
<<: *master
+ - 'os-nosdn-nofeature-ha-ipv6':
+ <<: *master
- 'os-odl-nofeature-noha':
<<: *master
- 'os-odl-nofeature-ha':
@@ -131,6 +133,8 @@
<<: *master
- 'os-nosdn-queens-ha':
<<: *master
+ - 'os-nosdn-queens-ha-ipv6':
+ <<: *master
- 'os-odl-queens-noha':
<<: *master
- 'os-odl-queens-ha':
@@ -1490,6 +1494,14 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
+ - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-master'
+ node-parameters: false
+ current-parameters: false
+ predefined-parameters: |
+ OPNFV_CLEAN=yes
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
- name: 'apex-os-odl-nofeature-noha-baremetal-master'
node-parameters: false
current-parameters: false
@@ -1522,6 +1534,14 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
+ - name: 'apex-os-nosdn-queens-ha-ipv6-baremetal-master'
+ node-parameters: false
+ current-parameters: false
+ predefined-parameters: |
+ OPNFV_CLEAN=yes
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
- name: 'apex-os-odl-queens-noha-baremetal-master'
node-parameters: false
current-parameters: false
diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden
index 13449aa90..f297af75d 100644
--- a/jjb/apex/scenarios.yaml.hidden
+++ b/jjb/apex/scenarios.yaml.hidden
@@ -1,10 +1,12 @@
master:
- 'os-nosdn-nofeature-noha'
- 'os-nosdn-nofeature-ha'
+ - 'os-nosdn-nofeature-ha-ipv6'
- 'os-odl-nofeature-noha'
- 'os-odl-nofeature-ha'
- 'os-nosdn-queens-noha'
- 'os-nosdn-queens-ha'
+ - 'os-nosdn-queens-ha-ipv6'
- 'os-odl-queens-noha'
- 'os-odl-queens-ha'
- 'k8s-nosdn-nofeature-noha'