Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Declare required jdk as top-level pipeline tool for P- and Y-builds #1731

Merged
merged 1 commit into from
Jan 16, 2024
Merged

Declare required jdk as top-level pipeline tool for P- and Y-builds #1731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions JenkinsJobs/YBuilds/P_build.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@ spec:
"""
}
}
tools {
jdk 'openjdk-jdk17-latest'
}
environment {
MAVEN_OPTS = "-Xmx6G"
CJE_ROOT = "${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production"
Expand Down Expand Up @@ -258,7 +261,6 @@ spec:
stage('Aggregator maven build'){
steps {
container('jnlp') {
withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) {
sh \'\'\'
cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
unset JAVA_TOOL_OPTIONS
Expand All @@ -270,15 +272,13 @@ spec:
exit 1
fi
\'\'\'
}
}
}
}
stage('Gather Eclipse Parts'){
steps {
container('jnlp') {
withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) {
withAnt(installation: 'apache-ant-latest', jdk: 'openjdk-jdk17-latest') {
withAnt(installation: 'apache-ant-latest') {
sh \'\'\'
cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
bash -x ./mb300_gatherEclipseParts.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb300_gatherEclipseParts.sh.log
Expand All @@ -289,7 +289,6 @@ spec:
fi
\'\'\'
}
}
}
}
}
Expand Down
23 changes: 6 additions & 17 deletions JenkinsJobs/YBuilds/Y_build.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@ spec:
"""
}
}
tools {
jdk 'openjdk-jdk17-latest'
}
environment {
MAVEN_OPTS = "-Xmx6G"
CJE_ROOT = "${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production"
Expand Down Expand Up @@ -229,8 +232,7 @@ spec:
steps {
container('jnlp') {
sshagent(['projects-storage.eclipse.org-bot-ssh']) {
withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) {
withAnt(installation: 'apache-ant-latest', jdk: 'openjdk-jdk17-latest') {
withAnt(installation: 'apache-ant-latest') {
sh \'\'\'
cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
./mb020_createBaseBuilder.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb020_createBaseBuilder.sh.log
Expand All @@ -241,7 +243,6 @@ spec:
fi
\'\'\'
}
}
}
}
}
Expand Down Expand Up @@ -317,7 +318,6 @@ spec:
stage('Create Source Bundles'){
steps {
container('jnlp') {
withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) {
sh \'\'\'
cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
unset JAVA_TOOL_OPTIONS
Expand All @@ -329,7 +329,6 @@ spec:
exit 1
fi
\'\'\'
}
}
}
}
Expand All @@ -339,7 +338,6 @@ spec:
}
steps {
container('jnlp') {
withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) {
sh \'\'\'
cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
unset JAVA_TOOL_OPTIONS
Expand All @@ -351,7 +349,6 @@ spec:
exit 1
fi
\'\'\'
}
}
}
}
Expand All @@ -362,8 +359,7 @@ spec:
}
steps {
container('jnlp') {
withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) {
withAnt(installation: 'apache-ant-latest', jdk: 'openjdk-jdk17-latest') {
withAnt(installation: 'apache-ant-latest') {
sh \'\'\'
cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
bash -x ./mb300_gatherEclipseParts.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb300_gatherEclipseParts.sh.log
Expand All @@ -374,7 +370,6 @@ spec:
fi
\'\'\'
}
}
}
}
}
Expand All @@ -385,8 +380,7 @@ spec:
}
steps {
container('jnlp') {
withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) {
withAnt(installation: 'apache-ant-latest', jdk: 'openjdk-jdk17-latest') {
withAnt(installation: 'apache-ant-latest') {
sh \'\'\'
cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
./mb310_gatherEquinoxParts.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb310_gatherEquinoxParts.sh.log
Expand All @@ -397,14 +391,12 @@ spec:
fi
\'\'\'
}
}
}
}
}
stage('Generate Repo reports'){
steps {
container('jnlp') {
withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) {
sh \'\'\'
cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
unset JAVA_TOOL_OPTIONS
Expand All @@ -416,14 +408,12 @@ spec:
exit 1
fi
\'\'\'
}
}
}
}
stage('Generate API tools reports'){
steps {
container('jnlp') {
withEnv(["JAVA_HOME=${ tool 'openjdk-jdk17-latest' }"]) {
sh \'\'\'
cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts
unset JAVA_TOOL_OPTIONS
Expand All @@ -435,7 +425,6 @@ spec:
exit 1
fi
\'\'\'
}
}
}
}
Expand Down
Loading