From c295e79e48948dc1f62df333ca5643d7ac14020e Mon Sep 17 00:00:00 2001 From: Vanessa Rene Valderrama Date: Tue, 28 Feb 2017 12:47:15 -0600 Subject: [PATCH] Configure NSH_SFC JDK Jenkins 2 moved the JDK configuration to a new Jenkins global configuration page under Manage Jenkins - Global Tool Configuration. This patch configures NSH_SFC jobs to run using a specified JDK as configuration via the Jenkins Global Configuration. Valid values are: - openjdk7-centos7 - openjdk8-centos8 - openjdk7-ubuntu1404 - openjdk8-ubuntu1404 - openjdk7-ubuntu1604 - openjdk8-ubuntu1604 This patch configures the following templates to run using JDK8: - 'nsh_sfc-verify-{stream}-{os}' - 'nsh_sfc-merge-{stream}-{os}' - 'nsh_sfc-integration-{stream}-{os}' - 'nsh_sfc-verify-docs-{stream}' - 'nsh_sfc-merge-docs-{stream}' The verify docs don't use the {os} parameter so the OS is hardcoded like the node names. Change-Id: I6475877e2a8b8241add7416d0c4fe15b71706429 Signed-off-by: Vanessa Rene Valderrama --- jjb/nsh_sfc/nsh_sfc.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml index 5aa309531..ed992607f 100644 --- a/jjb/nsh_sfc/nsh_sfc.yaml +++ b/jjb/nsh_sfc/nsh_sfc.yaml @@ -33,6 +33,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' concurrent: true + jdk: openjdk8-{os} logrotate: daysToKeep: '{build-days-to-keep}' @@ -182,6 +183,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' + jdk: openjdk8-{os} logrotate: daysToKeep: '{build-days-to-keep}' @@ -250,6 +252,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' + jdk: openjdk8-{os} logrotate: daysToKeep: '{build-days-to-keep}' @@ -322,6 +325,7 @@ project-type: freestyle node: ubuntu1604-basebuild-4c-4g concurrent: true + jdk: openjdk8-ubuntu1604 logrotate: daysToKeep: '{build-days-to-keep}' @@ -378,6 +382,7 @@ project-type: freestyle node: ubuntu1604-basebuild-4c-4g concurrent: true + jdk: openjdk8-{os} logrotate: daysToKeep: '{build-days-to-keep}' -- 2.16.6