Merge "ACUMOS: Java 11 introduction"
diff --git a/jjb/acumos/acumos-java-client/acumos-java-client-verify-jobs.yaml b/jjb/acumos/acumos-java-client/acumos-java-client-verify-jobs.yaml
index 1cd317d..fd62d56 100644
--- a/jjb/acumos/acumos-java-client/acumos-java-client-verify-jobs.yaml
+++ b/jjb/acumos/acumos-java-client/acumos-java-client-verify-jobs.yaml
@@ -21,6 +21,7 @@
name: acumos-java-client-verify
project: acumos-java-client
project-name: acumos-java-client
+ jdk-version: java-8
jobs:
- 'acumos-{project-name}-verify-java'
diff --git a/jjb/acumos/acumos-python-client/acumos-python-client-verify-jobs.yaml b/jjb/acumos/acumos-python-client/acumos-python-client-verify-jobs.yaml
index da80d97..19b3acb 100644
--- a/jjb/acumos/acumos-python-client/acumos-python-client-verify-jobs.yaml
+++ b/jjb/acumos/acumos-python-client/acumos-python-client-verify-jobs.yaml
@@ -21,6 +21,7 @@
name: acumos-python-client-verify
project: acumos-python-client
project-name: acumos-python-client
+ jdk-version: java-8
jobs:
- 'acumos-{project-name}-verify-java'
diff --git a/jjb/acumos/documenation/documenation-verify-jobs.yaml b/jjb/acumos/documenation/documenation-verify-jobs.yaml
index ad548c7..be66944 100644
--- a/jjb/acumos/documenation/documenation-verify-jobs.yaml
+++ b/jjb/acumos/documenation/documenation-verify-jobs.yaml
@@ -21,6 +21,7 @@
name: acumos-documentation-verify
project: documentation
project-name: documentation
+ jdk-version: java-8
jobs:
- 'acumos-{project-name}-verify-java'
diff --git a/jjb/acumos/federation/federation-verify-jobs.yml b/jjb/acumos/federation/federation-verify-jobs.yml
index dc5aa58..a146c78 100644
--- a/jjb/acumos/federation/federation-verify-jobs.yml
+++ b/jjb/acumos/federation/federation-verify-jobs.yml
@@ -21,6 +21,7 @@
name: acumos-federation-verify
project: federation
project-name: federation
+ jdk-version: java-8
jobs:
- 'acumos-{project-name}-verify-java'
diff --git a/jjb/acumos/global-templates-acumos-java.yaml b/jjb/acumos/global-templates-acumos-java.yaml
index 2ea9d53..0ea0ee6 100644
--- a/jjb/acumos/global-templates-acumos-java.yaml
+++ b/jjb/acumos/global-templates-acumos-java.yaml
@@ -1,10 +1,7 @@
- job-template:
name: 'acumos-{project-name}-verify-java'
-
- node: acumos-ubuntu1604
-
+ node: acumos-ubuntu1804
disabled: false
-
concurrent: true
properties:
@@ -18,7 +15,7 @@
description: JJB configured PROJECT parameter to identify a Nordix Gerrit project
- string:
name: JAVA_HOME
- default: /usr/lib/jvm/java-1.8.0-openjdk-amd64
+ default: '/usr/lib/jvm/{jdk-version}-openjdk-amd64'
description: Java home
- string:
name: MVN_VERSION
diff --git a/jjb/acumos/kubernetes-client/kubernetes-client-verify-jobs.yaml b/jjb/acumos/kubernetes-client/kubernetes-client-verify-jobs.yaml
index 964ba90..af7ef16 100644
--- a/jjb/acumos/kubernetes-client/kubernetes-client-verify-jobs.yaml
+++ b/jjb/acumos/kubernetes-client/kubernetes-client-verify-jobs.yaml
@@ -21,6 +21,7 @@
name: acumos-kubernetes-client-verify
project: kubernetes-client
project-name: kubernetes-client
+ jdk-version: java-8
jobs:
- 'acumos-{project-name}-verify-java'
diff --git a/jjb/acumos/license-manager/license-manager-verify-jobs.yaml b/jjb/acumos/license-manager/license-manager-verify-jobs.yaml
index 948f0bf..6817cdc 100644
--- a/jjb/acumos/license-manager/license-manager-verify-jobs.yaml
+++ b/jjb/acumos/license-manager/license-manager-verify-jobs.yaml
@@ -21,6 +21,6 @@
name: acumos-license-manager-verify
project: license-manager
project-name: license-manager
-
+ jdk-version: java-11
jobs:
- 'acumos-{project-name}-verify-java'
diff --git a/jjb/acumos/license-usage-manager/license-usage-manager-verify-jobs.yaml b/jjb/acumos/license-usage-manager/license-usage-manager-verify-jobs.yaml
new file mode 100644
index 0000000..12ed8e7
--- /dev/null
+++ b/jjb/acumos/license-usage-manager/license-usage-manager-verify-jobs.yaml
@@ -0,0 +1,26 @@
+---
+# ============LICENSE_START=======================================================
+# Copyright (C) 2019 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+
+- project:
+ name: license-usage-manager-verify
+ project: license-usage-manager
+ project-name: license-usage-manager
+ jdk-version: java-11
+ jobs:
+ - 'acumos-{project-name}-verify-java'
diff --git a/jjb/acumos/microservice-generation/microservice-generation-verify-jobs.yaml b/jjb/acumos/microservice-generation/microservice-generation-verify-jobs.yaml
index 0c3cad0..b78132c 100644
--- a/jjb/acumos/microservice-generation/microservice-generation-verify-jobs.yaml
+++ b/jjb/acumos/microservice-generation/microservice-generation-verify-jobs.yaml
@@ -21,6 +21,7 @@
name: acumos-microservice-generation-verify
project: microservice-generation
project-name: microservice-generation
+ jdk-version: java-8
jobs:
- 'acumos-{project-name}-verify-java'
diff --git a/jjb/acumos/portal-marketplace/portal-marketplace-verify-jobs.yaml b/jjb/acumos/portal-marketplace/portal-marketplace-verify-jobs.yaml
index fd50f8b..2f428b7 100644
--- a/jjb/acumos/portal-marketplace/portal-marketplace-verify-jobs.yaml
+++ b/jjb/acumos/portal-marketplace/portal-marketplace-verify-jobs.yaml
@@ -21,6 +21,7 @@
name: acumos-portal-marketplace-verify
project: portal-marketplace
project-name: portal-marketplace
+ jdk-version: java-11
jobs:
- - 'acumos-{project-name}-verify-java'
+ - 'acumos-{project-name}-verify-java'
\ No newline at end of file
diff --git a/jjb/acumos/runtime-orchestrator/runtime-orchestrator-verify-jobs.yaml b/jjb/acumos/runtime-orchestrator/runtime-orchestrator-verify-jobs.yaml
index aea3b2f..fcbadc0 100644
--- a/jjb/acumos/runtime-orchestrator/runtime-orchestrator-verify-jobs.yaml
+++ b/jjb/acumos/runtime-orchestrator/runtime-orchestrator-verify-jobs.yaml
@@ -21,6 +21,7 @@
name: acumos-runtime-orchestrator-verify
project: runtime-orchestrator
project-name: runtime-orchestrator
+ jdk-version: java-8
jobs:
- 'acumos-{project-name}-verify-java'
diff --git a/jjb/acumos/security-verification/security-verification-verify-jobs.yaml b/jjb/acumos/security-verification/security-verification-verify-jobs.yaml
index b08f775..a7ab0bd 100644
--- a/jjb/acumos/security-verification/security-verification-verify-jobs.yaml
+++ b/jjb/acumos/security-verification/security-verification-verify-jobs.yaml
@@ -21,6 +21,7 @@
name: acumos-security-verification-verify
project: security-verification
project-name: security-verification
+ jdk-version: java-8
jobs:
- 'acumos-{project-name}-verify-java'
diff --git a/jjb/acumos/verify-jobs.sh b/jjb/acumos/verify-jobs.sh
index 2ffc1d2..fe437ef 100755
--- a/jjb/acumos/verify-jobs.sh
+++ b/jjb/acumos/verify-jobs.sh
@@ -6,7 +6,7 @@
cd $WORKSPACE
echo "Info: Java version"
echo "----------------------------------------------------"
-java -version
+$JAVA_HOME/bin/java -version
echo "----------------------------------------------------"
echo "Downloading Maven $MVN_VERSION from $MVN_URL"
wget -q $MVN_URL && unzip -qq apache-maven-${MVN_VERSION}-bin.zip
diff --git a/jjb/acumos/workbench/workbench-verify-jobs.yaml b/jjb/acumos/workbench/workbench-verify-jobs.yaml
index 86d355f..55ee939 100644
--- a/jjb/acumos/workbench/workbench-verify-jobs.yaml
+++ b/jjb/acumos/workbench/workbench-verify-jobs.yaml
@@ -21,6 +21,7 @@
name: acumos-workbench-verify
project: workbench
project-name: workbench
+ jdk-version: java-8
jobs:
- 'acumos-{project-name}-verify-java'