Add jenkins param to use featuresBoot (or not)

This should only add a parameter and default everything to
'True' so there will be no functional changes to the jobs.

This is to prepare for the next step which will stop
the netvirt csit from installing with featuresBoot in
order to let those jobs install from the karaf console.

Change-Id: I1ed9c28b3360a14286c6d512cabe3db7a696e531
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 40f75ed4bdeda1c5eaec681e9d1b674e81828c9d..7fa75f3c2237bc3ea33786be0c4d7db235754c1b 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -123,6 +123,14 @@
           default: '{branch}'
           description: 'Integration Patch Refspec'
 
+- parameter:
+    name: integration-use-features-boot
+    parameters:
+      - string:
+          name: USEFEATURESBOOT
+          default: '{use-features-boot}'
+          description: 'Boolean to toggle whether featuresBoot is appended or ignored'
+
 # Macro: integration-gerrit-scm
 # Operation: this macro downloads a project gerrit
 # Used by: all csit jobs

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 0f914ffdad19f077464a4ab7f4b4604f548fd1e5..0dfaffd57c393e1058a7a01bb4c0af52c3d19e14 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -26,6 +26,7 @@
 # integration-stream-test-plan: stream specific robot test plan ($STREAMTESTPLAN)
 # integration-test-plan: fallback robot test plan ($TESTPLAN)
 # integration-patch-refspec: test branch ($PATCHREFSPEC)
+# integration-use-features-boot: bool to toggle use of featuresBoot ($USEFEATURESBOOT)
 
 
 # New templates
@@ -68,7 +69,8 @@
           jdkversion: '{verify-jdkversion}'
       - distribution-karaf-version:
           karaf-version: '{verify-karaf-version}'
-
+      - integration-use-features-boot:
+          use-features-boot: 'True'
     scm:
       - integration-gerrit-scm:
           basedir: 'test'
@@ -157,6 +159,8 @@
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: 'True'
 
     scm:
       - integration-gerrit-scm:
@@ -272,6 +276,8 @@
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: 'True'
 
     scm:
       - integration-gerrit-scm:
@@ -492,6 +498,8 @@
           jdkversion: '{verify-jdkversion}'
       - distribution-karaf-version:
           karaf-version: '{verify-karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: 'True'
 
     scm:
       - integration-gerrit-scm:
@@ -581,6 +589,8 @@
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: 'True'
 
     scm:
       - integration-gerrit-scm:
@@ -690,6 +700,8 @@
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: 'True'
 
     scm:
       - integration-gerrit-scm:
@@ -801,6 +813,8 @@
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: 'True'
 
     scm:
       - integration-gerrit-scm:
@@ -1025,6 +1039,8 @@
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: '{use-features-boot}'
       - string:
           name: OPENSTACK_BRANCH
           default: '{openstack-branch}'
@@ -1222,6 +1238,8 @@
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: '{use-features-boot}'
       - string:
           name: OPENSTACK_BRANCH
           default: '{openstack-branch}'

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 8e3a4ac18c06d4b4cedd3c457961b334d95d0ae2..da0c1e428b24ff3e22468b8508af5d6472202ddc 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -7,6 +7,7 @@
     project: 'netvirt'
     stream: 'oxygen'
     branch: 'master'
+    use-features-boot: 'False'
 
     topology:
       - 1node:
@@ -67,6 +68,7 @@
     project: 'netvirt'
     stream: 'nitrogen'
     branch: 'stable/nitrogen'
+    use-features-boot: 'False'
 
     topology:
       - 1node:
@@ -131,6 +133,7 @@
     stream: 'carbon'
     branch: 'stable/carbon'
     karaf-version: karaf3
+    use-features-boot: 'False'
 
     topology:
       - 1node:

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 74eb730a2fcca9ed0bebe4888209c1de4936d563..b685c17f2eaee0ab6506abf12da943b87e4ae3f7 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -15,6 +15,7 @@
     odl_system_flavor: v1-performance-8
     openstack_system_flavor: v1-performance-8
     openstack_system2_flavor: v1-performance-4
+    use-features-boot: 'False'
 
     topology:
       - 1node:
@@ -73,6 +74,7 @@
     odl_system_flavor: v1-performance-8
     openstack_system_flavor: v1-performance-8
     openstack_system2_flavor: v1-performance-4
+    use-features-boot: 'False'
 
     topology:
       - 1node:
@@ -132,6 +134,7 @@
     odl_system_flavor: v1-performance-8
     openstack_system_flavor: v1-performance-8
     openstack_system2_flavor: v1-performance-4
+    use-features-boot: 'False'
 
     topology:
       - 1node:
@@ -177,6 +180,7 @@
     security-group-mode: 'stateful'
     odl_system_flavor: v1-performance-4
     openstack_system2_flavor: v1-performance-2
+    use-features-boot: 'False'
 
     topology:
       - 1node:

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 2f1e0251232cf8b5220c1c515a31bbf0201539e1..df1ed0961d7147ebb3b8e12762f67b83b37adb04 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -6,6 +6,7 @@
 
     karaf-version: karaf4
     build-days-to-keep: 30
+    use-features-boot: 'True'
 
     # Timeout in minutes
     build-timeout: 360