From 68ae901b4dde73e506e3d849b0f461a791eb0eab Mon Sep 17 00:00:00 2001 From: jhh Date: Thu, 21 May 2020 10:14:17 -0500 Subject: [PATCH] policy elalto jobs split for openjdk 8 or 11 Issue-ID: POLICY-2475 Signed-off-by: jhh Change-Id: Iac4ea2a0b4fcd7662f8326fc6e72a207179874c6 Signed-off-by: jhh --- jjb/policy/policy-apex-pdp.yaml | 32 +++++++++++++++++++++++++++++- jjb/policy/policy-api.yaml | 32 +++++++++++++++++++++++++++++- jjb/policy/policy-distribution.yaml | 32 +++++++++++++++++++++++++++++- jjb/policy/policy-drools-applications.yaml | 32 +++++++++++++++++++++++++++++- jjb/policy/policy-drools-pdp.yaml | 32 +++++++++++++++++++++++++++++- jjb/policy/policy-engine.yaml | 32 +++++++++++++++++++++++++++++- jjb/policy/policy-pap.yaml | 32 +++++++++++++++++++++++++++++- jjb/policy/policy-xacml-pdp.yaml | 32 +++++++++++++++++++++++++++++- 8 files changed, 248 insertions(+), 8 deletions(-) diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 3d18b9342..15d97fe89 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -33,10 +33,40 @@ branch: 'master' - 'frankfurt': branch: 'frankfurt' + mvn-settings: 'policy-apex-pdp-settings' + java-version: openjdk11 + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-docker-8c-8g + +- project: + name: policy-apex-pdp-elalto + project-name: 'policy-apex-pdp-elalto' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: "-P docker" + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -Dmaven.test.skip=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + + project: 'policy/apex-pdp' + stream: - 'elalto': branch: 'elalto' mvn-settings: 'policy-apex-pdp-settings' - java-version: openjdk11 + java-version: openjdk8 files: '**' archive-artifacts: '' build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index fe914a799..6819ee8c6 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -27,10 +27,40 @@ branch: 'master' - 'frankfurt': branch: 'frankfurt' + mvn-settings: 'policy-api-settings' + java-version: openjdk11 + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-builder-4c-4g + +- project: + name: policy-api-elalto + project-name: 'policy-api-elalto' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java': + docker-pom: 'pom.xml' + mvn-params: '-P docker' + build-node: ubuntu1804-docker-8c-8g + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -Dmaven.test.skip=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + + project: 'policy/api' + stream: - 'elalto': branch: 'elalto' mvn-settings: 'policy-api-settings' - java-version: openjdk11 + java-version: openjdk8 files: '**' archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index c5df8ad82..e495a15f3 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -27,10 +27,40 @@ branch: 'master' - 'frankfurt': branch: 'frankfurt' + mvn-settings: 'policy-distribution-settings' + java-version: openjdk11 + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-builder-4c-4g + +- project: + name: policy-distribution-elalto + project-name: 'policy-distribution-elalto' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java': + docker-pom: 'pom.xml' + mvn-params: '-P docker' + build-node: ubuntu1804-docker-8c-8g + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -Dmaven.test.skip=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + + project: 'policy/distribution' + stream: - 'elalto': branch: 'elalto' mvn-settings: 'policy-distribution-settings' - java-version: openjdk11 + java-version: openjdk8 files: '**' archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 8aa3f5d44..8d34c02ba 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -27,10 +27,40 @@ branch: 'master' - 'frankfurt': branch: 'frankfurt' + mvn-settings: 'policy-drools-applications-settings' + java-version: openjdk11 + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-docker-8c-8g + +- project: + name: policy-drools-applications-elalto + project-name: 'policy-drools-applications-elalto' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: "-P docker" + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -Dmaven.test.skip=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + + project: 'policy/drools-applications' + stream: - 'elalto': branch: 'elalto' mvn-settings: 'policy-drools-applications-settings' - java-version: openjdk11 + java-version: openjdk8 files: '**' archive-artifacts: '' build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index a48269073..5a5b6a90b 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -27,10 +27,40 @@ branch: 'master' - 'frankfurt': branch: 'frankfurt' + mvn-settings: 'policy-drools-pdp-settings' + java-version: openjdk11 + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-docker-8c-8g + +- project: + name: policy-drools-pdp-elalto + project-name: 'policy-drools-pdp-elalto' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: "-P docker" + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -Dmaven.test.skip=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + + project: 'policy/drools-pdp' + stream: - 'elalto': branch: 'elalto' mvn-settings: 'policy-drools-pdp-settings' - java-version: openjdk11 + java-version: openjdk8 files: '**' archive-artifacts: '' build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index 2a399cb11..8fe4e5224 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -25,10 +25,40 @@ stream: - 'frankfurt': branch: 'frankfurt' + mvn-settings: 'policy-engine-settings' + java-version: openjdk11 + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1804-docker-8c-8g' + +- project: + name: policy-engine-elalto + project-name: 'policy-engine-elalto' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: "-P docker" + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -Dmaven.test.skip=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + + project: 'policy/engine' + stream: - 'elalto': branch: 'elalto' mvn-settings: 'policy-engine-settings' - java-version: openjdk11 + java-version: openjdk8 files: '**' archive-artifacts: '' build-node: 'ubuntu1804-docker-8c-8g' diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index e7b15366c..32b256bbe 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -27,10 +27,40 @@ branch: 'master' - 'frankfurt': branch: 'frankfurt' + mvn-settings: 'policy-pap-settings' + java-version: openjdk11 + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-builder-4c-4g + +- project: + name: policy-pap-elalto + project-name: 'policy-pap-elalto' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java': + docker-pom: 'pom.xml' + mvn-params: '-P docker' + build-node: ubuntu1804-docker-8c-8g + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -Dmaven.test.skip=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + + project: 'policy/pap' + stream: - 'elalto': branch: 'elalto' mvn-settings: 'policy-pap-settings' - java-version: openjdk11 + java-version: openjdk8 files: '**' archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 017ecaee1..e44c30725 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -27,10 +27,40 @@ branch: 'master' - 'frankfurt': branch: 'frankfurt' + mvn-settings: 'policy-xacml-pdp-settings' + java-version: openjdk11 + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-builder-4c-4g + +- project: + name: policy-xacml-pdp-elalto + project-name: 'policy-xacml-pdp-elalto' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java': + docker-pom: 'pom.xml' + mvn-params: '-P docker' + build-node: ubuntu1804-docker-8c-8g + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -Dmaven.test.skip=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + + project: 'policy/xacml-pdp' + stream: - 'elalto': branch: 'elalto' mvn-settings: 'policy-xacml-pdp-settings' - java-version: openjdk11 + java-version: openjdk8 files: '**' archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g -- 2.16.6