diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36ec993..7eeeaf3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,12 +1,19 @@ image: maven:latest variables: - BUILD_PROPS: "-Dbuild.revision=$CI_COMMIT_SHA -Dbuild.branch=$CI_COMMIT_REF_NAME -Dbuild.number=$CI_PIPELINE_IID " - MAVEN_CLI_OPTS: " --batch-mode -Dfile.encoding=UTF-8 -s .mvn/settings.xml -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false" + BUILD_PROPS: "-Dbuild.revision=$CI_COMMIT_SHA -Dbuild.branch=$CI_COMMIT_REF_NAME -Dbuild.number=$CI_PIPELINE_IID -Dfile.encoding=UTF-8 -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false" + MAVEN_OPTS: "-Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true" + MAVEN_CLI_OPTS: " --batch-mode --errors --fail-at-end --show-version -s .mvn/settings.xml" before_script: - export CI_JOB_TIMESTAMP="-Dbuild.timestamp=$(date --utc --iso-8601=seconds)" +cache: + key: "$CI_JOB_NAME" + paths: + - .m2/repository + + java-11: stage: build image: $CI_REGISTRY_IMAGE/maven:3-jdk-11 @@ -72,6 +79,8 @@ java-15: stage: build image: $CI_REGISTRY_IMAGE/maven:3-openjdk-15 script: + - microdnf install libcgroup-tools + - cgget -n --values-only --variable memory.limit_in_bytes / - mvn $MAVEN_CLI_OPTS $BUILD_PROPS $CI_JOB_TIMESTAMP verify retry: 2 artifacts: diff --git a/.mvn/createBuildImages.sh b/.mvn/createBuildImages.sh index 2aab9e4..0e875c9 100644 --- a/.mvn/createBuildImages.sh +++ b/.mvn/createBuildImages.sh @@ -8,9 +8,6 @@ do echo Creating build image for "$i" { echo "FROM maven:${i}" - echo "ADD . /src/" - echo "WORKDIR /src" - echo "RUN mvn dependency:go-offline" } >>Dockerfile docker build -t "$CI_REGISTRY_IMAGE/maven:$i" . docker push "$CI_REGISTRY_IMAGE/maven:${i}" diff --git a/.mvn/jvm.config b/.mvn/jvm.config index f023f5e..883d916 100644 --- a/.mvn/jvm.config +++ b/.mvn/jvm.config @@ -1 +1 @@ --Xms128m -Xmx384m \ No newline at end of file +-Xms128m -Xmx256m \ No newline at end of file