From 7581f24dee995645d3ca2d1b089b5c4047553e54 Mon Sep 17 00:00:00 2001 From: Luis Gomez Date: Fri, 19 Apr 2019 15:15:07 -0700 Subject: [PATCH] Add more memory to distribution sanity test Change-Id: I32b3fe6369ce655248bf5fab7104c51dc715f93c Signed-off-by: Luis Gomez --- .../distribution/distribution-check-bootup.sh | 11 ++++++++--- .../distribution/distribution-templates.yaml | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/jjb/integration/distribution/distribution-check-bootup.sh b/jjb/integration/distribution/distribution-check-bootup.sh index 6ab50cfb38..e3147f335e 100644 --- a/jjb/integration/distribution/distribution-check-bootup.sh +++ b/jjb/integration/distribution/distribution-check-bootup.sh @@ -1,8 +1,13 @@ -CONTROLLERMEM="3072m" -ACTUALFEATURES="odl-integration-all" - if [[ ! -z "${CONTROLLERFEATURES}" ]]; then ACTUALFEATURES="odl-integration-all,${CONTROLLERFEATURES}" +else + ACTUALFEATURES="odl-integration-all" +fi + +if [[ "${JOB_NAME}" == *"distribution-sanity"* ]]; then + CONTROLLERMEM="4096m" +else + CONTROLLERMEM="3072m" fi echo "Kill any controller running" diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml index 054d441c69..b12ff84ced 100644 --- a/jjb/integration/distribution/distribution-templates.yaml +++ b/jjb/integration/distribution/distribution-templates.yaml @@ -395,7 +395,7 @@ # This job works for both managed & self-managed distro. project-type: freestyle - node: centos7-builder-4c-4g + node: centos7-builder-2c-8g concurrent: false properties: -- 2.36.6