From e566ac682cc3260c733fb1707c745db10dfbd35a Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Fri, 20 Mar 2020 14:30:58 -0400 Subject: [PATCH] Upgrade some policy repos to 18.04 These 4 repos compile fine in an ubuntu VM so they are safe to be upgraded. drools-pdp hangs, apex fails, engine cannot bind, and distribution fails. They will need further reviews to determine if its simply a VM configuration error or a ubuntu issue (highly doubtful). Issue-ID: POLICY-2437 Change-Id: I9ff155bd44b49de10b7b49143fbd85e59f5464ae Signed-off-by: Pamela Dragosh --- jjb/policy/policy-api.yaml | 8 ++++---- jjb/policy/policy-common.yaml | 4 ++-- jjb/policy/policy-models.yaml | 4 ++-- jjb/policy/policy-pap.yaml | 8 ++++---- jjb/policy/policy-parent.yaml | 2 +- jjb/policy/policy-xacml-pdp.yaml | 8 ++++---- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 534e476e4..4c4c47d66 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -7,13 +7,13 @@ - '{project-name}-{stream}-merge-java': docker-pom: 'pom.xml' mvn-params: '-P docker' - build-node: ubuntu1604-docker-8c-8g + 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: ubuntu1604-docker-8c-8g + 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' @@ -29,7 +29,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-api-sonar @@ -41,7 +41,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/api' project-name: 'policy-api' branch: 'master' diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index 1499e006e..006ad3b95 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -20,7 +20,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-common-sonar @@ -32,7 +32,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/common' project-name: 'policy-common' branch: 'master' diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index 8b85b6e9f..0b9e63799 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -20,7 +20,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-models-sonar @@ -32,7 +32,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/models' project-name: 'policy-models' branch: 'master' diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index 97dc5675a..75c9e22ea 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -7,13 +7,13 @@ - '{project-name}-{stream}-merge-java': docker-pom: 'pom.xml' mvn-params: '-P docker' - build-node: ubuntu1604-docker-8c-8g + 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: ubuntu1604-docker-8c-8g + 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' @@ -29,7 +29,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-pap-sonar @@ -41,7 +41,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/pap' project-name: 'policy-pap' branch: 'master' diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index 013bc3e37..7901d4fd5 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -20,7 +20,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-parent-clm diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 0915bf0e6..a4982aaae 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -7,13 +7,13 @@ - '{project-name}-{stream}-merge-java': docker-pom: 'pom.xml' mvn-params: '-P docker' - build-node: ubuntu1604-docker-8c-8g + 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: ubuntu1604-docker-8c-8g + 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' @@ -29,7 +29,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-xacml-pdp-sonar @@ -41,7 +41,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/xacml-pdp' project-name: 'policy-xacml-pdp' branch: 'master' -- 2.16.6