ACUMOS: Java 11 introduction

Introduction of Java 11 to projects:
- license-manager
- license-usage-manager
- portal-marketplace

The java version is defined per project but this
can be extended per branch if needed later on.

Acumos slave server was updated to include the JDK 11
and the version of Java is controled using JAVA_HOME per Acumos Jenkins Job

Change-Id: I2f3ad8ec3e1c0a97eac2804b231cd7943caaf713
Signed-off-by: Justin Early <earlyster@gmail.com>

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 1cd317df623dcf9926829d246aef0976fac8ae56..fd62d567bc64bed1f5a40c2bd0fe58e301bbd447 100644 (file)
--- 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 da80d97cc4e45397cec9721899ab926524ac2b78..19b3acb3c62880225c273354189465286583d0e1 100644 (file)
--- 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 ad548c7c7ea5b8b9d9ea358166b1db2b073dc2e2..be6694436eda761f8c199a6a5e6474e6068c6460 100644 (file)
--- 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 dc5aa5847e330b889d7905ec1db5db27652c397f..a146c78320a8a7a0e98875b7020aba97fd0e27c8 100644 (file)
--- 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 2ea9d53c379ff9f6f67cb3102ae702cb1bc7e3d9..0ea0ee6ca245dafa1b6a7f6008b2d9e83b62a185 100644 (file)
--- 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 964ba90c58a8caf94c4c276b94c00b724f91b4a6..af7ef162185bd026c274319a24af34eadb8afcd9 100644 (file)
--- 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 948f0bf56f1d874ef83a3043e6cc1283068a23d1..6817cdc3b524b03b9a7807cfc904bd3f91af391c 100644 (file)
--- 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 (file)
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 0c3cad0adf38775348aa54963923644fbdeb29e1..b78132ceae95a875c771aaca70f3ac53edf72849 100644 (file)
--- 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 fd50f8b55c3a01528bb8ded74d328c21dbe3d0db..2f428b78d0ebe1f0c7c343ce9bf64105a78e1b7f 100644 (file)
--- 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 aea3b2f57a2f812d3aa7076ee3563848d74acc3a..fcbadc0edb086432193bcf223a6a3ae485e5d3c2 100644 (file)
--- 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 b08f775f45518f1ef1d29f946cc364a6302fdc84..a7ab0bd830436662656bfca9b56999d20a1bb5d9 100644 (file)
--- 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 2ffc1d2b2a1d1991e3342cdc01ea3cb7106e09d4..fe437ef7da0ecfcc14af9e8ec13968c6f63c96dd 100755 (executable)
--- a/jjb/acumos/verify-jobs.sh
+++ b/jjb/acumos/verify-jobs.sh
@@ -6,7 +6,7 @@ set -o pipefail
 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 86d355fc0571987ec45dbed36856c5ce28444221..55ee9391011f7e79d82476e89fea868b8e52ec22 100644 (file)
--- 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'