Skip to content

Commit

Permalink
Merge pull request #37 from jenkins-infra/smerle33-jdk21
Browse files Browse the repository at this point in the history
feat(jdk21): add a check on agent availability
  • Loading branch information
smerle33 authored Aug 11, 2023
2 parents cb06923 + 279a936 commit 7353013
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ properties([
// Define the sequential stages and the parallel steps inside each stage
def sequentialStages = [:]
// Labels requested in https://github.com/jenkins-infra/pipeline-library/blob/master/vars/buildPlugin.groovy and https://github.com/jenkins-infra/pipeline-library/blob/master/vars/buildPluginWithGradle.groovy
sequentialStages['Tool'] = [ 'maven', 'maven-11', 'maven-17', 'maven-19', 'maven-windows', 'maven-11-windows', 'maven-17-windows', 'maven-19-windows']
sequentialStages['Tool'] = [ 'maven', 'maven-11', 'maven-17', 'maven-19', 'maven-windows', 'maven-11-windows', 'maven-17-windows', 'maven-19-windows', 'maven-21']
sequentialStages['Processor'] = [ 's390x', 'amd64' ] // 'arm64', not tested, unavailable
sequentialStages['Docker'] = [ 's390xdocker', 'docker', 'docker-windows'] //'arm64docker', not tested, unavailable

Expand Down
5 changes: 5 additions & 0 deletions checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ if [ $# -ge 1 ] && [ -n "$1" ] && [ "$1" != "kubernetes" ]; then
jdk="jdk-17";;
maven-19 | jdk-19)
jdk="jdk-19";;
maven-21 | jdk-21)
jdk="jdk-21";;
*)
echo "Label '$1' specified. Using default jdk."
esac
Expand All @@ -87,6 +89,9 @@ if [ $# -ge 1 ] && [ -n "$1" ] && [ "$1" != "kubernetes" ]; then
jdk-19)
jdknumber="19."
;;
jdk-21)
jdknumber="21-beta"
;;
*)
echo "ERROR: JDK not matching the expected ${jdk} for label '$1'"
mvn -v 2>&1
Expand Down

0 comments on commit 7353013

Please sign in to comment.