From 319f285bde711807ff800a042a9eeeb908291329 Mon Sep 17 00:00:00 2001 From: Jamo Luhrsen Date: Wed, 3 Jan 2018 16:12:08 -0800 Subject: [PATCH] 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 --- jjb/integration/integration-macros.yaml | 8 ++++++++ jjb/integration/integration-templates.yaml | 20 ++++++++++++++++++- .../netvirt-csit-hwvtep-openstack.yaml | 3 +++ jjb/netvirt/netvirt-csit-multi-openstack.yaml | 4 ++++ jjb/releng-defaults.yaml | 1 + 5 files changed, 35 insertions(+), 1 deletion(-) diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index 40f75ed4b..7fa75f3c2 100644 --- 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 0f914ffda..0dfaffd57 100644 --- 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 8e3a4ac18..da0c1e428 100644 --- 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 74eb730a2..b685c17f2 100644 --- 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 2f1e02512..df1ed0961 100644 --- 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 -- 2.36.6