From 313cd9914a36eb2ba54f7e8eafdb957d7e6d7434 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 30 Aug 2023 09:47:08 -0600
Subject: [PATCH] add memory
---
.gitlab-ci.yml | 3 +++
gradle/nshm.gradle | 12 +++++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b2f90721..11392805 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -239,6 +239,9 @@ NSHM Tests:
- CMD: testConus2023
- CMD: testHawaii2021
script:
+ - memory="$(free -g | awk '/^Mem:/{print $2}')";
+ - export CI_RUNNER_MEMORY="$(printf "%.f" "$(echo "${memory} * 0.90" | bc)")g";
+ - echo "${CI_RUNNER_MEMORY}"
- ./gradlew ${CMD}
- cat ${JACOCO_HTML_DIR}/index.html
stage: test
diff --git a/gradle/nshm.gradle b/gradle/nshm.gradle
index 0aad9e2f..6a761b87 100644
--- a/gradle/nshm.gradle
+++ b/gradle/nshm.gradle
@@ -13,6 +13,8 @@ import org.yaml.snakeyaml.Yaml
ext {
nshmDir = "nshms";
+ envMemory = System.getenv("CI_RUNNER_MEMORY")
+ def xmx = envMemory ? envMemory : "16g"
// Download and unzip NSHM
downloadNshm = {nshm ->
@@ -92,7 +94,7 @@ task testAlaska2007(type: Test) {
useJUnitPlatform()
jvmArgs(
"-Xms2g",
- "-Xmx8g",
+ "-Xmx${xmx}",
)
filter {
@@ -116,7 +118,7 @@ task testAlaska2023(type: Test) {
useJUnitPlatform()
jvmArgs(
"-Xms2g",
- "-Xmx8g",
+ "-Xmx${xmx}",
)
filter {
@@ -140,7 +142,7 @@ task testConus2018(type: Test) {
useJUnitPlatform()
jvmArgs(
"-Xms2g",
- "-Xmx8g",
+ "-Xmx${xmx}",
)
filter {
@@ -164,7 +166,7 @@ task testConus2023(type: Test) {
useJUnitPlatform()
jvmArgs(
"-Xms2g",
- "-Xmx16g",
+ "-Xmx${xmx}",
)
filter {
@@ -188,7 +190,7 @@ task testHawaii2021(type: Test) {
useJUnitPlatform()
jvmArgs(
"-Xms2g",
- "-Xmx8g",
+ "-Xmx${xmx}",
)
filter {
--
GitLab