From 975136be943bbf944552479100ff1031de90cdd1 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Mon, 30 Mar 2020 13:17:05 -0700 Subject: [PATCH] Fix Ubuntu18 build-nodes We only have 4c-4g builder node for Ubuntu18 Fix build node names Change-Id: I6eab56062751c2c77a1b03b48343bd7a49bf3bdd Issue-ID: CIMAN-33 Signed-off-by: Jessica Wagantall --- jjb/appc/appc-master.yaml | 6 +++--- jjb/ccsdk/distribution.yaml | 2 +- jjb/ccsdk/features.yaml | 2 +- jjb/ccsdk/sli-adaptors.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index 7bd08ae2f..37e227239 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -4,11 +4,11 @@ project-name: 'appc' jobs: - '{project-name}-{stream}-verify-java': - build-node: ubuntu1804-builder-8c-8g + build-node: ubuntu1804-docker-8c-8g mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" java-opts: "-Xmx4000m -XX:MaxPermSize=256m" - '{project-name}-{stream}-merge-java': - build-node: ubuntu1804-builder-8c-8g + build-node: ubuntu1804-docker-8c-8g mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" java-opts: "-Xmx4000m -XX:MaxPermSize=256m" - gerrit-maven-stage: @@ -57,7 +57,7 @@ - gerrit-maven-clm: mvn-params: '-DskipTests' build-timeout: 60 - build-node: ubuntu1804-builder-8c-8g + build-node: ubuntu1804-docker-8c-8g mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" nexus-iq-namespace: 'onap-' project: 'appc' diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 218bd2b9c..be94c4f07 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -83,7 +83,7 @@ - project: name: ccsdk-distribution-whitesource project-name: ccsdk-distribution - build-node: ubuntu1804-builder-8c-8g + build-node: ubuntu1804-builder-4c-4g jobs: - gerrit-whitesource-scan: java-opts: '-Xmx2048m' diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index d5fb682f7..b4a116ad0 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -79,7 +79,7 @@ - project: name: ccsdk-features-whitesource - build-node: ubuntu1804-builder-8c-8g + build-node: ubuntu1804-builder-4c-4g project-name: ccsdk-features jobs: - gerrit-whitesource-scan diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index 0f2f046c9..ad92332ef 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -82,7 +82,7 @@ - project: name: ccsdk-sli-adaptors-whitesource - build-node: ubuntu1804-builder-8c-8g + build-node: ubuntu1804-builder-4c-4g project-name: ccsdk-sli-adaptors jobs: - gerrit-whitesource-scan -- 2.16.6