diff --git a/jenkins/jobs/builds/mandrel_23_0_linux_build_matrix.groovy b/jenkins/jobs/builds/mandrel_23_0_linux_build_matrix.groovy deleted file mode 100644 index b926b0b..0000000 --- a/jenkins/jobs/builds/mandrel_23_0_linux_build_matrix.groovy +++ /dev/null @@ -1,128 +0,0 @@ -package jenkins.jobs.builds - -final Class Constants = new GroovyClassLoader(getClass().getClassLoader()) - .parseClass(readFileFromWorkspace("jenkins/jobs/builds/Constants.groovy")) -matrixJob('mandrel-23-0-linux-build-matrix') { - axes { - labelExpression('LABEL', ['el8_aarch64', 'el8']) - text('JDK_VERSION', - '17' - ) - text('JDK_RELEASE', - 'ea', - 'ga' - ) - } - displayName('Linux Build Matrix :: 23.0') - description('Linux build for 23.0 branch.') - logRotator { - numToKeep(10) - } - parameters { - stringParam( - 'JDK_RELEASE_NAME', - 'latest', - 'You can pick from https://api.adoptium.net/v3/info/release_names or leave it as latest.' - ) - 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/23.0', - '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', - '23.0', - 'e.g. master if you use heads or some tag if you use tags.' - ) - stringParam( - 'MANDREL_VERSION_SUBSTRING', - '23.0-SNAPSHOT', - 'It must not contain spaces as it is used in tarball name too.' - ) - matrixCombinationsParam('MATRIX_COMBINATIONS_FILTER', "", 'Choose which combinations to run') - } - 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.52.0') - extensions { - localBranch('6.52.0') - 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('karm@redhat.com,fzakkak@redhat.com') - triggers { - failure { - sendTo { - recipientList() - attachBuildLog(true) - } - } - } - } - } -} diff --git a/jenkins/jobs/builds/mandrel_23_0_windows_build_matrix.groovy b/jenkins/jobs/builds/mandrel_23_0_windows_build_matrix.groovy deleted file mode 100644 index d45df0b..0000000 --- a/jenkins/jobs/builds/mandrel_23_0_windows_build_matrix.groovy +++ /dev/null @@ -1,127 +0,0 @@ -package jenkins.jobs.builds - -final Class Constants = new GroovyClassLoader(getClass().getClassLoader()) - .parseClass(readFileFromWorkspace("jenkins/jobs/builds/Constants.groovy")) -matrixJob('mandrel-23-0-windows-build-matrix') { - axes { - labelExpression('LABEL', ['w2k19']) - text('JDK_VERSION', - '17' - ) - text('JDK_RELEASE', - 'ea', - 'ga' - ) - } - displayName('Windows Build Matrix :: 23.0') - description('Windows build matrix for 23.0 branch.') - logRotator { - numToKeep(10) - } - parameters { - stringParam( - 'JDK_RELEASE_NAME', - 'latest', - 'You can pick from https://api.adoptium.net/v3/info/release_names or leave it as latest.' - ) - 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/23.0', - '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', - '23.0', - 'e.g. master if you use heads or some tag if you use tags.' - ) - stringParam( - 'MANDREL_VERSION_SUBSTRING', - '23.0-SNAPSHOT', - 'It must not contain spaces as it is used in tarball name too.' - ) - matrixCombinationsParam('MATRIX_COMBINATIONS_FILTER', "", 'Choose which combinations to run') - } - 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.52.0') - extensions { - localBranch('6.52.0') - 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('karm@redhat.com,fzakkak@redhat.com') - triggers { - failure { - sendTo { - recipientList() - attachBuildLog(true) - } - } - } - } - } -} diff --git a/jenkins/jobs/builds/mandrel_24_0_linux_build_matrix.groovy b/jenkins/jobs/builds/mandrel_24_0_linux_build_matrix.groovy deleted file mode 100644 index 76302cc..0000000 --- a/jenkins/jobs/builds/mandrel_24_0_linux_build_matrix.groovy +++ /dev/null @@ -1,140 +0,0 @@ -package jenkins.jobs.builds - -final Class Constants = new GroovyClassLoader(getClass().getClassLoader()) - .parseClass(readFileFromWorkspace("jenkins/jobs/builds/Constants.groovy")) -matrixJob('mandrel-24-0-linux-build-matrix') { - axes { - labelExpression('LABEL', ['el8_aarch64', 'el8']) - text('JDK_VERSION', - '22' - ) - text('JDK_RELEASE', - 'ea', - 'ga' - ) - } - displayName('Linux Build Matrix :: 24.0') - description('Linux build for 24.0 branch.') - logRotator { - numToKeep(10) - } -// combinationFilter( -// '!(JDK_VERSION=="22" && JDK_RELEASE=="ga")' -// ) - parameters { - stringParam( - 'JDK_RELEASE_NAME', - 'latest', - 'You can pick from https://api.adoptium.net/v3/info/release_names or leave it as latest.' - ) - 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/24.0', - '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', - '24.0', - 'e.g. master if you use heads or some tag if you use tags.' - ) - stringParam( - 'MANDREL_VERSION_SUBSTRING', - '24.0-SNAPSHOT', - 'It must not contain spaces as it is used in tarball name too.' - ) - matrixCombinationsParam('MATRIX_COMBINATIONS_FILTER', "", 'Choose which combinations to run') - } - 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/7.0.3') - extensions { - localBranch('7.0.3') - 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('karm@redhat.com,fzakkak@redhat.com') - 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}")') - } - } - } - } -} diff --git a/jenkins/jobs/builds/mandrel_24_0_windows_build_matrix.groovy b/jenkins/jobs/builds/mandrel_24_0_windows_build_matrix.groovy deleted file mode 100644 index e948571..0000000 --- a/jenkins/jobs/builds/mandrel_24_0_windows_build_matrix.groovy +++ /dev/null @@ -1,139 +0,0 @@ -package jenkins.jobs.builds - -final Class Constants = new GroovyClassLoader(getClass().getClassLoader()) - .parseClass(readFileFromWorkspace("jenkins/jobs/builds/Constants.groovy")) -matrixJob('mandrel-24-0-windows-build-matrix') { - axes { - labelExpression('LABEL', ['w2k19']) - text('JDK_VERSION', - '22' - ) - text('JDK_RELEASE', - 'ea', - 'ga' - ) - } - displayName('Windows Build Matrix :: 24.0') - description('Windows build matrix for 24.0 branch.') - logRotator { - numToKeep(10) - } -// combinationFilter( -// '!(JDK_VERSION=="22" && JDK_RELEASE=="ga")' -// ) - parameters { - stringParam( - 'JDK_RELEASE_NAME', - 'latest', - 'You can pick from https://api.adoptium.net/v3/info/release_names or leave it as latest.' - ) - 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/24.0', - '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', - '24.0', - 'e.g. master if you use heads or some tag if you use tags.' - ) - stringParam( - 'MANDREL_VERSION_SUBSTRING', - '24.0-SNAPSHOT', - 'It must not contain spaces as it is used in tarball name too.' - ) - matrixCombinationsParam('MATRIX_COMBINATIONS_FILTER', "", 'Choose which combinations to run') - } - 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/7.0.3') - extensions { - localBranch('7.0.3') - 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('karm@redhat.com,fzakkak@redhat.com') - 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}")') - } - } - } - } -} diff --git a/jenkins/jobs/builds/mandrel_24_1_linux_build_matrix.groovy b/jenkins/jobs/builds/mandrel_24_1_linux_build_matrix.groovy index 28a4caa..f7c6e02 100644 --- a/jenkins/jobs/builds/mandrel_24_1_linux_build_matrix.groovy +++ b/jenkins/jobs/builds/mandrel_24_1_linux_build_matrix.groovy @@ -86,9 +86,9 @@ matrixJob('mandrel-24-1-linux-build-matrix') { remote { url('https://github.com/graalvm/mx.git') } - branches('refs/tags/7.33.1') + branches('refs/tags/7.38.1') extensions { - localBranch('7.33.1') + localBranch('7.38.1') relativeTargetDirectory('mx') } } diff --git a/jenkins/jobs/builds/mandrel_24_1_macos_build_matrix.groovy b/jenkins/jobs/builds/mandrel_24_1_macos_build_matrix.groovy index 697fad5..7c64d0a 100644 --- a/jenkins/jobs/builds/mandrel_24_1_macos_build_matrix.groovy +++ b/jenkins/jobs/builds/mandrel_24_1_macos_build_matrix.groovy @@ -6,7 +6,7 @@ matrixJob('mandrel-24-1-macos-build-matrix') { axes { labelExpression('LABEL', ['macos_aarch64']) text('JDK_VERSION', - '23', + '23' ) text('JDK_RELEASE', 'ea', @@ -86,9 +86,9 @@ matrixJob('mandrel-24-1-macos-build-matrix') { remote { url('https://github.com/graalvm/mx.git') } - branches('refs/tags/7.33.1') + branches('refs/tags/7.38.1') extensions { - localBranch('7.33.1') + localBranch('7.38.1') relativeTargetDirectory('mx') } } diff --git a/jenkins/jobs/builds/mandrel_24_1_windows_build_matrix.groovy b/jenkins/jobs/builds/mandrel_24_1_windows_build_matrix.groovy index bcc9f0e..8ce554a 100644 --- a/jenkins/jobs/builds/mandrel_24_1_windows_build_matrix.groovy +++ b/jenkins/jobs/builds/mandrel_24_1_windows_build_matrix.groovy @@ -86,9 +86,9 @@ matrixJob('mandrel-24-1-windows-build-matrix') { remote { url('https://github.com/graalvm/mx.git') } - branches('refs/tags/7.33.1') + branches('refs/tags/7.38.1') extensions { - localBranch('7.33.1') + localBranch('7.38.1') relativeTargetDirectory('mx') } } diff --git a/jenkins/jobs/builds/mandrel_22_3_linux_build_matrix.groovy b/jenkins/jobs/builds/mandrel_24_2_linux_build_matrix.groovy similarity index 90% rename from jenkins/jobs/builds/mandrel_22_3_linux_build_matrix.groovy rename to jenkins/jobs/builds/mandrel_24_2_linux_build_matrix.groovy index db75a64..1c7dcb0 100644 --- a/jenkins/jobs/builds/mandrel_22_3_linux_build_matrix.groovy +++ b/jenkins/jobs/builds/mandrel_24_2_linux_build_matrix.groovy @@ -2,22 +2,25 @@ package jenkins.jobs.builds final Class Constants = new GroovyClassLoader(getClass().getClassLoader()) .parseClass(readFileFromWorkspace("jenkins/jobs/builds/Constants.groovy")) -matrixJob('mandrel-22-3-linux-build-matrix') { +matrixJob('mandrel-24-2-linux-build-matrix') { axes { labelExpression('LABEL', ['el8_aarch64', 'el8']) text('JDK_VERSION', - '17', + '24' ) text('JDK_RELEASE', 'ea', 'ga' ) } - displayName('Linux Build Matrix :: 22.3') - description('Linux build for 22.3 branch.') + displayName('Linux Build Matrix :: 24.2') + description('Linux build for 24.2 branch.') logRotator { numToKeep(10) } + combinationFilter( + '!(JDK_VERSION=="24" && JDK_RELEASE=="ga")' + ) parameters { stringParam( 'JDK_RELEASE_NAME', @@ -35,7 +38,7 @@ matrixJob('mandrel-22-3-linux-build-matrix') { ) stringParam( 'BRANCH_OR_TAG', - 'mandrel/22.3', + 'mandrel/24.2', 'e.g. your PR branch or a specific tag.' ) choiceParam('PACKAGING_REPOSITORY', Constants.PACKAGING_REPOSITORY, 'Mandrel packaging scripts.') @@ -49,12 +52,12 @@ matrixJob('mandrel-22-3-linux-build-matrix') { ) stringParam( 'PACKAGING_REPOSITORY_BRANCH_OR_TAG', - '22.3', + '24.2', 'e.g. master if you use heads or some tag if you use tags.' ) stringParam( 'MANDREL_VERSION_SUBSTRING', - '22.3-SNAPSHOT', + '24.2-SNAPSHOT', 'It must not contain spaces as it is used in tarball name too.' ) matrixCombinationsParam('MATRIX_COMBINATIONS_FILTER', "", 'Choose which combinations to run') @@ -83,9 +86,9 @@ matrixJob('mandrel-22-3-linux-build-matrix') { remote { url('https://github.com/graalvm/mx.git') } - branches('refs/tags/6.9.1') + branches('refs/tags/7.38.1') extensions { - localBranch('6.9.1') + localBranch('7.38.1') relativeTargetDirectory('mx') } } diff --git a/jenkins/jobs/builds/mandrel_24_0_macos_build_matrix.groovy b/jenkins/jobs/builds/mandrel_24_2_macos_build_matrix.groovy similarity index 89% rename from jenkins/jobs/builds/mandrel_24_0_macos_build_matrix.groovy rename to jenkins/jobs/builds/mandrel_24_2_macos_build_matrix.groovy index dbd92d3..048261d 100644 --- a/jenkins/jobs/builds/mandrel_24_0_macos_build_matrix.groovy +++ b/jenkins/jobs/builds/mandrel_24_2_macos_build_matrix.groovy @@ -2,25 +2,25 @@ package jenkins.jobs.builds final Class Constants = new GroovyClassLoader(getClass().getClassLoader()) .parseClass(readFileFromWorkspace("jenkins/jobs/builds/Constants.groovy")) -matrixJob('mandrel-24-0-macos-build-matrix') { +matrixJob('mandrel-24-2-macos-build-matrix') { axes { labelExpression('LABEL', ['macos_aarch64']) text('JDK_VERSION', - '22', + '24' ) text('JDK_RELEASE', 'ea', 'ga' ) } - displayName('MacOS Build Matrix :: 24.0') - description('MacOS build for 24.0 branch.') + displayName('MacOS Build Matrix :: 24.2') + description('MacOS build for 24.2 branch.') logRotator { numToKeep(10) } - //combinationFilter( - // '!(JDK_VERSION=="21" && JDK_RELEASE=="ga")' - //) + combinationFilter( + '!(JDK_VERSION=="24" && JDK_RELEASE=="ga")' + ) parameters { stringParam( 'JDK_RELEASE_NAME', @@ -38,7 +38,7 @@ matrixJob('mandrel-24-0-macos-build-matrix') { ) stringParam( 'BRANCH_OR_TAG', - 'mandrel/24.0', + 'mandrel/24.2', 'e.g. your PR branch or a specific tag.' ) choiceParam('PACKAGING_REPOSITORY', Constants.PACKAGING_REPOSITORY, 'Mandrel packaging scripts.') @@ -52,12 +52,12 @@ matrixJob('mandrel-24-0-macos-build-matrix') { ) stringParam( 'PACKAGING_REPOSITORY_BRANCH_OR_TAG', - '24.0', + '24.2', 'e.g. master if you use heads or some tag if you use tags.' ) stringParam( 'MANDREL_VERSION_SUBSTRING', - '24.0-SNAPSHOT', + '24.2-SNAPSHOT', 'It must not contain spaces as it is used in tarball name too.' ) matrixCombinationsParam('MATRIX_COMBINATIONS_FILTER', "", 'Choose which combinations to run') @@ -86,9 +86,9 @@ matrixJob('mandrel-24-0-macos-build-matrix') { remote { url('https://github.com/graalvm/mx.git') } - branches('refs/tags/7.0.3') + branches('refs/tags/7.38.1') extensions { - localBranch('7.0.3') + localBranch('7.38.1') relativeTargetDirectory('mx') } } diff --git a/jenkins/jobs/builds/mandrel_22_3_windows_build_matrix.groovy b/jenkins/jobs/builds/mandrel_24_2_windows_build_matrix.groovy similarity index 88% rename from jenkins/jobs/builds/mandrel_22_3_windows_build_matrix.groovy rename to jenkins/jobs/builds/mandrel_24_2_windows_build_matrix.groovy index 04ca83f..623475f 100644 --- a/jenkins/jobs/builds/mandrel_22_3_windows_build_matrix.groovy +++ b/jenkins/jobs/builds/mandrel_24_2_windows_build_matrix.groovy @@ -2,22 +2,25 @@ package jenkins.jobs.builds final Class Constants = new GroovyClassLoader(getClass().getClassLoader()) .parseClass(readFileFromWorkspace("jenkins/jobs/builds/Constants.groovy")) -matrixJob('mandrel-22-3-windows-build-matrix') { +matrixJob('mandrel-24-2-windows-build-matrix') { axes { labelExpression('LABEL', ['w2k19']) text('JDK_VERSION', - '17', + '23' ) text('JDK_RELEASE', 'ea', 'ga' ) } - displayName('Windows Build Matrix :: 22.3') - description('Windows build matrix for 22.3 branch.') + displayName('Windows Build Matrix :: 24.2') + description('Windows build matrix for 24.2 branch.') logRotator { numToKeep(10) } + combinationFilter( + '!(JDK_VERSION=="24" && JDK_RELEASE=="ga")' + ) parameters { stringParam( 'JDK_RELEASE_NAME', @@ -35,7 +38,7 @@ matrixJob('mandrel-22-3-windows-build-matrix') { ) stringParam( 'BRANCH_OR_TAG', - 'mandrel/22.3', + 'mandrel/24.2', 'e.g. your PR branch or a specific tag.' ) choiceParam('PACKAGING_REPOSITORY', Constants.PACKAGING_REPOSITORY, 'Mandrel packaging scripts.') @@ -49,12 +52,12 @@ matrixJob('mandrel-22-3-windows-build-matrix') { ) stringParam( 'PACKAGING_REPOSITORY_BRANCH_OR_TAG', - '22.3', + '24.2', 'e.g. master if you use heads or some tag if you use tags.' ) stringParam( 'MANDREL_VERSION_SUBSTRING', - '22.3-SNAPSHOT', + '24.2-SNAPSHOT', 'It must not contain spaces as it is used in tarball name too.' ) matrixCombinationsParam('MATRIX_COMBINATIONS_FILTER', "", 'Choose which combinations to run') @@ -83,9 +86,9 @@ matrixJob('mandrel-22-3-windows-build-matrix') { remote { url('https://github.com/graalvm/mx.git') } - branches('refs/tags/6.9.1') + branches('refs/tags/7.38.1') extensions { - localBranch('6.9.1') + localBranch('7.38.1') relativeTargetDirectory('mx') } } @@ -124,7 +127,7 @@ matrixJob('mandrel-22-3-windows-build-matrix') { } } downstreamParameterized { - trigger(['mandrel-windows-integration-tests']) { + trised -i 's/24_1/24_2/g' $ngger(['mandrel-windows-integration-tests']) { condition('SUCCESS') parameters { predefinedProp('MANDREL_BUILD_NUMBER', '${BUILD_NUMBER}') diff --git a/jenkins/jobs/tests/Constants.groovy b/jenkins/jobs/tests/Constants.groovy index 4e7e066..377cbcb 100644 --- a/jenkins/jobs/tests/Constants.groovy +++ b/jenkins/jobs/tests/Constants.groovy @@ -1,60 +1,44 @@ class Constants { static final ArrayList QUARKUS_VERSION_RELEASED = [ - '3.14.4', - '3.8.6', - '3.2.12.Final', - '2.16.12.Final', - '2.13.9.Final' + '3.18.0', + '3.15.3', + '3.8.6' ] static final ArrayList QUARKUS_VERSION_MACOS = [ - '3.14.4', + '3.15.3', '3.8.6' ] static final ArrayList QUARKUS_VERSION_BUILDER_IMAGE = [ - '3.14.4', - '3.8.6', - '3.2.12.Final', - '2.16.12.Final', - '2.13.9.Final' + '3.15.3', + '3.8.6' ] - static final ArrayList QUARKUS_VERSION_RELEASED_PERF = - [ - '3.14.4', - '3.8.6', - '3.2.12.Final', - '2.16.12.Final', - '2.13.9.Final' - ] + static final ArrayList QUARKUS_VERSION_RELEASED_PERF = QUARKUS_VERSION_RELEASED static final String QUARKUS_VERSION_RELEASED_COMBINATION_FILTER = //@formatter:off '(' + - '(MANDREL_BUILD.startsWith("mandrel-22") && QUARKUS_VERSION.trim().matches("^2.*")) ||' + - '(MANDREL_BUILD.startsWith("mandrel-23-0") && QUARKUS_VERSION.trim().matches("^3.2.*")) ||' + - '(MANDREL_BUILD.startsWith("mandrel-23-1") && QUARKUS_VERSION.trim().matches("^3.8.*|^3.14.*|^main.*")) ||' + - '(MANDREL_BUILD.startsWith("mandrel-24-") && QUARKUS_VERSION.trim().matches("^3.8.*|^3.14.*|^main.*")) ||' + - '(MANDREL_BUILD.startsWith("mandrel-master") && QUARKUS_VERSION.trim().matches("^3.14.*|^main.*"))' + + '(MANDREL_BUILD.startsWith("mandrel-23-1") && QUARKUS_VERSION.trim().matches("^3.*|^main.*")) ||' + + '(MANDREL_BUILD.startsWith("mandrel-24-") && QUARKUS_VERSION.trim().matches("^3.18.*|^3.15.*|^main.*")) ||' + + '(MANDREL_BUILD.startsWith("mandrel-master") && QUARKUS_VERSION.trim().matches("^3.18.*|^main.*"))' + ') && (' + - '(JDK_VERSION.equals("17") && (MANDREL_BUILD.startsWith("mandrel-22") || MANDREL_BUILD.startsWith("mandrel-23-0"))) ||' + '(JDK_VERSION.equals("21") && MANDREL_BUILD.startsWith("mandrel-23-1")) ||' + - '(JDK_VERSION.equals("22") && MANDREL_BUILD.startsWith("mandrel-24-0")) ||' + '(JDK_VERSION.equals("23") && MANDREL_BUILD.startsWith("mandrel-24-1")) ||' + + '(JDK_VERSION.equals("24") && JDK_RELEASE.equals("ea") && MANDREL_BUILD.startsWith("mandrel-24-2")) ||' + '(JDK_VERSION.equals("24") && JDK_RELEASE.equals("ea") && MANDREL_BUILD.startsWith("mandrel-master"))' + ')' //@formatter:on static final String QUARKUS_VERSION_BUILDER_COMBINATION_FILTER = //@formatter:off - '(BUILDER_IMAGE.contains("22.3") && QUARKUS_VERSION.trim().matches("^2.*")) ||' + - '(BUILDER_IMAGE.contains("23.0") && QUARKUS_VERSION.trim().matches("^3.2.*")) ||' + - '(BUILDER_IMAGE.contains("23.1") && QUARKUS_VERSION.trim().matches("^3.8.*|^3.14.*|^main.*")) ||' + - '(BUILDER_IMAGE.contains("24.") && QUARKUS_VERSION.trim().matches("^3.14.*|^main.*"))' + '(BUILDER_IMAGE.contains("jdk-21") && QUARKUS_VERSION.trim().matches("^3.*|^main.*")) ||' + + '(BUILDER_IMAGE.contains("jdk-23") && QUARKUS_VERSION.trim().matches("^3.18.*|^3.15.*|^main.*")) ||' + + '(BUILDER_IMAGE.contains("jdk-24") && QUARKUS_VERSION.trim().matches("^3.18.*|^3.15.*|^main.*"))' //@formatter:on static final String QUARKUS_MODULES_SUBSET_TESTS = '' + @@ -62,6 +46,7 @@ class Constants { 'no-awt' static final String LINUX_PREPARE_MANDREL = ''' + #!/bin/bash # Prepare Mandrel wget --quiet "https://ci.modcluster.io/view/Mandrel/job/${MANDREL_BUILD}/JDK_VERSION=${JDK_VERSION},JDK_RELEASE=${JDK_RELEASE},LABEL=${LABEL}/${MANDREL_BUILD_NUMBER}/artifact/*zip*/archive.zip" if [[ ! -f "archive.zip" ]]; then @@ -101,6 +86,7 @@ class Constants { ''' static final String MACOS_PREPARE_MANDREL = ''' + #!/bin/bash # Prepare Mandrel wget --quiet "https://ci.modcluster.io/view/Mandrel/job/${MANDREL_BUILD}/JDK_VERSION=${JDK_VERSION},JDK_RELEASE=${JDK_RELEASE},LABEL=${LABEL}/${MANDREL_BUILD_NUMBER}/artifact/*zip*/archive.zip" if [[ ! -f "archive.zip" ]]; then @@ -174,34 +160,63 @@ class Constants { df -h ps aux | grep java native-image --version - git clone --depth 1 --branch ${QUARKUS_VERSION} ${QUARKUS_REPO} - if [ -z "${QUARKUS_MODULES}" ]; then - export QUARKUS_MODULES=$(jq -r '.include | map(."test-modules") | join(",")' quarkus/.github/native-tests.json) - fi + # TestContainers tooling + export DOCKER_HOST=unix:///run/user/${UID}/podman/podman.sock + export TESTCONTAINERS_RYUK_DISABLED=false + systemctl --user enable podman.socket + systemctl --user start podman.socket + curl -H "Content-Type: application/json" --unix-socket /var/run/user/$UID/podman/podman.sock http://localhost/_ping + rm -rf quarkus + git clone --quiet --depth 1 --branch ${QUARKUS_VERSION} ${QUARKUS_REPO} cd quarkus - export MAVEN_OPTS="-Xmx5g -XX:MaxMetaspaceSize=4g" - ./mvnw --batch-mode install -Dquickly - ./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 + export MAVEN_OPTS="-Xmx5g -XX:MaxMetaspaceSize=5g" + export QUARKUS_NATIVE_CONTAINER_RUNTIME=podman + # Get rid of docker.io + find . -name "pom.xml" -exec sed -i 's~image>docker.io/~image>quay.io/karmkarm/~g' {} \\; + find . -name "*.java" -exec sed -i 's~"apachepulsar/pulsar:~"quay.io/karmkarm/apachepulsar/pulsar:~g' {} \\; + find . -name "*.java" -exec sed -i 's~"axllent/mailpit~"quay.io/karmkarm/axllent/mailpit~g' {} \\; + find . -name "*.java" -exec sed -i 's~"docker.io/grafana/otel-lgtm:~"quay.io/karmkarm/grafana/otel-lgtm:~g' {} \\; + find . -name "pom.xml" -exec sed -i 's~redis:~quay.io/karmkarm/redis:~g' {} \\; + find . -name "*.java" -exec sed -i 's~"rabbitmq:~"quay.io/karmkarm/rabbitmq:~g' {} \\; + find . -name "*.java" -exec sed -i 's~"reachfive/fake-smtp-server:~"quay.io/karmkarm/reachfive/fake-smtp-server:~g' {} \\; + find . -name "*.java" -exec sed -i 's~"docker.io/vectorized/redpanda~"quay.io/karmkarm/vectorized/redpanda~g' {} \\; + find . -name "*.java" -exec sed -i 's~"vectorized/redpanda~"quay.io/karmkarm/vectorized/redpanda~g' {} \\; + ./mvnw install --batch-mode -Dquickly + export JSON_FILE=".github/native-tests.json" + json_array=() + while IFS= read -r line; do + json_array+=("$line") + done < <(jq -c '.include[]' "$JSON_FILE") + for line in "${json_array[@]}"; do + category=$(echo "$line" | jq -r '.category') + test_modules=$(echo "$line" | jq -r '.["test-modules"]' | tr -d ' ') + echo "Running tests for category: $category" + echo "Test modules: $test_modules" + ./mvnw verify --batch-mode -f integration-tests/pom.xml -fn \\ + -Dnative -Dquarkus.native.native-image-xmx=8g \\ + -Dquarkus.native.container-build=false \\ + -Dmaven.test.failure.ignore=true -Dno-format \\ + -Dtest-containers -Dstart-containers -Ddocker -pl "$test_modules" || true + done ''' static final String LINUX_CONTAINER_INTEGRATION_TESTS = ''' + #!/bin/bash free -h df -h ps aux | grep java - export CONTAINER_RUNTIME=podman + export QUARKUS_NATIVE_CONTAINER_RUNTIME=podman source /etc/profile.d/jdks.sh set +e - sudo ${CONTAINER_RUNTIME} stop $(sudo ${CONTAINER_RUNTIME} ps -a -q) - sudo ${CONTAINER_RUNTIME} rm $(sudo ${CONTAINER_RUNTIME} ps -a -q) - yes | sudo ${CONTAINER_RUNTIME} volume prune + sudo podman stop $(sudo podman ps -a -q) + sudo podman rm $(sudo podman ps -a -q) + yes | sudo podman volume prune rm -rf /tmp/run-1000/libpod/tmp/pause.pid - ${CONTAINER_RUNTIME} stop $(${CONTAINER_RUNTIME} ps -a -q) - ${CONTAINER_RUNTIME} rm $(${CONTAINER_RUNTIME} ps -a -q) - yes | ${CONTAINER_RUNTIME} volume prune + podman stop $(podman ps -a -q) + podman rm $(podman ps -a -q) + yes | podman volume prune set -e - sudo ${CONTAINER_RUNTIME} pull ${BUILDER_IMAGE} + sudo podman pull ${BUILDER_IMAGE} if [ "$?" -ne 0 ]; then echo There was a problem pulling the image ${BUILDER_IMAGE}. We cannot proceed. exit 1 @@ -215,50 +230,70 @@ class Constants { export PATH="${JAVA_HOME}/bin:${PATH}" mvn --batch-mode clean verify -Ptestsuite-builder-image -Dquarkus.version=${QUARKUS_VERSION} \\ - -Dquarkus.native.container-runtime=${CONTAINER_RUNTIME} -Dquarkus.native.builder-image=${BUILDER_IMAGE} + -Dquarkus.native.container-runtime=podman -Dquarkus.native.builder-image=${BUILDER_IMAGE} ''' static final String LINUX_CONTAINER_QUARKUS_TESTS = ''' + #!/bin/bash free -h df -h ps aux | grep java - git clone --depth 1 --branch ${QUARKUS_VERSION} ${QUARKUS_REPO} - if [ -z "${QUARKUS_MODULES}" ]; then - export QUARKUS_MODULES=$(jq -r '.include | map(."test-modules") | join(",")' quarkus/.github/native-tests.json) - fi - cd quarkus - export CONTAINER_RUNTIME=podman + export QUARKUS_NATIVE_CONTAINER_RUNTIME=podman source /etc/profile.d/jdks.sh set +e - sudo ${CONTAINER_RUNTIME} stop $(sudo ${CONTAINER_RUNTIME} ps -a -q) - sudo ${CONTAINER_RUNTIME} rm $(sudo ${CONTAINER_RUNTIME} ps -a -q) - yes | sudo ${CONTAINER_RUNTIME} volume prune + sudo podman stop $(sudo podman ps -a -q) + sudo podman rm $(sudo podman ps -a -q) + yes | sudo podman volume prune rm -rf /tmp/run-1000/libpod/tmp/pause.pid - ${CONTAINER_RUNTIME} stop $(${CONTAINER_RUNTIME} ps -a -q) - ${CONTAINER_RUNTIME} rm $(${CONTAINER_RUNTIME} ps -a -q) - yes | ${CONTAINER_RUNTIME} volume prune + podman stop $(podman ps -a -q) + podman rm $(podman ps -a -q) + yes | podman volume prune set -e - sudo ${CONTAINER_RUNTIME} pull ${BUILDER_IMAGE} + sudo podman pull ${BUILDER_IMAGE} if [ "$?" -ne 0 ]; then echo There was a problem pulling the image ${BUILDER_IMAGE}. We cannot proceed. exit 1 fi # TestContainers tooling export DOCKER_HOST=unix:///run/user/${UID}/podman/podman.sock - export TESTCONTAINERS_RYUK_DISABLED=true + export TESTCONTAINERS_RYUK_DISABLED=false systemctl --user enable podman.socket systemctl --user start podman.socket curl -H "Content-Type: application/json" --unix-socket /var/run/user/$UID/podman/podman.sock http://localhost/_ping - + rm -rf quarkus + git clone --quiet --depth 1 --branch ${QUARKUS_VERSION} ${QUARKUS_REPO} + cd quarkus + export MAVEN_OPTS="-Xmx5g -XX:MaxMetaspaceSize=5g" + export QUARKUS_NATIVE_CONTAINER_RUNTIME=podman export PATH="${JAVA_HOME}/bin:${PATH}" - export MAVEN_OPTS="-Xmx5g -XX:MaxMetaspaceSize=4g" - ./mvnw --batch-mode install -Dquickly - ./mvnw --batch-mode 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=6g + # Get rid of docker.io + find . -name "pom.xml" -exec sed -i 's~image>docker.io/~image>quay.io/karmkarm/~g' {} \\; + find . -name "*.java" -exec sed -i 's~"apachepulsar/pulsar:~"quay.io/karmkarm/apachepulsar/pulsar:~g' {} \\; + find . -name "*.java" -exec sed -i 's~"axllent/mailpit~"quay.io/karmkarm/axllent/mailpit~g' {} \\; + find . -name "*.java" -exec sed -i 's~"docker.io/grafana/otel-lgtm:~"quay.io/karmkarm/grafana/otel-lgtm:~g' {} \\; + find . -name "pom.xml" -exec sed -i 's~redis:~quay.io/karmkarm/redis:~g' {} \\; + find . -name "*.java" -exec sed -i 's~"rabbitmq:~"quay.io/karmkarm/rabbitmq:~g' {} \\; + find . -name "*.java" -exec sed -i 's~"reachfive/fake-smtp-server:~"quay.io/karmkarm/reachfive/fake-smtp-server:~g' {} \\; + find . -name "*.java" -exec sed -i 's~"docker.io/vectorized/redpanda~"quay.io/karmkarm/vectorized/redpanda~g' {} \\; + find . -name "*.java" -exec sed -i 's~"vectorized/redpanda~"quay.io/karmkarm/vectorized/redpanda~g' {} \\; + ./mvnw install --batch-mode -Dquickly + export JSON_FILE=".github/native-tests.json" + json_array=() + while IFS= read -r line; do + json_array+=("$line") + done < <(jq -c '.include[]' "$JSON_FILE") + for line in "${json_array[@]}"; do + category=$(echo "$line" | jq -r '.category') + test_modules=$(echo "$line" | jq -r '.["test-modules"]' | tr -d ' ') + echo "Running tests for category: $category" + echo "Test modules: $test_modules" + ./mvnw verify --batch-mode -f integration-tests/pom.xml -fn \\ + -Dnative -Dquarkus.native.native-image-xmx=8g \\ + -Dquarkus.native.container-build=true \\ + -Dquarkus.native.builder-image="${BUILDER_IMAGE}" \\ + -Dmaven.test.failure.ignore=true -Dno-format \\ + -Dtest-containers -Dstart-containers -Ddocker -pl "$test_modules" || true + done ''' static final String WINDOWS_PREPARE_MANDREL = ''' @@ -302,12 +337,26 @@ class Constants { static final String WINDOWS_QUARKUS_TESTS = WINDOWS_PREPARE_MANDREL + ''' git clone --depth 1 --branch %QUARKUS_VERSION% %QUARKUS_REPO% - if "%QUARKUS_MODULES%"=="" ( - For /F "USEBACKQ Tokens=* Delims=" %%Q in (`jq -r ".include | map(.\\"test-modules\\") | join(\\"^,\\")" quarkus/.github/native-tests.json`) Do Set "QUARKUS_MODULES=%%Q" - ) cd quarkus - set "MAVEN_OPTS=-Xmx5g -XX:MaxMetaspaceSize=4g" - mvnw --batch-mode install -Dquickly & mvnw verify -f integration-tests/pom.xml --fail-at-end ^ - --batch-mode -Dno-format -DfailIfNoTests=false -Dnative -Dquarkus.native.native-image-xmx=6g -pl "%QUARKUS_MODULES%" + set "MAVEN_OPTS=-Xmx9g -XX:MaxMetaspaceSize=4g" + call mvnw --batch-mode install -Dquickly + set "MAVEN_OPTS=-Xmx5g -XX:MaxMetaspaceSize=5g" + @echo off + setlocal enabledelayedexpansion + set "JSON_FILE=.github\\native-tests.json" + for /f "usebackq delims=" %%A in (`jq -c ".include[]" "%JSON_FILE%"`) do ( + set "line=%%A" + for /f "usebackq delims=" %%B in (`echo !line! ^| jq -r ".category"`) do set "category=%%B" + for /f "usebackq delims=" %%C in (`echo !line! ^| jq -r ".\\"test-modules\\""`) do set "test_modules=%%C" + set "test_modules=!test_modules: =!" + echo Running tests for category: !category! + echo Test modules: !test_modules! + call mvnw verify --batch-mode -f integration-tests/pom.xml -fn ^ + -Dnative -Dquarkus.native.native-image-xmx=8g ^ + -Dquarkus.native.container-build=false ^ + -Dmaven.test.failure.ignore=true -Dno-format ^ + -pl "!test_modules!" || exit /b 0 + ) + endlocal ''' } diff --git a/jenkins/jobs/tests/mandrel_linux_container_integration_tests.groovy b/jenkins/jobs/tests/mandrel_linux_container_integration_tests.groovy index 5889ee4..7ff71e4 100644 --- a/jenkins/jobs/tests/mandrel_linux_container_integration_tests.groovy +++ b/jenkins/jobs/tests/mandrel_linux_container_integration_tests.groovy @@ -3,9 +3,7 @@ final Class Constants = new GroovyClassLoader(getClass().getClassLoader()) matrixJob('mandrel-linux-container-integration-tests') { axes { text('BUILDER_IMAGE', - 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-17', 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-21', - 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-22', 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-23', 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-24' ) @@ -53,7 +51,7 @@ matrixJob('mandrel-linux-container-integration-tests') { shell('echo DESCRIPTION_STRING=${QUARKUS_VERSION},${BUILDER_IMAGE}') buildDescription(/DESCRIPTION_STRING=([^\s]*)/, '\\1') shell { - command(Constants.LINUX_CONTAINER_INTEGRATION_TESTS) + command(Constants.LINUX_CONTAINER_INTEGRATION_TESTS.stripIndent()) unstableReturn(1) } } diff --git a/jenkins/jobs/tests/mandrel_linux_fedora_smoke_tests.groovy b/jenkins/jobs/tests/mandrel_linux_fedora_smoke_tests.groovy index d76767c..6420849 100644 --- a/jenkins/jobs/tests/mandrel_linux_fedora_smoke_tests.groovy +++ b/jenkins/jobs/tests/mandrel_linux_fedora_smoke_tests.groovy @@ -8,7 +8,8 @@ matrixJob('mandrel-linux-fedora-smoke-tests') { 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-17', 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-21', 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-22', - 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-23' + 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-23', + 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-24' ) labelExpression('LABEL', ['fedora_aarch64', 'el8_aarch64', 'el8']) } @@ -33,6 +34,7 @@ matrixJob('mandrel-linux-fedora-smoke-tests') { steps { shell { command(''' + #!/bin/bash getenforce podman info uname -a @@ -47,7 +49,7 @@ matrixJob('mandrel-linux-fedora-smoke-tests') { echo Error. exit 666 fi - ''' + '''.stripIndent() ) unstableReturn(1) } diff --git a/jenkins/jobs/tests/mandrel_linux_integration_tests.groovy b/jenkins/jobs/tests/mandrel_linux_integration_tests.groovy index 7e6c22f..39c98f6 100644 --- a/jenkins/jobs/tests/mandrel_linux_integration_tests.groovy +++ b/jenkins/jobs/tests/mandrel_linux_integration_tests.groovy @@ -3,9 +3,7 @@ final Class Constants = new GroovyClassLoader(getClass().getClassLoader()) matrixJob('mandrel-linux-integration-tests') { axes { text('JDK_VERSION', - '17', '21', - '22', '23', '24' ) @@ -14,11 +12,9 @@ matrixJob('mandrel-linux-integration-tests') { 'ga' ) text('MANDREL_BUILD', - 'mandrel-22-3-linux-build-matrix', - 'mandrel-23-0-linux-build-matrix', 'mandrel-23-1-linux-build-matrix', - 'mandrel-24-0-linux-build-matrix', 'mandrel-24-1-linux-build-matrix', + 'mandrel-24-2-linux-build-matrix', 'mandrel-master-linux-build-matrix' ) text('QUARKUS_VERSION', Constants.QUARKUS_VERSION_RELEASED) @@ -67,7 +63,7 @@ matrixJob('mandrel-linux-integration-tests') { shell('echo DESCRIPTION_STRING=Q:${QUARKUS_VERSION},M:${MANDREL_BUILD},J:${JDK_VERSION}-${JDK_RELEASE}') buildDescription(/DESCRIPTION_STRING=([^\s]*)/, '\\1') shell { - command(Constants.LINUX_INTEGRATION_TESTS) + command(Constants.LINUX_INTEGRATION_TESTS.stripIndent()) unstableReturn(1) } } diff --git a/jenkins/jobs/tests/mandrel_linux_quarkus_container_tests.groovy b/jenkins/jobs/tests/mandrel_linux_quarkus_container_tests.groovy index 9376b39..1e9d7c6 100644 --- a/jenkins/jobs/tests/mandrel_linux_quarkus_container_tests.groovy +++ b/jenkins/jobs/tests/mandrel_linux_quarkus_container_tests.groovy @@ -3,12 +3,11 @@ final Class Constants = new GroovyClassLoader(getClass().getClassLoader()) matrixJob('mandrel-linux-quarkus-container-tests') { axes { text('BUILDER_IMAGE', - 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:22.3-java17', - 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:23.0-java17', - 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:23.1-java21' + 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:23.1-java21', + 'quay.io/quarkus/ubi-quarkus-mandrel-builder-image:24.1-java23' ) text('QUARKUS_VERSION', Constants.QUARKUS_VERSION_BUILDER_IMAGE) - labelExpression('LABEL', ['el8']) + labelExpression('LABEL', ['el8_aarch64', 'el8']) } description('Run Quarkus TS with Mandrel distros. Quarkus versions differ according to particular Mandrel versions.') displayName('Linux :: Quarkus Builder image TS') @@ -25,9 +24,7 @@ matrixJob('mandrel-linux-quarkus-container-tests') { } combinationFilter(Constants.QUARKUS_VERSION_BUILDER_COMBINATION_FILTER) parameters { - stringParam('CONTAINER_RUNTIME', 'podman', 'Command used, either "docker" or "podman". Note that podman is not installed on all executors...') stringParam('QUARKUS_REPO', 'https://github.com/quarkusio/quarkus.git', 'Quarkus repository.') - stringParam('QUARKUS_MODULES', '', 'Uses .github/native-tests.json unless specified here.') matrixCombinationsParam('MATRIX_COMBINATIONS_FILTER', "", 'Choose which combinations to run') } triggers { @@ -39,7 +36,7 @@ matrixJob('mandrel-linux-quarkus-container-tests') { shell('echo DESCRIPTION_STRING=Q:${QUARKUS_VERSION},${BUILDER_IMAGE}') buildDescription(/DESCRIPTION_STRING=([^\s]*)/, '\\1') shell { - command(Constants.LINUX_CONTAINER_QUARKUS_TESTS) + command(Constants.LINUX_CONTAINER_QUARKUS_TESTS.stripIndent()) unstableReturn(1) } } diff --git a/jenkins/jobs/tests/mandrel_linux_quarkus_subset_tests.groovy b/jenkins/jobs/tests/mandrel_linux_quarkus_subset_tests.groovy index fd2c087..a54b8d9 100644 --- a/jenkins/jobs/tests/mandrel_linux_quarkus_subset_tests.groovy +++ b/jenkins/jobs/tests/mandrel_linux_quarkus_subset_tests.groovy @@ -5,21 +5,18 @@ final Class Constants = new GroovyClassLoader(getClass().getClassLoader()) matrixJob('mandrel-linux-quarkus-subset-tests') { axes { text('JDK_VERSION', - '17', '21', - '22', - '23' + '23', + '24' ) text('JDK_RELEASE', 'ea', 'ga' ) text('MANDREL_BUILD', - 'mandrel-22-3-linux-build-matrix', - 'mandrel-23-0-linux-build-matrix', 'mandrel-23-1-linux-build-matrix', - 'mandrel-24-0-linux-build-matrix', 'mandrel-24-1-linux-build-matrix', + 'mandrel-24-2-linux-build-matrix', 'mandrel-master-linux-build-matrix' ) text('QUARKUS_VERSION', Constants.QUARKUS_VERSION_RELEASED) @@ -58,7 +55,7 @@ matrixJob('mandrel-linux-quarkus-subset-tests') { } steps { shell { - command(Constants.LINUX_QUARKUS_TESTS) + command(Constants.LINUX_QUARKUS_TESTS.stripIndent()) unstableReturn(1) } } diff --git a/jenkins/jobs/tests/mandrel_linux_quarkus_tests.groovy b/jenkins/jobs/tests/mandrel_linux_quarkus_tests.groovy index 647ef5e..f9163bb 100644 --- a/jenkins/jobs/tests/mandrel_linux_quarkus_tests.groovy +++ b/jenkins/jobs/tests/mandrel_linux_quarkus_tests.groovy @@ -3,21 +3,18 @@ final Class Constants = new GroovyClassLoader(getClass().getClassLoader()) matrixJob('mandrel-linux-quarkus-tests') { axes { text('JDK_VERSION', - '17', '21', - '22', - '23' + '23', + '24' ) text('JDK_RELEASE', 'ea', 'ga' ) text('MANDREL_BUILD', - 'mandrel-22-3-linux-build-matrix', - 'mandrel-23-0-linux-build-matrix', 'mandrel-23-1-linux-build-matrix', - 'mandrel-24-0-linux-build-matrix', 'mandrel-24-1-linux-build-matrix', + 'mandrel-24-2-linux-build-matrix', 'mandrel-master-linux-build-matrix' ) text('QUARKUS_VERSION', Constants.QUARKUS_VERSION_RELEASED) @@ -41,7 +38,6 @@ matrixJob('mandrel-linux-quarkus-tests') { ) parameters { stringParam('QUARKUS_REPO', 'https://github.com/quarkusio/quarkus.git', 'Quarkus repository.') - stringParam('QUARKUS_MODULES', '', 'Uses .github/native-tests.json unless specified here.') stringParam( 'MANDREL_BUILD_NUMBER', 'lastSuccessfulBuild', @@ -56,7 +52,7 @@ matrixJob('mandrel-linux-quarkus-tests') { } steps { shell { - command(Constants.LINUX_QUARKUS_TESTS) + command(Constants.LINUX_QUARKUS_TESTS.stripIndent()) unstableReturn(1) } } diff --git a/jenkins/jobs/tests/mandrel_macos_integration_tests.groovy b/jenkins/jobs/tests/mandrel_macos_integration_tests.groovy index bc3b14c..0a274bb 100644 --- a/jenkins/jobs/tests/mandrel_macos_integration_tests.groovy +++ b/jenkins/jobs/tests/mandrel_macos_integration_tests.groovy @@ -6,7 +6,6 @@ matrixJob('mandrel-macos-integration-tests') { axes { text('JDK_VERSION', '21', - '22', '23', '24' ) @@ -16,8 +15,8 @@ matrixJob('mandrel-macos-integration-tests') { ) text('MANDREL_BUILD', 'mandrel-23-1-macos-build-matrix', - 'mandrel-24-0-macos-build-matrix', 'mandrel-24-1-macos-build-matrix', + 'mandrel-24-2-macos-build-matrix', 'mandrel-master-macos-build-matrix' ) text('QUARKUS_VERSION', Constants.QUARKUS_VERSION_MACOS) @@ -66,7 +65,7 @@ matrixJob('mandrel-macos-integration-tests') { shell('echo DESCRIPTION_STRING=Q:${QUARKUS_VERSION},M:${MANDREL_BUILD},J:${JDK_VERSION}-${JDK_RELEASE}') buildDescription(/DESCRIPTION_STRING=([^\s]*)/, '\\1') shell { - command(Constants.MACOS_INTEGRATION_TESTS) + command(Constants.MACOS_INTEGRATION_TESTS.stripIndent()) unstableReturn(1) } } diff --git a/jenkins/jobs/tests/mandrel_windows_integration_tests.groovy b/jenkins/jobs/tests/mandrel_windows_integration_tests.groovy index e2552ba..b393edb 100644 --- a/jenkins/jobs/tests/mandrel_windows_integration_tests.groovy +++ b/jenkins/jobs/tests/mandrel_windows_integration_tests.groovy @@ -3,9 +3,7 @@ final Class Constants = new GroovyClassLoader(getClass().getClassLoader()) matrixJob('mandrel-windows-integration-tests') { axes { text('JDK_VERSION', - '17', '21', - '22', '23', '24' ) @@ -14,11 +12,9 @@ matrixJob('mandrel-windows-integration-tests') { 'ga' ) text('MANDREL_BUILD', - 'mandrel-22-3-windows-build-matrix', - 'mandrel-23-0-windows-build-matrix', 'mandrel-23-1-windows-build-matrix', - 'mandrel-24-0-windows-build-matrix', 'mandrel-24-1-windows-build-matrix', + 'mandrel-24-2-windows-build-matrix', 'mandrel-master-windows-build-matrix' ) text('QUARKUS_VERSION', Constants.QUARKUS_VERSION_RELEASED) @@ -67,7 +63,7 @@ matrixJob('mandrel-windows-integration-tests') { batchFile('echo DESCRIPTION_STRING=Q:%QUARKUS_VERSION%,M:%MANDREL_BUILD%,J:%JDK_VERSION%-%JDK_RELEASE%') buildDescription(/DESCRIPTION_STRING=([^\s]*)/, '\\1') batchFile { - command(Constants.WINDOWS_INTEGRATION_TESTS) + command(Constants.WINDOWS_INTEGRATION_TESTS.stripIndent()) unstableReturn(1) } } diff --git a/jenkins/jobs/tests/mandrel_windows_quarkus_subset.groovy b/jenkins/jobs/tests/mandrel_windows_quarkus_subset.groovy index 66047f4..20c144c 100644 --- a/jenkins/jobs/tests/mandrel_windows_quarkus_subset.groovy +++ b/jenkins/jobs/tests/mandrel_windows_quarkus_subset.groovy @@ -16,9 +16,10 @@ matrixJob('mandrel-windows-quarkus-subset') { text('MANDREL_BUILD', 'mandrel-23-1-windows-build-matrix', 'mandrel-24-1-windows-build-matrix', + 'mandrel-24-2-windows-build-matrix', 'mandrel-master-windows-build-matrix' ) - text('QUARKUS_VERSION', "2024-09-23-fix-43436") + text('QUARKUS_VERSION', Constants.QUARKUS_VERSION_RELEASED) labelExpression('LABEL', ['w2k19']) } description('Run Quarkus TS with Mandrel distros. Quarkus versions differ according to particular Mandrel versions.') @@ -58,7 +59,7 @@ matrixJob('mandrel-windows-quarkus-subset') { } steps { batchFile { - command(Constants.WINDOWS_QUARKUS_TESTS) + command(Constants.WINDOWS_QUARKUS_TESTS.stripIndent()) unstableReturn(1) } } diff --git a/jenkins/jobs/tests/mandrel_windows_quarkus_tests.groovy b/jenkins/jobs/tests/mandrel_windows_quarkus_tests.groovy index 54358d2..d1d4d7f 100644 --- a/jenkins/jobs/tests/mandrel_windows_quarkus_tests.groovy +++ b/jenkins/jobs/tests/mandrel_windows_quarkus_tests.groovy @@ -3,21 +3,18 @@ final Class Constants = new GroovyClassLoader(getClass().getClassLoader()) matrixJob('mandrel-windows-quarkus-tests') { axes { text('JDK_VERSION', - '17', '21', - '22', - '23' + '23', + '24' ) text('JDK_RELEASE', 'ea', 'ga' ) text('MANDREL_BUILD', - 'mandrel-22-3-windows-build-matrix', - 'mandrel-23-0-windows-build-matrix', 'mandrel-23-1-windows-build-matrix', - 'mandrel-24-0-windows-build-matrix', 'mandrel-24-1-windows-build-matrix', + 'mandrel-24-2-windows-build-matrix', 'mandrel-master-windows-build-matrix' ) text('QUARKUS_VERSION', Constants.QUARKUS_VERSION_RELEASED) @@ -41,7 +38,6 @@ matrixJob('mandrel-windows-quarkus-tests') { ) parameters { stringParam('QUARKUS_REPO', 'https://github.com/quarkusio/quarkus.git', 'Quarkus repository.') - stringParam('QUARKUS_MODULES', '', 'Uses .github/native-tests.json unless specified here.') stringParam( 'MANDREL_BUILD_NUMBER', 'lastSuccessfulBuild', @@ -56,7 +52,7 @@ matrixJob('mandrel-windows-quarkus-tests') { } steps { batchFile { - command(Constants.WINDOWS_QUARKUS_TESTS) + command(Constants.WINDOWS_QUARKUS_TESTS.stripIndent()) unstableReturn(1) } }