From 08e50ebedf02f8c5519c0600df25f78753e07b5f Mon Sep 17 00:00:00 2001 From: "robert.tomczyk" Date: Tue, 11 Aug 2020 16:53:28 +0100 Subject: [PATCH] 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 --- jjb/onap/aaf-authz/aaf-authz-verify-jobs.yaml | 1 + jjb/onap/aaf-cadi/aaf-cadi-verify-jobs.yaml | 1 + .../aaf-certservice-verify-jobs.yaml | 1 + jjb/onap/aaf-inno/aaf-inno-verify-jobs.yaml | 1 + .../aaf-luaplugin-verify-jobs.yaml | 1 + .../aai-schema-service-verify-jobs.yaml | 1 + jjb/onap/appc-cdt/appc-cdt-verify-jobs.yaml | 1 + .../appc-deployment-verify-jobs.yaml | 1 + .../appc-parent/appc-parent-verify-jobs.yaml | 1 + jjb/onap/appc/appc-verify-jobs.yaml | 1 + .../ccsdk-apps/ccsdk-apps-verify-jobs.yaml | 2 ++ jjb/onap/ccsdk-cds/ccsdk-cds-verify-jobs.yaml | 2 ++ .../ccsdk-dashboard-verify-jobs.yaml | 1 + .../ccsdk-distribution-verify-jobs.yaml | 1 + .../ccsdk-features-verify-jobs.yaml | 1 + .../ccsdk-oran/ccsdk-oran-verify-jobs.yaml | 6 +----- .../ccsdk-parent-verify-jobs.yaml | 1 + ...ccsdk-platform-blueprints-verify-jobs.yaml | 1 + .../ccsdk-platform-nbapi-verify-jobs.yaml | 1 + .../ccsdk-platform-plugins-verify-jobs.yaml | 1 + .../ccsdk-sli-adaptors-verify-jobs.yaml | 1 + .../ccsdk-sli-core-verify-jobs.yaml | 1 + .../ccsdk-sli-northbound-verify-jobs.yaml | 1 + .../ccsdk-sli-plugins-verify-jobs.yaml | 1 + .../ccsdk-storage-esaas-verify-jobs.yaml | 1 + .../ccsdk-storage-pgaas-verify-jobs.yaml | 1 + .../ccsdk-utils/ccsdk-utils-verify-jobs.yaml | 1 + jjb/onap/clamp/clamp-verify-jobs.yaml | 1 + ...egen2-collectors-datafile-verify-jobs.yaml | 4 ++-- .../dcaegen2-collectors-verify-jobs.yaml | 1 + .../dcaegen2-platform-cli-verify-jobs.yaml | 1 + ...aegen2-services-pm-mapper-verify-jobs.yaml | 2 ++ .../dcaegen2-services-prh-verify-jobs.yaml | 1 + .../dcaegen2-services-verify-jobs.yaml | 1 + .../dcaegen2-utils-verify-jobs.yaml | 1 + jjb/onap/dcaegen2/dcaegen2-verify-jobs.yaml | 2 ++ .../dmaap-buscontroller-verify-jobs.yaml | 2 ++ .../dmaap-datarouter-verify-jobs.yaml | 3 +++ .../dmaap-dbcapi-verify-jobs.yaml | 2 ++ .../global-templates-local-onap-java.yaml | 10 +++------- jjb/onap/global-templates-onap-java.yaml | 10 +++------- .../global-templates-onap-push-upstream.yaml | 3 --- jjb/onap/global-templates-onap-rebase.yaml | 3 --- jjb/onap/oparent/oparent-verify-jobs.yaml | 1 + .../policy-apex-pdp-verify-jobs.yaml | 2 ++ .../policy-api/policy-api-verify-jobs.yaml | 2 ++ .../policy-common-verify-jobs.yaml | 2 ++ .../policy-core/policy-core-verify-jobs.yaml | 2 ++ .../policy-distribution-verify-jobs.yaml | 2 ++ ...olicy-drools-applications-verify-jobs.yaml | 2 ++ .../policy-drools-pdp-verify-jobs.yaml | 2 ++ .../policy-engine-verify-jobs.yaml | 2 ++ .../policy-models-verify-jobs.yaml | 2 ++ .../policy-pap/policy-pap-verify-jobs.yaml | 1 + .../policy-parent-verify-jobs.yaml | 2 ++ .../policy-xacml-pdp-verify-jobs.yaml | 2 ++ jjb/onap/portal/portal-verify-jobs.yaml | 1 + .../sdc-dcae-d-ci-verify-jobs.yaml | 1 + .../sdc-dcae-d-dt-be-main-verify-jobs.yaml | 1 + ...sdc-dcae-d-dt-be-property-verify-jobs.yaml | 1 + .../sdc-dcae-d-dt-verify-jobs.yaml | 1 + .../sdc-dcae-d-fe-verify-jobs.yaml | 1 + .../sdc-dcae-d-tosca-lab-verify-jobs.yaml | 1 + .../sdc-jtosca/sdc-jtosca-verify-jobs.yaml | 1 + .../sdc-sdc-be-common-verify-jobs.yaml | 1 + ...c-sdc-distribution-client-verify-jobs.yaml | 1 + .../sdc-sdc-docker-base-verify-jobs.yaml | 1 + .../sdc-sdc-tosca-verify-jobs.yaml | 1 + ...sdc-sdc-workflow-designer-verify-jobs.yaml | 1 + jjb/onap/sdc/sdc-verify-jobs.yaml | 2 ++ .../sdnc-adaptors/sdnc-adaptors-verify.yaml | 1 + jjb/onap/sdnc-core/sdnc-core-verify.yaml | 1 + .../sdnc-northbound-verify.yaml | 1 + jjb/onap/sdnc-oam/sdnc-oam-verify.yaml | 2 ++ .../sdnc-plugins/sdnc-plugins-verify.yaml | 1 + .../uds-sdc-customization-verify-jobs.yaml | 1 + jjb/onap/verify-jobs.sh | 19 +++++++++++++++++++ jjb/onap/vid/vid-verify-jobs.yaml | 1 + ...fsdk-dovetail-integration-verify-jobs.yaml | 1 + .../vnfsdk-functest-verify-jobs.yaml | 1 + .../vnfsdk-ice/vnfsdk-ice-verify-jobs.yaml | 1 + .../vnfsdk-lctest-verify-jobs.yaml | 1 + .../vnfsdk-pkgtools-verify-jobs.yaml | 1 + .../vnfsdk-refrepo-verify-jobs.yaml | 1 + .../vnfsdk-validation-verify-jobs.yaml | 1 + 85 files changed, 127 insertions(+), 27 deletions(-) create mode 100755 jjb/onap/verify-jobs.sh diff --git a/jjb/onap/aaf-authz/aaf-authz-verify-jobs.yaml b/jjb/onap/aaf-authz/aaf-authz-verify-jobs.yaml index a4f68cec..97ebae2a 100644 --- 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 d948b144..98d5f0aa 100644 --- 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 751be8ba..9db76d85 100644 --- 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 eecb29a4..082512b0 100644 --- 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 cb89bceb..c9ae17be 100644 --- 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 fa02fbba..7cdf4c32 100644 --- 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 25638b5f..7f610fbc 100644 --- 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 1c762aed..78b1762e 100644 --- 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 85429501..63e49eb2 100644 --- 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 f3df7dd1..82255f8c 100644 --- 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 f9ac0e0f..8a592c18 100644 --- 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 de4b038e..462a8abd 100644 --- 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 96340b51..0039b892 100644 --- 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 a7a201fc..51bcf433 100644 --- 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 ba4152e8..18e53dc1 100644 --- 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 a0fbbacd..3446c8fe 100644 --- 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 4ed95838..6f13ca94 100644 --- 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 6c324141..5fc25d47 100644 --- 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 14109a6d..bacd91bc 100644 --- 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 dee8c190..a2d3b127 100644 --- 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 aed5fff4..8670ebf7 100644 --- 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 16d9fbd7..5a515580 100644 --- 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 d42ee2dc..d4343dba 100644 --- 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 e4f9c4cc..a7fb05ad 100644 --- 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 afe87e58..e8bba94f 100644 --- 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 cee1233d..17105ef2 100644 --- 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 d32452f3..70f75031 100644 --- 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 a1939abe..30cb2927 100644 --- 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 b63891d1..8a12cb25 100644 --- 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 b7020035..931e21a1 100644 --- 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 0a423059..c2d2cb44 100644 --- 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 07d36d38..02d832b7 100644 --- 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 b404fd37..b9374739 100644 --- 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 295bbe4e..43956304 100644 --- 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 bc11c253..8e0755d8 100644 --- 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 f01607ac..7261eb5d 100644 --- 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 24a5d2cf..48fadccd 100644 --- 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 6ec29991..6e766116 100644 --- 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 a35c510a..cfb42e41 100644 --- 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 3186731c..89170687 100644 --- 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 d9143a70..7a3f2cec 100644 --- 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 65d2d6d8..6977e60a 100644 --- 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 723190a4..f2f74013 100644 --- 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 5b5145b1..c82942dd 100644 --- 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 f003f6a3..2efa6114 100644 --- 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 13c3771c..8b55a204 100644 --- 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 9066bf7e..dd9768a2 100644 --- 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 7f521dc2..b41adb6b 100644 --- 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 8c542fe6..7d4a19ce 100644 --- 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 0536c879..419bc337 100644 --- 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 fc097156..b418145c 100644 --- 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 325aae33..7a41e32d 100644 --- 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 880855b9..b8a68a11 100644 --- 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 7e93e07c..dd734277 100644 --- 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 f52238ae..ff314c9b 100644 --- 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 5c27cb04..1d200e78 100644 --- 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 9edb7b13..84a6d959 100644 --- 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 ce87d91b..5d6d6f18 100644 --- 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 7f38f8f6..fd5f5e29 100644 --- 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 34b74a56..43657ce8 100644 --- 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 bf06459e..62ec45ab 100644 --- 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 5f906dc8..78a43ed0 100644 --- 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 f7f273f3..bb125c89 100644 --- 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 88d70332..19a23baf 100644 --- 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 2b3004dd..d7554a32 100644 --- 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 e810ff8c..921f441d 100644 --- 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 a8a18219..48216801 100644 --- 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 de5062fd..4d64de50 100644 --- 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 496337de..1b8d7a91 100644 --- 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 1830f6af..b560ca07 100644 --- 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 d547e573..0ebf485e 100644 --- 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 cb17120f..b12f9ded 100644 --- 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 13740975..20db9121 100644 --- 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 ce01f36d..f983bba1 100644 --- 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 cde38990..4a28f11d 100644 --- 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 f534f69a..0e7348ec 100644 --- 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 index 00000000..fe437ef7 --- /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 dcb2f5de..14095849 100644 --- 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 92cda6e9..b1cb1c96 100644 --- 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 897f9273..394f04db 100644 --- 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 1979ed72..7b980d66 100644 --- 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 929c6ff5..7d68ae81 100644 --- 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 484c8f78..dc9b3e5d 100644 --- 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 12db5af8..b1ddb357 100644 --- 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 d1531d81..0540ccef 100644 --- 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 -- 2.25.1