Skip to content

Commit a809de5

Browse files
HannesWellHannesWell
committed
[P-Build] Avoid modified copies of build scripts for P-builds
Contributes to: - #2625
1 parent be370c0 commit a809de5

File tree

9 files changed

+28
-159
lines changed

9 files changed

+28
-159
lines changed

‎JenkinsJobs/YBuilds/P_build.groovy

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -149,21 +149,6 @@ spec:
149149
\'\'\'
150150
}
151151
}
152-
}
153-
}
154-
stage('Copy build scripts for P-build'){
155-
steps {
156-
container('jnlp') {
157-
sh \'\'\'
158-
cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/P-build
159-
cp mb220_buildSdkPatch.sh ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/gitCache/eclipse.platform.releng.aggregator/cje-production/mbscripts/.
160-
cp mb220_buildSdkPatch.sh ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts/.
161-
cp mb300_gatherEclipseParts.sh ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/gitCache/eclipse.platform.releng.aggregator/cje-production/mbscripts/.
162-
cp mb300_gatherEclipseParts.sh ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts/.
163-
cp mb620_promoteUpdateSite.sh ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/gitCache/eclipse.platform.releng.aggregator/cje-production/mbscripts/.
164-
cp mb620_promoteUpdateSite.sh ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts/.
165-
\'\'\'
166-
}
167152
}
168153
}
169154
stage('Aggregator maven build'){

‎RELENG.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@ When the JDT team is ready they will raise an issue to create new Y and P builds
6666
- The modules listed in the top level pom file (`java##pathc/pom.xml) should match the modified plugins.
6767
* Update the Y-build (Y_build.groovy)[JenkinsJobs/YBuilds/Y_build.groovy] and (P_build.groovy)[JenkinsJobs/YBuilds/P_build.groovy].
6868
- Update `PATCH_OR_BRANCH_LABEL` and `BUILD_TYPE_NAME` to the name of the new java version
69-
* Update the P-build (mb300_gatherEclipseParts.sh)[cje-production/P-build/mb300_gatherEclipseParts.sh].
70-
- PATCH_BUILD_GENERIC in mb300_gatherEclipseParts.sh should be set to the name of the new maven profile
71-
- The same variable in the normal (mb300_gatherEclipseParts)[cje-production/mbscripts/mb300_gatherEclipseParts.sh] should be updated as well.
7269
* Update and rename the java repository files in (cje-production/streams)[cje-production/streams]
7370
- Repos without a BETA_JAVA## branch should be set to master
7471
* Update (eclipse-platform-parent/pom.xml)[eclipse-platform-parent/pom.xml]

‎cje-production/P-build/mb220_buildSdkPatch.sh

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎cje-production/P-build/mb300_gatherEclipseParts.sh

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎cje-production/P-build/mb620_promoteUpdateSite.sh

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎cje-production/mbscripts/mb110_tagBuildInputs.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
#*******************************************************************************
4-
# Copyright (c) 2019, 2021 IBM Corporation and others.
4+
# Copyright (c) 2019, 2025 IBM Corporation and others.
55
#
66
# This program and the accompanying materials
77
# are made available under the terms of the Eclipse Public License 2.0
@@ -26,6 +26,7 @@ reportDate=$(TZ="America/New_York" date +%s)
2626
reportTimestamp=$(TZ="America/New_York" date +%Y%m%d-%H%M --date='@'$reportDate)
2727
gitLogFile=$CJE_ROOT/$DROP_DIR/$BUILD_ID/gitLog.html
2828
mkdir -p $CJE_ROOT/$DROP_DIR/$BUILD_ID
29+
mkdir -p $CJE_ROOT/$TMP_DIR
2930

3031
epUpdateDir=/home/data/httpd/download.eclipse.org/eclipse/updates
3132
updateSiteRootPath=${epUpdateDir}/${STREAMMajor}.${STREAMMinor}-${BUILD_TYPE}-builds

‎cje-production/mbscripts/mb220_buildSdkPatch.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#!/bin/bash
1+
#!/bin/bash -e
22

33
#*******************************************************************************
4-
# Copyright (c) 2019 IBM Corporation and others.
4+
# Copyright (c) 2019, 2025 IBM Corporation and others.
55
#
66
# This program and the accompanying materials
77
# are made available under the terms of the Eclipse Public License 2.0
@@ -13,7 +13,6 @@
1313
# Contributors:
1414
# Kit Lo - initial API and implementation
1515
#*******************************************************************************
16-
set -e
1716

1817
if [ $# -ne 1 ]; then
1918
echo USAGE: $0 env_file
@@ -30,8 +29,17 @@ else
3029
MVN_ARGS="-Pbree-libs -Peclipse-sign"
3130
fi
3231

32+
mkdir -p $CJE_ROOT/$TMP_DIR
3333
cd $CJE_ROOT/gitCache/eclipse.platform.releng.aggregator
34-
mvn clean install -pl :eclipse-sdk-prereqs,:org.eclipse.jdt.core.compiler.batch -DlocalEcjVersion=99.99 -Dmaven.repo.local=$LOCAL_REPO -DcompilerBaselineMode=disable -DcompilerBaselineReplace=none
34+
if [ -z "$PATCH_BUILD" ];then
35+
mvn clean install -pl :eclipse-sdk-prereqs,:org.eclipse.jdt.core.compiler.batch \
36+
-DlocalEcjVersion=99.99 \
37+
-Dmaven.repo.local=$LOCAL_REPO -DcompilerBaselineMode=disable -DcompilerBaselineReplace=none
38+
MVN_ARGS="${MVN_ARGS} -Dcbi-ecj-version=99.99"
39+
else
40+
MVN_ARGS="${MVN_ARGS} -f eclipse.platform.releng.tychoeclipsebuilder/${PATCH_OR_BRANCH_LABEL}/pom.xml -P${PATCH_OR_BRANCH_LABEL}"
41+
fi
42+
3543
mvn clean verify -DskipTests=true ${MVN_ARGS} \
3644
-Dtycho.debug.artifactcomparator \
3745
-Dtycho.localArtifacts=ignore \
@@ -44,7 +52,6 @@ mvn clean verify -DskipTests=true ${MVN_ARGS} \
4452
-DbuildType=$BUILD_TYPE \
4553
-DbuildId=$BUILD_ID \
4654
-Declipse-p2-repo.url=NOT_FOR_PRODUCTION_USE \
47-
-Dcbi-ecj-version=99.99 \
4855
-e \
4956
-T 1C \
5057
${JAVA_DOC_TOOL}

‎cje-production/mbscripts/mb300_gatherEclipseParts.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#!/bin/bash
1+
#!/bin/bash -e
22

33
#*******************************************************************************
4-
# Copyright (c) 2019, 2021 IBM Corporation and others.
4+
# Copyright (c) 2019, 2025 IBM Corporation and others.
55
#
66
# This program and the accompanying materials
77
# are made available under the terms of the Eclipse Public License 2.0
@@ -13,7 +13,6 @@
1313
# Contributors:
1414
# Kit Lo - initial API and implementation
1515
#*******************************************************************************
16-
set -e
1716

1817
if [ $# -ne 1 ]; then
1918
echo USAGE: $0 env_file
@@ -34,27 +33,29 @@ JavaCMD=${JAVA_HOME}/bin/java
3433
cp $CJE_ROOT/$AGG_DIR/eclipse-platform-parent/target/mavenproperties.properties $CJE_ROOT/$DROP_DIR/$BUILD_ID/mavenproperties.properties
3534

3635
# gather repo
37-
echo $PATCH_BUILD
38-
if [ -z $PATCH_BUILD ]; then
36+
echo "PATCH_BUILD: $PATCH_BUILD"
37+
if [ -z "$PATCH_BUILD" ]; then
3938
REPO_DIR=$PLATFORM_REPO_DIR
4039
REPO_ZIP=$PLATFORM_TARGET_DIR/eclipse.platform.repository-${STREAMMajor}.${STREAMMinor}.${STREAMService}-SNAPSHOT.zip
4140
else
42-
PATCH_BUILD_GENERIC=java18patch
43-
REPO_DIR=$ECLIPSE_BUILDER_DIR/$PATCH_BUILD/eclipse.releng.repository.$PATCH_BUILD_GENERIC/target/repository
44-
REPO_ZIP=$ECLIPSE_BUILDER_DIR/$PATCH_BUILD/eclipse.releng.repository.$PATCH_BUILD_GENERIC/target/eclipse.releng.repository.$PATCH_BUILD_GENERIC-${STREAMMajor}.${STREAMMinor}.${STREAMService}-SNAPSHOT.zip
41+
REPO_DIR=$ECLIPSE_BUILDER_DIR/$PATCH_BUILD/eclipse.releng.repository.${PATCH_BUILD}/target/repository
4542
fi
4643

4744
if [ -d $REPO_DIR ]; then
4845
pushd $REPO_DIR
4946
cp -r * $CJE_ROOT/$UPDATES_DIR/$BUILD_ID
5047
popd
5148
fi
49+
50+
if [ -n "$PATCH_BUILD" ]; then
51+
exit 0 # Nothing more to do for patch-builds
52+
fi
53+
5254
if [ -f $REPO_ZIP ]; then
5355
cp $REPO_ZIP $CJE_ROOT/$DROP_DIR/$BUILD_ID/repository-$BUILD_ID.zip
5456
fi
5557

5658

57-
if [ -z $PATCH_BUILD ]; then
5859
# gather sdk
5960
if [ -d $PLATFORM_PRODUCTS_DIR ]; then
6061
pushd $PLATFORM_PRODUCTS_DIR
@@ -131,7 +132,6 @@ if [ -z $PATCH_BUILD ]; then
131132
popd
132133
fi
133134
set +x
134-
fi
135135

136136
# gather ecj jars
137137
ECJ_JAR_DIR=$CJE_ROOT/$AGG_DIR/eclipse.jdt.core/org.eclipse.jdt.core.compiler.batch/target

‎cje-production/mbscripts/mb620_promoteUpdateSite.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#!/bin/bash
1+
#!/bin/bash -e
22

33
#*******************************************************************************
4-
# Copyright (c) 2019 IBM Corporation and others.
4+
# Copyright (c) 2019, 2025 IBM Corporation and others.
55
#
66
# This program and the accompanying materials
77
# are made available under the terms of the Eclipse Public License 2.0
@@ -13,7 +13,6 @@
1313
# Contributors:
1414
# Sravan Lakkimsetti - initial API and implementation
1515
#*******************************************************************************
16-
set -e
1716

1817
if [ $# -ne 1 ]; then
1918
echo USAGE: $0 env_file
@@ -35,6 +34,8 @@ popd
3534
if [ "$COMPARATOR_ERRORS" == "true" ] && [ "$BUILD_TYPE" == "I" ]
3635
then
3736
exit 0
37+
elif [ "$BUILD_TYPE" == "P" ]; then
38+
exit 0
3839
fi
3940

4041
epDownloadDir=/home/data/httpd/download.eclipse.org/eclipse

0 commit comments

Comments
 (0)