Merge branch 'optimize_ci' into 'master'

Optimize ci

See merge request kosit/validator!44
This commit is contained in:
Andreas Penski 2021-08-20 12:01:57 +00:00
commit 7bffb32eb6
3 changed files with 12 additions and 6 deletions

View file

@ -1,12 +1,19 @@
image: maven:latest image: maven:latest
variables: variables:
BUILD_PROPS: "-Dbuild.revision=$CI_COMMIT_SHA -Dbuild.branch=$CI_COMMIT_REF_NAME -Dbuild.number=$CI_PIPELINE_IID " 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_CLI_OPTS: " --batch-mode -Dfile.encoding=UTF-8 -s .mvn/settings.xml -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: before_script:
- export CI_JOB_TIMESTAMP="-Dbuild.timestamp=$(date --utc --iso-8601=seconds)" - export CI_JOB_TIMESTAMP="-Dbuild.timestamp=$(date --utc --iso-8601=seconds)"
cache:
key: "$CI_JOB_NAME"
paths:
- .m2/repository
java-11: java-11:
stage: build stage: build
image: $CI_REGISTRY_IMAGE/maven:3-jdk-11 image: $CI_REGISTRY_IMAGE/maven:3-jdk-11
@ -72,6 +79,8 @@ java-15:
stage: build stage: build
image: $CI_REGISTRY_IMAGE/maven:3-openjdk-15 image: $CI_REGISTRY_IMAGE/maven:3-openjdk-15
script: script:
- microdnf install libcgroup-tools
- cgget -n --values-only --variable memory.limit_in_bytes /
- mvn $MAVEN_CLI_OPTS $BUILD_PROPS $CI_JOB_TIMESTAMP verify - mvn $MAVEN_CLI_OPTS $BUILD_PROPS $CI_JOB_TIMESTAMP verify
retry: 2 retry: 2
artifacts: artifacts:

View file

@ -8,9 +8,6 @@ do
echo Creating build image for "$i" echo Creating build image for "$i"
{ {
echo "FROM maven:${i}" echo "FROM maven:${i}"
echo "ADD . /src/"
echo "WORKDIR /src"
echo "RUN mvn dependency:go-offline"
} >>Dockerfile } >>Dockerfile
docker build -t "$CI_REGISTRY_IMAGE/maven:$i" . docker build -t "$CI_REGISTRY_IMAGE/maven:$i" .
docker push "$CI_REGISTRY_IMAGE/maven:${i}" docker push "$CI_REGISTRY_IMAGE/maven:${i}"

View file

@ -1 +1 @@
-Xms128m -Xmx384m -Xms128m -Xmx256m