From 5785714e5650b727b4e9658812338e6b9697e93c Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Mon, 20 Aug 2018 11:43:55 -0400
Subject: Apex: Add nosdn ipv6 to daily

Adds ipv6 nosdn scenario to daily. Also includes a fix where the
trailing new line in the template would be removed and fail jjb check in
jenkins.

Change-Id: I928f7b1cf12381cb2af3a8c7e4beb8e8014451c9
Signed-off-by: Tim Rozet <trozet@redhat.com>
---
 jjb/apex/apex-jjb-renderer.py  |  4 +++-
 jjb/apex/apex.yaml             | 20 ++++++++++++++++++++
 jjb/apex/scenarios.yaml.hidden |  2 ++
 3 files changed, 25 insertions(+), 1 deletion(-)

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'
-- 
cgit 1.2.3-korg