ONAP: Define Java version as part of the project verify job

This change introduce one ONAP Java build server.
On that ONAP build server multiple Java versions will be installed:
- JDK8
- JDK11
- JDK12
The correct Java version required for the job will be defined using
JAVA_HOME

Change-Id: I9ec54c3509b13bcea760c2a888a33beb7be9e90f

diff --git a/jjb/onap/aaf-authz/aaf-authz-verify-jobs.yaml b/jjb/onap/aaf-authz/aaf-authz-verify-jobs.yaml
index a4f68cecabbbe8d3d85ce54efb05e483630571cd..97ebae2a6c0b468605c82a539d61b1cbff6c7b05 100644 (file)
--- a/jjb/onap/aaf-authz/aaf-authz-verify-jobs.yaml
+++ b/jjb/onap/aaf-authz/aaf-authz-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/aaf-cadi/aaf-cadi-verify-jobs.yaml b/jjb/onap/aaf-cadi/aaf-cadi-verify-jobs.yaml
index d948b144c5a017aef8c2e8e597dbd5138fdf478a..98d5f0aa84041ed145cc01993f9738d8a1de4c05 100644 (file)
--- a/jjb/onap/aaf-cadi/aaf-cadi-verify-jobs.yaml
+++ b/jjb/onap/aaf-cadi/aaf-cadi-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/aaf-certservice/aaf-certservice-verify-jobs.yaml b/jjb/onap/aaf-certservice/aaf-certservice-verify-jobs.yaml
index 751be8baef114dbffa0b20dfe9824d0afe931a25..9db76d8572f4442e1a81299af5c4bc4fd2ef9925 100644 (file)
--- a/jjb/onap/aaf-certservice/aaf-certservice-verify-jobs.yaml
+++ b/jjb/onap/aaf-certservice/aaf-certservice-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/aaf-inno/aaf-inno-verify-jobs.yaml b/jjb/onap/aaf-inno/aaf-inno-verify-jobs.yaml
index eecb29a46173d4dc9fcc960ce06280a55b294887..082512b0464ba61478679b00d2295aadee77689b 100644 (file)
--- a/jjb/onap/aaf-inno/aaf-inno-verify-jobs.yaml
+++ b/jjb/onap/aaf-inno/aaf-inno-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/aaf-luaplugin/aaf-luaplugin-verify-jobs.yaml b/jjb/onap/aaf-luaplugin/aaf-luaplugin-verify-jobs.yaml
index cb89bceb67bcedeb9e1a1076f54b6200efe8e864..c9ae17be66d2ac8acc09bbde7a93fd7e936faf4e 100644 (file)
--- a/jjb/onap/aaf-luaplugin/aaf-luaplugin-verify-jobs.yaml
+++ b/jjb/onap/aaf-luaplugin/aaf-luaplugin-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/aai-schema-service/aai-schema-service-verify-jobs.yaml b/jjb/onap/aai-schema-service/aai-schema-service-verify-jobs.yaml
index fa02fbba3ed19ad79b63946a0830c785b7d3a93b..7cdf4c32470ea64cfc931e2827e94ad34909ddd7 100644 (file)
--- a/jjb/onap/aai-schema-service/aai-schema-service-verify-jobs.yaml
+++ b/jjb/onap/aai-schema-service/aai-schema-service-verify-jobs.yaml
@@ -29,6 +29,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/appc-cdt/appc-cdt-verify-jobs.yaml b/jjb/onap/appc-cdt/appc-cdt-verify-jobs.yaml
index 25638b5fd8ca22e0a720bab7e8efa25f6b04a7f3..7f610fbc9b55539a0d496e6ea5fda80b01ae83b8 100644 (file)
--- a/jjb/onap/appc-cdt/appc-cdt-verify-jobs.yaml
+++ b/jjb/onap/appc-cdt/appc-cdt-verify-jobs.yaml
@@ -29,6 +29,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/appc-deployment/appc-deployment-verify-jobs.yaml b/jjb/onap/appc-deployment/appc-deployment-verify-jobs.yaml
index 1c762aed17830baa828a9e4c8c1adc00a1ee359b..78b1762e59f0e782a5a7a76a0290b8e3de2014ec 100644 (file)
--- a/jjb/onap/appc-deployment/appc-deployment-verify-jobs.yaml
+++ b/jjb/onap/appc-deployment/appc-deployment-verify-jobs.yaml
@@ -29,6 +29,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/appc-parent/appc-parent-verify-jobs.yaml b/jjb/onap/appc-parent/appc-parent-verify-jobs.yaml
index 854295010bf9496fe3718443aefbcd6e0c647260..63e49eb21754e26a4baa023884bcb6e0870facfe 100644 (file)
--- a/jjb/onap/appc-parent/appc-parent-verify-jobs.yaml
+++ b/jjb/onap/appc-parent/appc-parent-verify-jobs.yaml
@@ -29,6 +29,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/appc/appc-verify-jobs.yaml b/jjb/onap/appc/appc-verify-jobs.yaml
index f3df7dd149ed344d391afacaa9a4c7d9e7640679..82255f8cbcfdf1706f96dcbc6c72652cdc78512c 100644 (file)
--- a/jjb/onap/appc/appc-verify-jobs.yaml
+++ b/jjb/onap/appc/appc-verify-jobs.yaml
@@ -29,6 +29,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/ccsdk-apps/ccsdk-apps-verify-jobs.yaml b/jjb/onap/ccsdk-apps/ccsdk-apps-verify-jobs.yaml
index f9ac0e0fdf3c4bb884ab00f42913730b1cd07578..8a592c1831f693d05b73f26038c55a0bebe93534 100644 (file)
--- a/jjb/onap/ccsdk-apps/ccsdk-apps-verify-jobs.yaml
+++ b/jjb/onap/ccsdk-apps/ccsdk-apps-verify-jobs.yaml
@@ -30,8 +30,10 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
       - dublin:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/ccsdk-cds/ccsdk-cds-verify-jobs.yaml b/jjb/onap/ccsdk-cds/ccsdk-cds-verify-jobs.yaml
index de4b038e0a9a2adbb93e22bd2f815418cdae114e..462a8abdf52a46d265741c5c6c3d09681eb690d5 100644 (file)
--- a/jjb/onap/ccsdk-cds/ccsdk-cds-verify-jobs.yaml
+++ b/jjb/onap/ccsdk-cds/ccsdk-cds-verify-jobs.yaml
@@ -30,8 +30,10 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
       - dublin:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/ccsdk-dashboard/ccsdk-dashboard-verify-jobs.yaml b/jjb/onap/ccsdk-dashboard/ccsdk-dashboard-verify-jobs.yaml
index 96340b51388c854b52bf107ba37cbcde72628993..0039b892a7185203a449061b4aad8153a96f8586 100644 (file)
--- a/jjb/onap/ccsdk-dashboard/ccsdk-dashboard-verify-jobs.yaml
+++ b/jjb/onap/ccsdk-dashboard/ccsdk-dashboard-verify-jobs.yaml
@@ -27,6 +27,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/ccsdk-distribution/ccsdk-distribution-verify-jobs.yaml b/jjb/onap/ccsdk-distribution/ccsdk-distribution-verify-jobs.yaml
index a7a201fc915221b1be64afcc2a8f28676e796118..51bcf433c2541fad1b0a27fb1b784c49d602989e 100644 (file)
--- a/jjb/onap/ccsdk-distribution/ccsdk-distribution-verify-jobs.yaml
+++ b/jjb/onap/ccsdk-distribution/ccsdk-distribution-verify-jobs.yaml
@@ -27,6 +27,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/ccsdk-features/ccsdk-features-verify-jobs.yaml b/jjb/onap/ccsdk-features/ccsdk-features-verify-jobs.yaml
index ba4152e86f315f07ca1f5bc7b65bbacd6b2145c5..18e53dc13483a6ec406481a12efca8f1b2080a42 100644 (file)
--- a/jjb/onap/ccsdk-features/ccsdk-features-verify-jobs.yaml
+++ b/jjb/onap/ccsdk-features/ccsdk-features-verify-jobs.yaml
@@ -27,6 +27,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/ccsdk-oran/ccsdk-oran-verify-jobs.yaml b/jjb/onap/ccsdk-oran/ccsdk-oran-verify-jobs.yaml
index a0fbbacd1a919a668b0544eda76da9def9e36489..3446c8fe6e837950171c850ac27569fb86bbe0aa 100644 (file)
--- a/jjb/onap/ccsdk-oran/ccsdk-oran-verify-jobs.yaml
+++ b/jjb/onap/ccsdk-oran/ccsdk-oran-verify-jobs.yaml
@@ -20,18 +20,14 @@
 # this job gets triggered when a change is proposed to
 # ccsdk/oran project on Nordix Gerrit.
 - project:
-
     name: ccsdk-oran-verify
-
     project: ccsdk/oran
-
     project-name: ccsdk-oran
 
-    jdk-version: sdk12
-
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-12
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/ccsdk-parent/ccsdk-parent-verify-jobs.yaml b/jjb/onap/ccsdk-parent/ccsdk-parent-verify-jobs.yaml
index 4ed95838275915f7b44e7bc99e670d9e5735e607..6f13ca94d564a2368a9a05a5eb931f7aa6d21346 100644 (file)
--- a/jjb/onap/ccsdk-parent/ccsdk-parent-verify-jobs.yaml
+++ b/jjb/onap/ccsdk-parent/ccsdk-parent-verify-jobs.yaml
@@ -27,6 +27,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/ccsdk-platform-blueprints/ccsdk-platform-blueprints-verify-jobs.yaml b/jjb/onap/ccsdk-platform-blueprints/ccsdk-platform-blueprints-verify-jobs.yaml
index 6c3241414b567f23a088853c922445fb309f1986..5fc25d4737662943a9f1b2c075db50f9d7582ffa 100644 (file)
--- a/jjb/onap/ccsdk-platform-blueprints/ccsdk-platform-blueprints-verify-jobs.yaml
+++ b/jjb/onap/ccsdk-platform-blueprints/ccsdk-platform-blueprints-verify-jobs.yaml
@@ -27,6 +27,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/ccsdk-platform-nbapi/ccsdk-platform-nbapi-verify-jobs.yaml b/jjb/onap/ccsdk-platform-nbapi/ccsdk-platform-nbapi-verify-jobs.yaml
index 14109a6d26ab569f7c26e4a5ee5632e1eda9f86d..bacd91bc1b033fb59c563184f78c0f84cb70b2e3 100644 (file)
--- a/jjb/onap/ccsdk-platform-nbapi/ccsdk-platform-nbapi-verify-jobs.yaml
+++ b/jjb/onap/ccsdk-platform-nbapi/ccsdk-platform-nbapi-verify-jobs.yaml
@@ -27,6 +27,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/ccsdk-platform-plugins/ccsdk-platform-plugins-verify-jobs.yaml b/jjb/onap/ccsdk-platform-plugins/ccsdk-platform-plugins-verify-jobs.yaml
index dee8c19067ce10d20bf4219b48a49d8bc8373721..a2d3b1273b7fed1a572029827f9efbccb81e0975 100644 (file)
--- a/jjb/onap/ccsdk-platform-plugins/ccsdk-platform-plugins-verify-jobs.yaml
+++ b/jjb/onap/ccsdk-platform-plugins/ccsdk-platform-plugins-verify-jobs.yaml
@@ -27,6 +27,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/ccsdk-sli-adaptors/ccsdk-sli-adaptors-verify-jobs.yaml b/jjb/onap/ccsdk-sli-adaptors/ccsdk-sli-adaptors-verify-jobs.yaml
index aed5fff448d60144fc8c84f833584b66d7a19d9e..8670ebf7476a50e354078615a667edf7cdd74907 100644 (file)
--- a/jjb/onap/ccsdk-sli-adaptors/ccsdk-sli-adaptors-verify-jobs.yaml
+++ b/jjb/onap/ccsdk-sli-adaptors/ccsdk-sli-adaptors-verify-jobs.yaml
@@ -27,6 +27,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/ccsdk-sli-core/ccsdk-sli-core-verify-jobs.yaml b/jjb/onap/ccsdk-sli-core/ccsdk-sli-core-verify-jobs.yaml
index 16d9fbd7d163ff02924ced9add8935587b72a2b8..5a5155808fd036379442d785eac1cce7bc226757 100644 (file)
--- a/jjb/onap/ccsdk-sli-core/ccsdk-sli-core-verify-jobs.yaml
+++ b/jjb/onap/ccsdk-sli-core/ccsdk-sli-core-verify-jobs.yaml
@@ -27,6 +27,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/ccsdk-sli-northbound/ccsdk-sli-northbound-verify-jobs.yaml b/jjb/onap/ccsdk-sli-northbound/ccsdk-sli-northbound-verify-jobs.yaml
index d42ee2dc3e9ead6ed26f3eb4daa6043faca5d364..d4343dbac1270ac6f42ef2a3278c62f388bccec9 100644 (file)
--- a/jjb/onap/ccsdk-sli-northbound/ccsdk-sli-northbound-verify-jobs.yaml
+++ b/jjb/onap/ccsdk-sli-northbound/ccsdk-sli-northbound-verify-jobs.yaml
@@ -27,6 +27,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/ccsdk-sli-plugins/ccsdk-sli-plugins-verify-jobs.yaml b/jjb/onap/ccsdk-sli-plugins/ccsdk-sli-plugins-verify-jobs.yaml
index e4f9c4cc90b0b569a479d380b178c651bfce74e7..a7fb05ad70b399f25a38c1da746f4e87c4680717 100644 (file)
--- a/jjb/onap/ccsdk-sli-plugins/ccsdk-sli-plugins-verify-jobs.yaml
+++ b/jjb/onap/ccsdk-sli-plugins/ccsdk-sli-plugins-verify-jobs.yaml
@@ -27,6 +27,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/ccsdk-storage-esaas/ccsdk-storage-esaas-verify-jobs.yaml b/jjb/onap/ccsdk-storage-esaas/ccsdk-storage-esaas-verify-jobs.yaml
index afe87e58f17b5d715b1fecdf6944e675b02497a0..e8bba94f6f43e8d4bee07aa732d0a904cc1b64d6 100644 (file)
--- a/jjb/onap/ccsdk-storage-esaas/ccsdk-storage-esaas-verify-jobs.yaml
+++ b/jjb/onap/ccsdk-storage-esaas/ccsdk-storage-esaas-verify-jobs.yaml
@@ -27,6 +27,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/ccsdk-storage-pgaas/ccsdk-storage-pgaas-verify-jobs.yaml b/jjb/onap/ccsdk-storage-pgaas/ccsdk-storage-pgaas-verify-jobs.yaml
index cee1233d04a6e94b3e8770e3cfcacd5449955ea2..17105ef23a577508ebb26adf04210643138828b3 100644 (file)
--- a/jjb/onap/ccsdk-storage-pgaas/ccsdk-storage-pgaas-verify-jobs.yaml
+++ b/jjb/onap/ccsdk-storage-pgaas/ccsdk-storage-pgaas-verify-jobs.yaml
@@ -27,6 +27,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/ccsdk-utils/ccsdk-utils-verify-jobs.yaml b/jjb/onap/ccsdk-utils/ccsdk-utils-verify-jobs.yaml
index d32452f3b58415888e3eb29ebfd000222ec16a03..70f7503141d81b1c5ded8eb70e4bf3d9a4210753 100644 (file)
--- a/jjb/onap/ccsdk-utils/ccsdk-utils-verify-jobs.yaml
+++ b/jjb/onap/ccsdk-utils/ccsdk-utils-verify-jobs.yaml
@@ -27,6 +27,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/clamp/clamp-verify-jobs.yaml b/jjb/onap/clamp/clamp-verify-jobs.yaml
index a1939abe437e9a68fc849035cb282676578cf5e8..30cb29278eea8bfcd84871ec97db1121350b63ed 100644 (file)
--- a/jjb/onap/clamp/clamp-verify-jobs.yaml
+++ b/jjb/onap/clamp/clamp-verify-jobs.yaml
@@ -29,6 +29,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/dcaegen2-collectors-datafile/dcaegen2-collectors-datafile-verify-jobs.yaml b/jjb/onap/dcaegen2-collectors-datafile/dcaegen2-collectors-datafile-verify-jobs.yaml
index b63891d116f147b88ab90178a079c5ded5ec88b7..8a12cb25c17476fca5dcd376095a6362da0d7d5b 100644 (file)
--- a/jjb/onap/dcaegen2-collectors-datafile/dcaegen2-collectors-datafile-verify-jobs.yaml
+++ b/jjb/onap/dcaegen2-collectors-datafile/dcaegen2-collectors-datafile-verify-jobs.yaml
@@ -28,10 +28,10 @@
     stream:
       - master:
           branch: '{stream}'
-          jdk-version: jdk12
+          jdk-version: java-12
       - dublin:
           branch: '{stream}'
-          jdk-version: jdk8
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-verify-jobs.yaml b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-verify-jobs.yaml
index b70200357276bf765201c76e98b199321f364a3a..931e21a12b4c5d30493396f9a7b52dc86a8e3469 100644 (file)
--- a/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-verify-jobs.yaml
+++ b/jjb/onap/dcaegen2-collectors/dcaegen2-collectors-verify-jobs.yaml
@@ -29,6 +29,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/dcaegen2-platform-cli/dcaegen2-platform-cli-verify-jobs.yaml b/jjb/onap/dcaegen2-platform-cli/dcaegen2-platform-cli-verify-jobs.yaml
index 0a423059b2361c93f80d4b89afbec811543c480b..c2d2cb44fbbf4bbfa91b207eda165bea98ddb263 100644 (file)
--- a/jjb/onap/dcaegen2-platform-cli/dcaegen2-platform-cli-verify-jobs.yaml
+++ b/jjb/onap/dcaegen2-platform-cli/dcaegen2-platform-cli-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/dcaegen2-services-pm-mapper/dcaegen2-services-pm-mapper-verify-jobs.yaml b/jjb/onap/dcaegen2-services-pm-mapper/dcaegen2-services-pm-mapper-verify-jobs.yaml
index 07d36d38e016a6f3ea9152d1465dfe87c0399a31..02d832b72f764d68e685a58ace001c18fd95049e 100644 (file)
--- a/jjb/onap/dcaegen2-services-pm-mapper/dcaegen2-services-pm-mapper-verify-jobs.yaml
+++ b/jjb/onap/dcaegen2-services-pm-mapper/dcaegen2-services-pm-mapper-verify-jobs.yaml
@@ -27,8 +27,10 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
       - dublin:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/dcaegen2-services-prh/dcaegen2-services-prh-verify-jobs.yaml b/jjb/onap/dcaegen2-services-prh/dcaegen2-services-prh-verify-jobs.yaml
index b404fd37c622fc97e28b3a207532fe46acfdb6ff..b93747394b9642642813f4d7beb30cc457961abb 100644 (file)
--- a/jjb/onap/dcaegen2-services-prh/dcaegen2-services-prh-verify-jobs.yaml
+++ b/jjb/onap/dcaegen2-services-prh/dcaegen2-services-prh-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/dcaegen2-services/dcaegen2-services-verify-jobs.yaml b/jjb/onap/dcaegen2-services/dcaegen2-services-verify-jobs.yaml
index 295bbe4e9a886785138654818c6c7c56fc5dd156..43956304b8d2eeeedf83e2fe37d9fb915ffad385 100644 (file)
--- a/jjb/onap/dcaegen2-services/dcaegen2-services-verify-jobs.yaml
+++ b/jjb/onap/dcaegen2-services/dcaegen2-services-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/dcaegen2-utils/dcaegen2-utils-verify-jobs.yaml b/jjb/onap/dcaegen2-utils/dcaegen2-utils-verify-jobs.yaml
index bc11c253e8f8e78195c3dc90f12d5c73aa373919..8e0755d839fcc3a08222871193df5722ffdf380f 100644 (file)
--- a/jjb/onap/dcaegen2-utils/dcaegen2-utils-verify-jobs.yaml
+++ b/jjb/onap/dcaegen2-utils/dcaegen2-utils-verify-jobs.yaml
@@ -27,6 +27,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/dcaegen2/dcaegen2-verify-jobs.yaml b/jjb/onap/dcaegen2/dcaegen2-verify-jobs.yaml
index f01607ac713609fd55eafc1a266cc62aeb961c83..7261eb5d91f9efeba6a09202db8168a2f12fb70a 100644 (file)
--- a/jjb/onap/dcaegen2/dcaegen2-verify-jobs.yaml
+++ b/jjb/onap/dcaegen2/dcaegen2-verify-jobs.yaml
@@ -27,8 +27,10 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
       - casablanca:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/dmaap-buscontroller/dmaap-buscontroller-verify-jobs.yaml b/jjb/onap/dmaap-buscontroller/dmaap-buscontroller-verify-jobs.yaml
index 24a5d2cf2b4bc2c30bfbd763a9fe17013bedefa3..48fadccdc8a58fc6d73e84ccb7990bd52cfddbbe 100644 (file)
--- a/jjb/onap/dmaap-buscontroller/dmaap-buscontroller-verify-jobs.yaml
+++ b/jjb/onap/dmaap-buscontroller/dmaap-buscontroller-verify-jobs.yaml
@@ -27,8 +27,10 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
       - casablanca:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/dmaap-datarouter/dmaap-datarouter-verify-jobs.yaml b/jjb/onap/dmaap-datarouter/dmaap-datarouter-verify-jobs.yaml
index 6ec299917e9e57e7b864b026956b82bbc5c7ed7b..6e766116c4c1a88930b9172b1e062aa4b03b8587 100644 (file)
--- a/jjb/onap/dmaap-datarouter/dmaap-datarouter-verify-jobs.yaml
+++ b/jjb/onap/dmaap-datarouter/dmaap-datarouter-verify-jobs.yaml
@@ -26,10 +26,13 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
       - casablanca:
           branch: '{stream}'
+          jdk-version: java-8
       - dublin:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/dmaap-dbcapi/dmaap-dbcapi-verify-jobs.yaml b/jjb/onap/dmaap-dbcapi/dmaap-dbcapi-verify-jobs.yaml
index a35c510aa28fe2d681455e7026b04af4b289da08..cfb42e4133bbdcf6d6b9399f6ef9731d903be7a5 100644 (file)
--- a/jjb/onap/dmaap-dbcapi/dmaap-dbcapi-verify-jobs.yaml
+++ b/jjb/onap/dmaap-dbcapi/dmaap-dbcapi-verify-jobs.yaml
@@ -27,8 +27,10 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
       - casablanca:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/global-templates-local-onap-java.yaml b/jjb/onap/global-templates-local-onap-java.yaml
index 3186731c821d38c6cbda0d11f322ce47bd7d2c63..891706871f023608441dd6637e062e7b22d085bb 100644 (file)
--- a/jjb/onap/global-templates-local-onap-java.yaml
+++ b/jjb/onap/global-templates-local-onap-java.yaml
@@ -4,7 +4,7 @@
 - job-template:
     name: 'local-onap-{project-name}-{stream}-verify-java'
     disabled_job_var: false
-    jdk-version: jdk8
+    node: onap-ubuntu1804
 
     disabled: '{obj:disabled_job_var}'
     concurrent: true
@@ -16,13 +16,9 @@
           project: 'local/onap/{project}'
           branch: '{branch}'
       - nordix-gerrit-parameters
-      - label:
-          name: SLAVE_LABEL
-          default: 'onap-build-ubuntu1604-{jdk-version}'
-          description: 'Slave label to schedule this job on'
       - string:
           name: JAVA_HOME
-          default: /usr/lib/jvm/openjdk-amd64
+          default: '/usr/lib/jvm/{jdk-version}-openjdk-amd64'
           description: Java home
       - string:
           name: MVN_VERSION
@@ -57,4 +53,4 @@
 
     builders:
       - shell:
-          !include-raw-escape: ../global/verify-jobs.sh
+          !include-raw-escape: ./verify-jobs.sh

diff --git a/jjb/onap/global-templates-onap-java.yaml b/jjb/onap/global-templates-onap-java.yaml
index d9143a707c29fc7390fa7a3780ba4e248dd9acfc..7a3f2cecb34aebac71f4685d5cf266b4a3168428 100644 (file)
--- a/jjb/onap/global-templates-onap-java.yaml
+++ b/jjb/onap/global-templates-onap-java.yaml
@@ -1,7 +1,7 @@
 - job-template:
     name: 'onap-{project-name}-{stream}-verify-java'
     disabled_job_var: false
-    jdk-version: jdk8
+    node: onap-ubuntu1804
 
     disabled: '{obj:disabled_job_var}'
     concurrent: true
@@ -13,13 +13,9 @@
           project: 'onap/{project}'
           branch: '{branch}'
       - nordix-gerrit-parameters
-      - label:
-          name: SLAVE_LABEL
-          default: 'onap-build-ubuntu1604-{jdk-version}'
-          description: 'Slave label to schedule this job on'
       - string:
           name: JAVA_HOME
-          default: /usr/lib/jvm/openjdk-amd64
+          default: '/usr/lib/jvm/{jdk-version}-openjdk-amd64'
           description: Java home
       - string:
           name: MVN_VERSION
@@ -54,4 +50,4 @@
 
     builders:
       - shell:
-          !include-raw-escape: ../global/verify-jobs.sh
+          !include-raw-escape: ./verify-jobs.sh

diff --git a/jjb/onap/global-templates-onap-push-upstream.yaml b/jjb/onap/global-templates-onap-push-upstream.yaml
index 65d2d6d859949bbcf7f8e87966bb000b3f1d6bce..6977e60a226f92dbec731741cdda8e2fe1b8da5e 100644 (file)
--- a/jjb/onap/global-templates-onap-push-upstream.yaml
+++ b/jjb/onap/global-templates-onap-push-upstream.yaml
@@ -1,10 +1,7 @@
 - job-template:
     name: 'onap-{project-name}-push-upstream'
-
     node: infra-ubuntu1804
-
     disabled: false
-
     concurrent: false
 
     properties:

diff --git a/jjb/onap/global-templates-onap-rebase.yaml b/jjb/onap/global-templates-onap-rebase.yaml
index 723190a422a97191b0df803a752ad4e1ed5ac3b5..f2f74013e54bb37b763a2214b0e0b609e443a7ac 100644 (file)
--- a/jjb/onap/global-templates-onap-rebase.yaml
+++ b/jjb/onap/global-templates-onap-rebase.yaml
@@ -1,10 +1,7 @@
 - job-template:
     name: 'onap-{project-name}-rebase'
-
     node: infra-ubuntu1804
-
     disabled: false
-
     concurrent: false
 
     properties:

diff --git a/jjb/onap/oparent/oparent-verify-jobs.yaml b/jjb/onap/oparent/oparent-verify-jobs.yaml
index 5b5145b1bfcc44c7449cc540dd962d13a69de963..c82942dda4f80fcfab28da8d7c3d020755a13cbb 100644 (file)
--- a/jjb/onap/oparent/oparent-verify-jobs.yaml
+++ b/jjb/onap/oparent/oparent-verify-jobs.yaml
@@ -29,6 +29,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/policy-apex-pdp/policy-apex-pdp-verify-jobs.yaml b/jjb/onap/policy-apex-pdp/policy-apex-pdp-verify-jobs.yaml
index f003f6a3b4e88205e6651eeb90952522d4291fd9..2efa61143bb9630666502d3810a5317e324fabd4 100644 (file)
--- a/jjb/onap/policy-apex-pdp/policy-apex-pdp-verify-jobs.yaml
+++ b/jjb/onap/policy-apex-pdp/policy-apex-pdp-verify-jobs.yaml
@@ -29,8 +29,10 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
       - casablanca:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/policy-api/policy-api-verify-jobs.yaml b/jjb/onap/policy-api/policy-api-verify-jobs.yaml
index 13c3771ca0504293eec57bde9abb9c9c1b988cde..8b55a20462b825e5f34528843cb92cc998c65945 100644 (file)
--- a/jjb/onap/policy-api/policy-api-verify-jobs.yaml
+++ b/jjb/onap/policy-api/policy-api-verify-jobs.yaml
@@ -29,8 +29,10 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
       - 'casablanca':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/policy-common/policy-common-verify-jobs.yaml b/jjb/onap/policy-common/policy-common-verify-jobs.yaml
index 9066bf7eb1589d17cbf36377c9ac352d682d1617..dd9768a205a885770c5f5f0e38702f12fb311d59 100644 (file)
--- a/jjb/onap/policy-common/policy-common-verify-jobs.yaml
+++ b/jjb/onap/policy-common/policy-common-verify-jobs.yaml
@@ -29,8 +29,10 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
       - 'casablanca':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/policy-core/policy-core-verify-jobs.yaml b/jjb/onap/policy-core/policy-core-verify-jobs.yaml
index 7f521dc2b8cd03c569521fd5dbc14ca7a23b592c..b41adb6b21b15f716404e2b034a26c6fed3ac618 100644 (file)
--- a/jjb/onap/policy-core/policy-core-verify-jobs.yaml
+++ b/jjb/onap/policy-core/policy-core-verify-jobs.yaml
@@ -29,8 +29,10 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
       - 'casablanca':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/policy-distribution/policy-distribution-verify-jobs.yaml b/jjb/onap/policy-distribution/policy-distribution-verify-jobs.yaml
index 8c542fe6164f380e4e36ef44072b861331084c71..7d4a19ce91b757e11ad9952554b98c21e99dc1c3 100644 (file)
--- a/jjb/onap/policy-distribution/policy-distribution-verify-jobs.yaml
+++ b/jjb/onap/policy-distribution/policy-distribution-verify-jobs.yaml
@@ -29,8 +29,10 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
       - 'casablanca':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/policy-drools-applications/policy-drools-applications-verify-jobs.yaml b/jjb/onap/policy-drools-applications/policy-drools-applications-verify-jobs.yaml
index 0536c879b918e108c164780df71451d2999f18d1..419bc33783ee4acaf055091fda733e97cea171e6 100644 (file)
--- a/jjb/onap/policy-drools-applications/policy-drools-applications-verify-jobs.yaml
+++ b/jjb/onap/policy-drools-applications/policy-drools-applications-verify-jobs.yaml
@@ -29,8 +29,10 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
       - 'casablanca':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/policy-drools-pdp/policy-drools-pdp-verify-jobs.yaml b/jjb/onap/policy-drools-pdp/policy-drools-pdp-verify-jobs.yaml
index fc0971562d4504e10fcc064e74d30a7647d670d2..b418145ce54be0a7c443a2532439b28af538765a 100644 (file)
--- a/jjb/onap/policy-drools-pdp/policy-drools-pdp-verify-jobs.yaml
+++ b/jjb/onap/policy-drools-pdp/policy-drools-pdp-verify-jobs.yaml
@@ -29,8 +29,10 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
       - 'casablanca':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/policy-engine/policy-engine-verify-jobs.yaml b/jjb/onap/policy-engine/policy-engine-verify-jobs.yaml
index 325aae33dd8c7eced653dd090753d7c09dab8bb1..7a41e32dd35cc123766164c9fc2276296fe82e32 100644 (file)
--- a/jjb/onap/policy-engine/policy-engine-verify-jobs.yaml
+++ b/jjb/onap/policy-engine/policy-engine-verify-jobs.yaml
@@ -29,8 +29,10 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
       - 'casablanca':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/policy-models/policy-models-verify-jobs.yaml b/jjb/onap/policy-models/policy-models-verify-jobs.yaml
index 880855b9957926482c5e63d047d5299ce22b02cd..b8a68a11a4ce2207df63a3a74dde813cfea1afb5 100644 (file)
--- a/jjb/onap/policy-models/policy-models-verify-jobs.yaml
+++ b/jjb/onap/policy-models/policy-models-verify-jobs.yaml
@@ -29,8 +29,10 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
       - 'casablanca':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/policy-pap/policy-pap-verify-jobs.yaml b/jjb/onap/policy-pap/policy-pap-verify-jobs.yaml
index 7e93e07c367d14568cdebf7ae29292dcdc3aa368..dd734277317bc7f7ffe680366ee8ce6170609a10 100644 (file)
--- a/jjb/onap/policy-pap/policy-pap-verify-jobs.yaml
+++ b/jjb/onap/policy-pap/policy-pap-verify-jobs.yaml
@@ -29,6 +29,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/policy-parent/policy-parent-verify-jobs.yaml b/jjb/onap/policy-parent/policy-parent-verify-jobs.yaml
index f52238ae57863575812f443427aba836c452d367..ff314c9b205f8372b03c57c146555302d06c65ca 100644 (file)
--- a/jjb/onap/policy-parent/policy-parent-verify-jobs.yaml
+++ b/jjb/onap/policy-parent/policy-parent-verify-jobs.yaml
@@ -29,8 +29,10 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
       - 'casablanca':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/policy-xacml-pdp/policy-xacml-pdp-verify-jobs.yaml b/jjb/onap/policy-xacml-pdp/policy-xacml-pdp-verify-jobs.yaml
index 5c27cb041320c8936a14de7f8506b435ea510ef6..1d200e78b544aa42fa9797b4358a6fd574a9c9ce 100644 (file)
--- a/jjb/onap/policy-xacml-pdp/policy-xacml-pdp-verify-jobs.yaml
+++ b/jjb/onap/policy-xacml-pdp/policy-xacml-pdp-verify-jobs.yaml
@@ -29,8 +29,10 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
       - 'casablanca':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/portal/portal-verify-jobs.yaml b/jjb/onap/portal/portal-verify-jobs.yaml
index 9edb7b13d3f48edf9582bb0dce28afe401753f6c..84a6d959e61f5ab5d718c71c705d66afb84c2554 100644 (file)
--- a/jjb/onap/portal/portal-verify-jobs.yaml
+++ b/jjb/onap/portal/portal-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/sdc-dcae-d-ci/sdc-dcae-d-ci-verify-jobs.yaml b/jjb/onap/sdc-dcae-d-ci/sdc-dcae-d-ci-verify-jobs.yaml
index ce87d91b51152d862f1b761584fe59adab172180..5d6d6f187b91bea313870b76875d81ce12dede59 100644 (file)
--- a/jjb/onap/sdc-dcae-d-ci/sdc-dcae-d-ci-verify-jobs.yaml
+++ b/jjb/onap/sdc-dcae-d-ci/sdc-dcae-d-ci-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/sdc-dcae-d-dt-be-main/sdc-dcae-d-dt-be-main-verify-jobs.yaml b/jjb/onap/sdc-dcae-d-dt-be-main/sdc-dcae-d-dt-be-main-verify-jobs.yaml
index 7f38f8f65e9fc2987cd9ce1b74ef216098b38569..fd5f5e29d0b8c407fe2c4bdb8fa26483b851684b 100644 (file)
--- a/jjb/onap/sdc-dcae-d-dt-be-main/sdc-dcae-d-dt-be-main-verify-jobs.yaml
+++ b/jjb/onap/sdc-dcae-d-dt-be-main/sdc-dcae-d-dt-be-main-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/sdc-dcae-d-dt-be-property/sdc-dcae-d-dt-be-property-verify-jobs.yaml b/jjb/onap/sdc-dcae-d-dt-be-property/sdc-dcae-d-dt-be-property-verify-jobs.yaml
index 34b74a56ad0c87ad4c898cefc71a7aad704fdea1..43657ce8c3b7fe1909fefcb789f62a7eadb5da9b 100644 (file)
--- a/jjb/onap/sdc-dcae-d-dt-be-property/sdc-dcae-d-dt-be-property-verify-jobs.yaml
+++ b/jjb/onap/sdc-dcae-d-dt-be-property/sdc-dcae-d-dt-be-property-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/sdc-dcae-d-dt/sdc-dcae-d-dt-verify-jobs.yaml b/jjb/onap/sdc-dcae-d-dt/sdc-dcae-d-dt-verify-jobs.yaml
index bf06459e39bf8410cf2861c59820e004eaf89729..62ec45ab91f7b3a7b4f60bf3f588c7487002f6b6 100644 (file)
--- a/jjb/onap/sdc-dcae-d-dt/sdc-dcae-d-dt-verify-jobs.yaml
+++ b/jjb/onap/sdc-dcae-d-dt/sdc-dcae-d-dt-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/sdc-dcae-d-fe/sdc-dcae-d-fe-verify-jobs.yaml b/jjb/onap/sdc-dcae-d-fe/sdc-dcae-d-fe-verify-jobs.yaml
index 5f906dc84fb0c966e9c624d2c482c484e642b82a..78a43ed0bb86fce5bc6f4d583e447036dfdf74e9 100644 (file)
--- a/jjb/onap/sdc-dcae-d-fe/sdc-dcae-d-fe-verify-jobs.yaml
+++ b/jjb/onap/sdc-dcae-d-fe/sdc-dcae-d-fe-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/sdc-dcae-d-tosca-lab/sdc-dcae-d-tosca-lab-verify-jobs.yaml b/jjb/onap/sdc-dcae-d-tosca-lab/sdc-dcae-d-tosca-lab-verify-jobs.yaml
index f7f273f3e95c37d9e1da08937609efdfbdbda6fd..bb125c89c122f45955a8bdecf2b01c4c20031b0e 100644 (file)
--- a/jjb/onap/sdc-dcae-d-tosca-lab/sdc-dcae-d-tosca-lab-verify-jobs.yaml
+++ b/jjb/onap/sdc-dcae-d-tosca-lab/sdc-dcae-d-tosca-lab-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/sdc-jtosca/sdc-jtosca-verify-jobs.yaml b/jjb/onap/sdc-jtosca/sdc-jtosca-verify-jobs.yaml
index 88d70332e959beb7fc597dc26df0dcc81c214be2..19a23baf42e7f10ee9cc642aa4ad929421e39dbf 100644 (file)
--- a/jjb/onap/sdc-jtosca/sdc-jtosca-verify-jobs.yaml
+++ b/jjb/onap/sdc-jtosca/sdc-jtosca-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/sdc-sdc-be-common/sdc-sdc-be-common-verify-jobs.yaml b/jjb/onap/sdc-sdc-be-common/sdc-sdc-be-common-verify-jobs.yaml
index 2b3004ddeb68895da8682426dc9e7b6fe4a8d840..d7554a324f339f00e4f3494b69c17686cba2a372 100644 (file)
--- a/jjb/onap/sdc-sdc-be-common/sdc-sdc-be-common-verify-jobs.yaml
+++ b/jjb/onap/sdc-sdc-be-common/sdc-sdc-be-common-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/sdc-sdc-distribution-client/sdc-sdc-distribution-client-verify-jobs.yaml b/jjb/onap/sdc-sdc-distribution-client/sdc-sdc-distribution-client-verify-jobs.yaml
index e810ff8c865bb128d7ab5a90307164cf19c82619..921f441dbc577e636bfd27a3d6cc06b0900b6788 100644 (file)
--- a/jjb/onap/sdc-sdc-distribution-client/sdc-sdc-distribution-client-verify-jobs.yaml
+++ b/jjb/onap/sdc-sdc-distribution-client/sdc-sdc-distribution-client-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/sdc-sdc-docker-base/sdc-sdc-docker-base-verify-jobs.yaml b/jjb/onap/sdc-sdc-docker-base/sdc-sdc-docker-base-verify-jobs.yaml
index a8a1821934590b3de5cca0fda0080728ab1a4e4f..4821680186cea0e21494ae241b68c2208d43d6ab 100644 (file)
--- a/jjb/onap/sdc-sdc-docker-base/sdc-sdc-docker-base-verify-jobs.yaml
+++ b/jjb/onap/sdc-sdc-docker-base/sdc-sdc-docker-base-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/sdc-sdc-tosca/sdc-sdc-tosca-verify-jobs.yaml b/jjb/onap/sdc-sdc-tosca/sdc-sdc-tosca-verify-jobs.yaml
index de5062fd462f23279bb37215dbdf1c2325430743..4d64de50db7bc41d03bae421d2e008c23d46f7c6 100644 (file)
--- a/jjb/onap/sdc-sdc-tosca/sdc-sdc-tosca-verify-jobs.yaml
+++ b/jjb/onap/sdc-sdc-tosca/sdc-sdc-tosca-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/sdc-sdc-workflow-designer/sdc-sdc-workflow-designer-verify-jobs.yaml b/jjb/onap/sdc-sdc-workflow-designer/sdc-sdc-workflow-designer-verify-jobs.yaml
index 496337de38b6b164109a7cfd731192076f4ada5b..1b8d7a910aa95cbd5791f65f18386f7528260c20 100644 (file)
--- a/jjb/onap/sdc-sdc-workflow-designer/sdc-sdc-workflow-designer-verify-jobs.yaml
+++ b/jjb/onap/sdc-sdc-workflow-designer/sdc-sdc-workflow-designer-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/sdc/sdc-verify-jobs.yaml b/jjb/onap/sdc/sdc-verify-jobs.yaml
index 1830f6afb47df99211856f8e934c974fb90a7c60..b560ca07a16059b13950a52db575ee22356775d0 100644 (file)
--- a/jjb/onap/sdc/sdc-verify-jobs.yaml
+++ b/jjb/onap/sdc/sdc-verify-jobs.yaml
@@ -28,8 +28,10 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
       - '20.1':
           branch: '{stream}'
+          jdk-version: java-8
     disabled_job_var: true
 
     jobs:

diff --git a/jjb/onap/sdnc-adaptors/sdnc-adaptors-verify.yaml b/jjb/onap/sdnc-adaptors/sdnc-adaptors-verify.yaml
index d547e57308eee4ab71ce383eb8496269ea89bb39..0ebf485e65063d6fb69f305ec556e4e4239f1f57 100644 (file)
--- a/jjb/onap/sdnc-adaptors/sdnc-adaptors-verify.yaml
+++ b/jjb/onap/sdnc-adaptors/sdnc-adaptors-verify.yaml
@@ -27,6 +27,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/sdnc-core/sdnc-core-verify.yaml b/jjb/onap/sdnc-core/sdnc-core-verify.yaml
index cb17120fa7ae11eb12a558fb967f60be9ef8a3a3..b12f9ded2a01cf68c5042e506d6326d08de55789 100644 (file)
--- a/jjb/onap/sdnc-core/sdnc-core-verify.yaml
+++ b/jjb/onap/sdnc-core/sdnc-core-verify.yaml
@@ -27,6 +27,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/sdnc-northbound/sdnc-northbound-verify.yaml b/jjb/onap/sdnc-northbound/sdnc-northbound-verify.yaml
index 13740975acf4b5a202543e646258c6fc77fbd467..20db91217f6e8d11fd5083142c59e3369c1c5019 100644 (file)
--- a/jjb/onap/sdnc-northbound/sdnc-northbound-verify.yaml
+++ b/jjb/onap/sdnc-northbound/sdnc-northbound-verify.yaml
@@ -27,6 +27,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/sdnc-oam/sdnc-oam-verify.yaml b/jjb/onap/sdnc-oam/sdnc-oam-verify.yaml
index ce01f36d7d353b7afa3c10c794caf5353b8945b3..f983bba16a91dc5285e81ebba9789bffab7fd363 100644 (file)
--- a/jjb/onap/sdnc-oam/sdnc-oam-verify.yaml
+++ b/jjb/onap/sdnc-oam/sdnc-oam-verify.yaml
@@ -27,8 +27,10 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
       - dublin:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/sdnc-plugins/sdnc-plugins-verify.yaml b/jjb/onap/sdnc-plugins/sdnc-plugins-verify.yaml
index cde3899008feea3d5d7b5641d36796d019b9d7aa..4a28f11df27e78073d174620bfec530085d680c6 100644 (file)
--- a/jjb/onap/sdnc-plugins/sdnc-plugins-verify.yaml
+++ b/jjb/onap/sdnc-plugins/sdnc-plugins-verify.yaml
@@ -27,6 +27,7 @@
     stream:
       - master:
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/uds-sdc-customization/uds-sdc-customization-verify-jobs.yaml b/jjb/onap/uds-sdc-customization/uds-sdc-customization-verify-jobs.yaml
index f534f69ae4b01b2ae6a30122ae31962e611eff89..0e7348eca20b6885da09e731ada4f9083d7b7b92 100644 (file)
--- a/jjb/onap/uds-sdc-customization/uds-sdc-customization-verify-jobs.yaml
+++ b/jjb/onap/uds-sdc-customization/uds-sdc-customization-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
     disabled_job_var: true
 
     jobs:

diff --git a/jjb/onap/verify-jobs.sh b/jjb/onap/verify-jobs.sh
new file mode 100755 (executable)
index 0000000..fe437ef
--- /dev/null
+++ b/jjb/onap/verify-jobs.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -o errexit
+set -o nounset
+set -o pipefail
+
+cd $WORKSPACE
+echo "Info: Java version"
+echo "----------------------------------------------------"
+$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
+echo "Info: Maven version"
+echo "----------------------------------------------------"
+$MVN -version
+echo "----------------------------------------------------"
+echo "Proceeding with unit test"
+echo "----------------------------------------------------"
+$MVN clean install -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
\ No newline at end of file

diff --git a/jjb/onap/vid/vid-verify-jobs.yaml b/jjb/onap/vid/vid-verify-jobs.yaml
index dcb2f5dea9f6b1d5f8fd8ae9d4d4e6bc5e82ddd9..1409584941554807f45468166077ed2c749eca9d 100644 (file)
--- a/jjb/onap/vid/vid-verify-jobs.yaml
+++ b/jjb/onap/vid/vid-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/vnfsdk-dovetail-integration/vnfsdk-dovetail-integration-verify-jobs.yaml b/jjb/onap/vnfsdk-dovetail-integration/vnfsdk-dovetail-integration-verify-jobs.yaml
index 92cda6e962f544716b130d027bcd6396936c284f..b1cb1c96c4dd53e58e10de77a2921f354c85e9e3 100644 (file)
--- a/jjb/onap/vnfsdk-dovetail-integration/vnfsdk-dovetail-integration-verify-jobs.yaml
+++ b/jjb/onap/vnfsdk-dovetail-integration/vnfsdk-dovetail-integration-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/vnfsdk-functest/vnfsdk-functest-verify-jobs.yaml b/jjb/onap/vnfsdk-functest/vnfsdk-functest-verify-jobs.yaml
index 897f92730354285701317dab6e950b21ab70cf13..394f04db9d74a290e6ee5a6798fcdea713b8f161 100644 (file)
--- a/jjb/onap/vnfsdk-functest/vnfsdk-functest-verify-jobs.yaml
+++ b/jjb/onap/vnfsdk-functest/vnfsdk-functest-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/vnfsdk-ice/vnfsdk-ice-verify-jobs.yaml b/jjb/onap/vnfsdk-ice/vnfsdk-ice-verify-jobs.yaml
index 1979ed729d0f3922fa6ec52fdd851a47fb612074..7b980d6683775bdfca1bd87c5fc0364d30e2db8d 100644 (file)
--- a/jjb/onap/vnfsdk-ice/vnfsdk-ice-verify-jobs.yaml
+++ b/jjb/onap/vnfsdk-ice/vnfsdk-ice-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/vnfsdk-lctest/vnfsdk-lctest-verify-jobs.yaml b/jjb/onap/vnfsdk-lctest/vnfsdk-lctest-verify-jobs.yaml
index 929c6ff591625bb99afa0ec3a5a67f72762ebbb3..7d68ae81918e9edf3fedb9ddccf5641664d5fee6 100644 (file)
--- a/jjb/onap/vnfsdk-lctest/vnfsdk-lctest-verify-jobs.yaml
+++ b/jjb/onap/vnfsdk-lctest/vnfsdk-lctest-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/vnfsdk-pkgtools/vnfsdk-pkgtools-verify-jobs.yaml b/jjb/onap/vnfsdk-pkgtools/vnfsdk-pkgtools-verify-jobs.yaml
index 484c8f78d79fb0be1e50f29f736547fb6b5b759c..dc9b3e5d5245ffe86d6cc6e452685bbae8991ab3 100644 (file)
--- a/jjb/onap/vnfsdk-pkgtools/vnfsdk-pkgtools-verify-jobs.yaml
+++ b/jjb/onap/vnfsdk-pkgtools/vnfsdk-pkgtools-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/vnfsdk-refrepo/vnfsdk-refrepo-verify-jobs.yaml b/jjb/onap/vnfsdk-refrepo/vnfsdk-refrepo-verify-jobs.yaml
index 12db5af874cd36aaeecc30e448863e999765beb5..b1ddb35783701711f12a820c1fee6e81a9d4bcad 100644 (file)
--- a/jjb/onap/vnfsdk-refrepo/vnfsdk-refrepo-verify-jobs.yaml
+++ b/jjb/onap/vnfsdk-refrepo/vnfsdk-refrepo-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file

diff --git a/jjb/onap/vnfsdk-validation/vnfsdk-validation-verify-jobs.yaml b/jjb/onap/vnfsdk-validation/vnfsdk-validation-verify-jobs.yaml
index d1531d813862cb5a88e1c88e58662eb7a4731c36..0540cceff1ab209885dacb50d489ab2e73737a69 100644 (file)
--- a/jjb/onap/vnfsdk-validation/vnfsdk-validation-verify-jobs.yaml
+++ b/jjb/onap/vnfsdk-validation/vnfsdk-validation-verify-jobs.yaml
@@ -28,6 +28,7 @@
     stream:
       - 'master':
           branch: '{stream}'
+          jdk-version: java-8
 
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'
\ No newline at end of file