From: Thanh Ha Date: Thu, 8 Feb 2018 02:51:46 +0000 (-0500) Subject: Rename jdk to java-version X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=8bbacda763025ffb0110b3e82281f22f7b9c9089;p=releng%2Fbuilder.git Rename jdk to java-version jdk is a keyword that is used for configuring the jdk configuration in a job. This means all templates are inheriting and trying to set this jdk regardless of if they jdk: '{jdk}' value in their configs and appears to override that value incorrectly with 'openjdk8' including the single quotes. This explains why many jobs are printing the message: No JDK named ‘openjdk8’ found Change-Id: I9bdf92bb759aec10f97ef355d4b04618cd58d2c8 Signed-off-by: Thanh Ha --- diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index ef0555443..8d91a4c06 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -194,7 +194,7 @@ project-type: freestyle node: 'centos7-builder-8c-8g' concurrent: true - jdk: '{jdk}' + jdk: '{java-version}' properties: - opendaylight-infra-properties: diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml index d9fcca0f1..a0ba881b4 100644 --- a/jjb/integration/distribution/distribution-templates.yaml +++ b/jjb/integration/distribution/distribution-templates.yaml @@ -12,7 +12,7 @@ project-type: freestyle node: 'centos7-builder-8c-8g' concurrent: true - jdk: '{jdk}' + jdk: '{java-version}' properties: - opendaylight-infra-properties: diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 472febb4f..1ce162a0f 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -1446,7 +1446,7 @@ project-type: freestyle node: centos7-builder-2c-8g concurrent: true - jdk: '{jdk}' + jdk: '{java-version}' properties: - opendaylight-infra-properties: diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index add368112..b5c23f5ae 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -237,7 +237,7 @@ project-type: freestyle node: centos7-builder-4c-4g - jdk: '{jdk}' + jdk: '{java-version}' properties: - opendaylight-infra-properties: diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml index 043b62f12..74bd6b25c 100644 --- a/jjb/netvirt/netvirt-full-integration.yaml +++ b/jjb/netvirt/netvirt-full-integration.yaml @@ -138,7 +138,7 @@ project-type: freestyle node: centos7-docker-1c-4g concurrent: true - jdk: '{jdk}' + jdk: '{java-version}' description: > Integration tests for the Netvirt project against different versions of OVS and branches. This job runs nightly. diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml index 94b69ef54..68b7292da 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -32,7 +32,7 @@ project-type: freestyle node: centos7-builder-2c-8g concurrent: true - jdk: '{jdk}' + jdk: '{java-version}' properties: - opendaylight-infra-properties: @@ -92,7 +92,7 @@ name: 'opflex-merge-{stream}' node: centos7-builder-2c-8g - jdk: '{jdk}' + jdk: '{java-version}' properties: - opendaylight-infra-properties: diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml index 1272d6bfa..3f85b0824 100644 --- a/jjb/opflex/opflex.yaml +++ b/jjb/opflex/opflex.yaml @@ -39,7 +39,7 @@ name: 'opflex-release-{stream}' node: centos7-builder-2c-8g - jdk: '{jdk}' + jdk: '{java-version}' ###################### # Default parameters # diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 60473bb32..7b86adad7 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -95,7 +95,7 @@ project-type: freestyle node: centos7-docker-1c-4g - jdk: '{jdk}' + jdk: '{java-version}' description: > Integration tests for the OVSDB project against different versions of OVS and branches. This job runs nightly. diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml index 53392a171..47413b709 100644 --- a/jjb/ovsdb/ovsdb-sonar.yaml +++ b/jjb/ovsdb/ovsdb-sonar.yaml @@ -12,7 +12,7 @@ project-type: freestyle node: centos7-docker-1c-4g - jdk: '{jdk}' + jdk: '{java-version}' properties: - opendaylight-infra-properties: diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml index cd16b8530..c299c63a5 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -106,7 +106,6 @@ # Maven / Java java-version: 'openjdk8' jre: 'openjdk8' - jdk: 'openjdk8' opendaylight-infra-mvn-opts: | --show-version --batch-mode diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml index a34dbc967..48452b5c3 100644 --- a/jjb/releng-templates-java.yaml +++ b/jjb/releng-templates-java.yaml @@ -36,7 +36,7 @@ project-type: freestyle node: '{build-node}' - jdk: '{jdk}' + jdk: '{java-version}' properties: - opendaylight-infra-properties: diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml index 9bdbd51d2..4a5eef8b1 100644 --- a/jjb/releng-templates.yaml +++ b/jjb/releng-templates.yaml @@ -7,7 +7,7 @@ project-type: freestyle node: '{build-node}' - jdk: '{jdk}' + jdk: '{java-version}' properties: - opendaylight-infra-properties: @@ -75,7 +75,7 @@ project-type: freestyle node: '{build-node}' - jdk: '{jdk}' + jdk: '{java-version}' parameters: - opendaylight-infra-parameters: