Skip to content

Commit

Permalink
Version bumps for Q, Maven mem tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
Karm committed Jun 30, 2022
1 parent 64eae11 commit 267d214
Show file tree
Hide file tree
Showing 11 changed files with 284 additions and 19 deletions.
2 changes: 1 addition & 1 deletion jenkins/jobs/builds/mandrel_21_3_linux_build_matrix.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ matrixJob('mandrel-21-3-linux-build-matrix') {
)
stringParam(
'BRANCH_OR_TAG',
'mandrel/21.3',
'mandrel/21.3-dev',
'e.g. your PR branch or a specific tag.'
)
choiceParam('PACKAGING_REPOSITORY', Constants.PACKAGING_REPOSITORY, 'Mandrel packaging scripts.')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ matrixJob('mandrel-21-3-windows-build-matrix') {
)
stringParam(
'BRANCH_OR_TAG',
'mandrel/21.3',
'mandrel/21.3-dev',
'e.g. your PR branch or a specific tag.'
)
choiceParam('PACKAGING_REPOSITORY', Constants.PACKAGING_REPOSITORY, 'Mandrel packaging scripts.')
Expand Down
1 change: 1 addition & 0 deletions jenkins/jobs/builds/mandrel_22_1_linux_build_matrix.groovy
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
final Class Constants = new GroovyClassLoader(getClass().getClassLoader())
.parseClass(readFileFromWorkspace("jenkins/jobs/builds/Constants.groovy"))
matrixJob('mandrel-22-1-linux-build-matrix') {
disabled()
axes {
labelExpression('LABEL', ['el8_aarch64', 'el8'])
text('JDK_VERSION',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
final Class Constants = new GroovyClassLoader(getClass().getClassLoader())
.parseClass(readFileFromWorkspace("jenkins/jobs/builds/Constants.groovy"))
matrixJob('mandrel-22-1-windows-build-matrix') {
disabled()
axes {
labelExpression('LABEL', ['w2k19'])
text('JDK_VERSION',
Expand Down
132 changes: 132 additions & 0 deletions jenkins/jobs/builds/mandrel_22_2_linux_build_matrix.groovy
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
package jenkins.jobs.builds

final Class Constants = new GroovyClassLoader(getClass().getClassLoader())
.parseClass(readFileFromWorkspace("jenkins/jobs/builds/Constants.groovy"))
matrixJob('mandrel-22-2-linux-build-matrix') {
axes {
labelExpression('LABEL', ['el8_aarch64', 'el8'])
text('JDK_VERSION',
'11',
'17'
)
text('JDK_RELEASE',
'ea',
'ga'
)
}
displayName('Linux Build Matrix :: 22.2')
description('Linux build for 22.2 branch.')
logRotator {
numToKeep(10)
}
parameters {
choiceParam('REPOSITORY', Constants.REPOSITORY, 'Mandrel repo')
choiceParam(
'HEADS_OR_TAGS',
[
'heads',
'tags',
],
'To be used with the repository, e.g. to use a certain head or a tag.'
)
stringParam(
'BRANCH_OR_TAG',
'mandrel/22.2',
'e.g. your PR branch or a specific tag.'
)
choiceParam('PACKAGING_REPOSITORY', Constants.PACKAGING_REPOSITORY, 'Mandrel packaging scripts.')
choiceParam(
'PACKAGING_REPOSITORY_HEADS_OR_TAGS',
[
'heads',
'tags',
],
'To be used with the repository, e.g. to use a certain head or a tag.'
)
stringParam(
'PACKAGING_REPOSITORY_BRANCH_OR_TAG',
'22.2',
'e.g. master if you use heads or some tag if you use tags.'
)
stringParam(
'MANDREL_VERSION_SUBSTRING',
'22.2-SNAPSHOT',
'It must not contain spaces as it is used in tarball name too.'
)
}
multiscm {
git {
remote {
url('${PACKAGING_REPOSITORY}')
}
branches('refs/${PACKAGING_REPOSITORY_HEADS_OR_TAGS}/${PACKAGING_REPOSITORY_BRANCH_OR_TAG}')
extensions {
localBranch('${PACKAGING_REPOSITORY_BRANCH_OR_TAG}')
}
}
git {
remote {
url('${REPOSITORY}')
}
branches('refs/${HEADS_OR_TAGS}/${BRANCH_OR_TAG}')
extensions {
localBranch('${BRANCH_OR_TAG}')
relativeTargetDirectory('mandrel')
}
}
git {
remote {
url('https://github.com/graalvm/mx.git')
}
branches('refs/tags/6.0.1')
extensions {
localBranch('6.0.1')
relativeTargetDirectory('mx')
}
}
}
triggers {
scm('H H/2 * * *')
cron {
spec('0 2 * * 2,5')
}
}
steps {
shell {
command(Constants.LINUX_BUILD_CMD)
unstableReturn(1)
}
}
publishers {
buildDescription(/^MANDREL_DESCRIBE=(.*)$/, '\\1')
archiveArtifacts('mandrel*.tar.gz,MANDREL.md,mandrel*.sha1,mandrel*.sha256,jdk*/release')
wsCleanup()
postBuildCleanup {
cleaner {
psCleaner {
killerType('org.jenkinsci.plugins.proccleaner.PsRecursiveKiller')
}
}
}
extendedEmail {
recipientList('[email protected],[email protected]')
triggers {
failure {
sendTo {
recipientList()
attachBuildLog(true)
}
}
}
}
downstreamParameterized {
trigger(['mandrel-linux-integration-tests']) {
condition('SUCCESS')
parameters {
predefinedProp('MANDREL_BUILD_NUMBER', '${BUILD_NUMBER}')
matrixSubset('(MANDREL_BUILD=="${JOB_BASE_NAME}" && JDK_VERSION=="${JDK_VERSION}" && JDK_RELEASE=="${JDK_RELEASE}" && LABEL=="${LABEL}")')
}
}
}
}
}
131 changes: 131 additions & 0 deletions jenkins/jobs/builds/mandrel_22_2_windows_build_matrix.groovy
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
package jenkins.jobs.builds

final Class Constants = new GroovyClassLoader(getClass().getClassLoader())
.parseClass(readFileFromWorkspace("jenkins/jobs/builds/Constants.groovy"))
matrixJob('mandrel-22-2-windows-build-matrix') {
axes {
labelExpression('LABEL', ['w2k19'])
text('JDK_VERSION',
'11',
'17'
)
text('JDK_RELEASE',
'ea',
'ga'
)
}
displayName('Windows Build Matrix :: 22.2')
description('Windows build matrix for 22.2 branch.')
logRotator {
numToKeep(10)
}
parameters {
choiceParam('REPOSITORY', Constants.REPOSITORY, 'Mandrel repo')
choiceParam(
'HEADS_OR_TAGS',
[
'heads',
'tags',
],
'To be used with the repository, e.g. to use a certain head or a tag.'
)
stringParam(
'BRANCH_OR_TAG',
'mandrel/22.2',
'e.g. your PR branch or a specific tag.'
)
choiceParam('PACKAGING_REPOSITORY', Constants.PACKAGING_REPOSITORY, 'Mandrel packaging scripts.')
choiceParam(
'PACKAGING_REPOSITORY_HEADS_OR_TAGS',
[
'heads',
'tags',
],
'To be used with the repository, e.g. to use a certain head or a tag.'
)
stringParam(
'PACKAGING_REPOSITORY_BRANCH_OR_TAG',
'22.2',
'e.g. master if you use heads or some tag if you use tags.'
)
stringParam(
'MANDREL_VERSION_SUBSTRING',
'22.2-SNAPSHOT',
'It must not contain spaces as it is used in tarball name too.'
)
}
multiscm {
git {
remote {
url('${PACKAGING_REPOSITORY}')
}
branches('refs/${PACKAGING_REPOSITORY_HEADS_OR_TAGS}/${PACKAGING_REPOSITORY_BRANCH_OR_TAG}')
extensions {
localBranch('${PACKAGING_REPOSITORY_BRANCH_OR_TAG}')
}
}
git {
remote {
url('${REPOSITORY}')
}
branches('refs/${HEADS_OR_TAGS}/${BRANCH_OR_TAG}')
extensions {
localBranch('${BRANCH_OR_TAG}')
relativeTargetDirectory('mandrel')
}
}
git {
remote {
url('https://github.com/graalvm/mx.git')
}
branches('refs/tags/6.0.1')
extensions {
localBranch('6.0.1')
relativeTargetDirectory('mx')
}
}
}
triggers {
scm('H H/2 * * *')
cron {
spec('0 2 * * 5')
}
}
steps {
batchFile {
command(Constants.WINDOWS_BUILD_CMD)
unstableReturn(1)
}
}
publishers {
archiveArtifacts('mandrel*.zip,MANDREL.md,mandrel*.sha1,mandrel*.sha256,jdk*/release')
wsCleanup()
postBuildCleanup {
cleaner {
psCleaner {
killerType('org.jenkinsci.plugins.proccleaner.PsRecursiveKiller')
}
}
}
extendedEmail {
recipientList('[email protected],[email protected]')
triggers {
failure {
sendTo {
recipientList()
attachBuildLog(true)
}
}
}
}
downstreamParameterized {
trigger(['mandrel-windows-integration-tests']) {
condition('SUCCESS')
parameters {
predefinedProp('MANDREL_BUILD_NUMBER', '${BUILD_NUMBER}')
matrixSubset('(MANDREL_BUILD=="${JOB_BASE_NAME}" && JDK_VERSION=="${JDK_VERSION}" && JDK_RELEASE=="${JDK_RELEASE}" && LABEL=="${LABEL}")')
}
}
}
}
}
26 changes: 13 additions & 13 deletions jenkins/jobs/tests/Constants.groovy
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
class Constants {
static final ArrayList<String> QUARKUS_VERSION_RELEASED =
[
'2.2.5.Final',
'2.9.1.Final',
'2.7.5.Final'
'2.10.0.Final',
'2.7.6.Final'
]

static final ArrayList<String> QUARKUS_VERSION_SHORT =
[
'2.7.5.Final',
'2.7.6.Final',
'main'
]

static final ArrayList<String> QUARKUS_VERSION_BUILDER_IMAGE =
[
'2.9.1.Final',
'2.7.5.Final'
'2.10.0.Final',
'2.7.6.Final'
]

static final String QUARKUS_MODULES_TESTS = '' +
Expand Down Expand Up @@ -61,10 +60,11 @@ class Constants {
static final String LINUX_QUARKUS_TESTS = LINUX_PREPARE_MANDREL + '''
git clone --depth 1 --branch ${QUARKUS_VERSION} ${QUARKUS_REPO}
cd quarkus
export MAVEN_OPTS="-Xmx5g -XX:MaxMetaspaceSize=1g"
export MAVEN_OPTS="-Xmx5g -XX:MaxMetaspaceSize=3g"
./mvnw install -Dquickly
./mvnw verify -f integration-tests/pom.xml --fail-at-end --batch-mode -Dno-format \\
-DfailIfNoTests=false -Dnative -Dquarkus.native.native-image-xmx=8g -pl ${QUARKUS_MODULES}
./mvnw verify -fae -f integration-tests/pom.xml -Dmaven.test.failure.ignore=true --batch-mode -Dno-format \\
-DfailIfNoTests=false -Dnative -pl ${QUARKUS_MODULES} \\
-Dquarkus.native.native-image-xmx=6g
'''

static final String LINUX_CONTAINER_INTEGRATION_TESTS = '''
Expand Down Expand Up @@ -112,14 +112,14 @@ class Constants {
fi
export JAVA_HOME="/usr/java/openjdk-11"
export PATH="${JAVA_HOME}/bin:${PATH}"
export MAVEN_OPTS="-Xmx5g -XX:MaxMetaspaceSize=1g"
export MAVEN_OPTS="-Xmx5g -XX:MaxMetaspaceSize=3g"
./mvnw install -Dquickly
./mvnw verify -f integration-tests/pom.xml --fail-at-end \\
-pl ${QUARKUS_MODULES} -Dno-format -Ddocker -Dnative -Dnative.surefire.skip \\
-Dquarkus.native.container-build=true \\
-Dquarkus.native.builder-image="${BUILDER_IMAGE}" \\
-Dquarkus.native.container-runtime=${CONTAINER_RUNTIME} \\
-Dquarkus.native.native-image-xmx=8g
-Dquarkus.native.native-image-xmx=6g
'''

static final String WINDOWS_PREPARE_MANDREL = '''
Expand Down Expand Up @@ -158,8 +158,8 @@ class Constants {
static final String WINDOWS_QUARKUS_TESTS = WINDOWS_PREPARE_MANDREL + '''
git clone --depth 1 --branch %QUARKUS_VERSION% %QUARKUS_REPO%
cd quarkus
set "MAVEN_OPTS=-Xmx5g -XX:MaxMetaspaceSize=1g"
set "MAVEN_OPTS=-Xmx5g -XX:MaxMetaspaceSize=3g"
mvnw install -Dquickly & mvnw verify -f integration-tests/pom.xml --fail-at-end \\
--batch-mode -Dno-format -DfailIfNoTests=false -Dnative -Dquarkus.native.native-image-xmx=8g -pl %QUARKUS_MODULES%
--batch-mode -Dno-format -DfailIfNoTests=false -Dnative -Dquarkus.native.native-image-xmx=6g -pl %QUARKUS_MODULES%
'''
}
2 changes: 1 addition & 1 deletion jenkins/jobs/tests/mandrel_linux_integration_tests.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ matrixJob('mandrel-linux-integration-tests') {
)
text('MANDREL_BUILD',
'mandrel-21-3-linux-build-matrix',
'mandrel-22-1-linux-build-matrix',
'mandrel-22-2-linux-build-matrix',
'mandrel-master-linux-build-matrix'
)
text('QUARKUS_VERSION', Constants.QUARKUS_VERSION_RELEASED)
Expand Down
2 changes: 1 addition & 1 deletion jenkins/jobs/tests/mandrel_linux_quarkus_tests.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ matrixJob('mandrel-linux-quarkus-tests') {
)
text('MANDREL_BUILD',
'mandrel-21-3-linux-build-matrix',
'mandrel-22-1-linux-build-matrix',
'mandrel-22-2-linux-build-matrix',
'mandrel-master-linux-build-matrix'
)
text('QUARKUS_VERSION', Constants.QUARKUS_VERSION_SHORT)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ matrixJob('mandrel-windows-integration-tests') {
)
text('MANDREL_BUILD',
'mandrel-21-3-windows-build-matrix',
'mandrel-22-1-windows-build-matrix',
'mandrel-22-2-windows-build-matrix',
'mandrel-master-windows-build-matrix'
)
text('QUARKUS_VERSION', Constants.QUARKUS_VERSION_RELEASED)
Expand Down
Loading

0 comments on commit 267d214

Please sign in to comment.