Merge branch 'adapt_tests' into 'main'

Adapt tests

See merge request kosit/validator!52
This commit is contained in:
Andreas Penski 2022-11-10 11:41:37 +00:00
commit ca81eb7375

View file

@ -30,6 +30,11 @@ cache:
- target/surefire-reports/*.xml - target/surefire-reports/*.xml
- target/failsafe-reports/*.xml - target/failsafe-reports/*.xml
.java_extended:
extends: .java
rules:
- if: $CI_PIPELINE_SOURCE == "schedule"
java-11: java-11:
extends: .java extends: .java
image: $CI_REGISTRY_IMAGE/maven:3-jdk-11 image: $CI_REGISTRY_IMAGE/maven:3-jdk-11
@ -38,6 +43,7 @@ java-11:
- mvn $MAVEN_CLI_OPTS $BUILD_PROPS $CI_JOB_TIMESTAMP install - mvn $MAVEN_CLI_OPTS $BUILD_PROPS $CI_JOB_TIMESTAMP install
artifacts: artifacts:
name: java-11 name: java-11
when: always
paths: paths:
- target/*.jar - target/*.jar
- target/*.zip - target/*.zip
@ -51,23 +57,19 @@ java8:
image: $CI_REGISTRY_IMAGE/maven:3-jdk-8 image: $CI_REGISTRY_IMAGE/maven:3-jdk-8
java-11-openj9: java-11-openj9:
extends: .java extends: .java_extended
image: $CI_REGISTRY_IMAGE/maven:3-jdk-11-openj9 image: $CI_REGISTRY_IMAGE/maven:3-jdk-11-openj9
java-8-openj9: java-8-openj9:
extends: .java extends: .java_extended
image: $CI_REGISTRY_IMAGE/maven:3-jdk-8-openj9 image: $CI_REGISTRY_IMAGE/maven:3-jdk-8-openj9
java-15: java-15:
extends: .java extends: .java_extended
image: $CI_REGISTRY_IMAGE/maven:3-openjdk-15 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
java-16: java-16:
extends: .java extends: .java_extended
image: $CI_REGISTRY_IMAGE/maven:3-openjdk-16 image: $CI_REGISTRY_IMAGE/maven:3-openjdk-16
java-17: java-17:
@ -75,9 +77,13 @@ java-17:
image: $CI_REGISTRY_IMAGE/maven:3-openjdk-17 image: $CI_REGISTRY_IMAGE/maven:3-openjdk-17
java-18: java-18:
extends: .java extends: .java_extended
image: $CI_REGISTRY_IMAGE/maven:3-openjdk-18 image: $CI_REGISTRY_IMAGE/maven:3-openjdk-18
java-19:
extends: .java
image: $CI_REGISTRY_IMAGE/maven:3-eclipse-temurin-19
deploy: deploy:
stage: deploy stage: deploy
image: $CI_REGISTRY_IMAGE/maven:3-jdk-11 image: $CI_REGISTRY_IMAGE/maven:3-jdk-11