Skip to content

Commit

Permalink
[P-build] Remove all P-build files, scripts and instructions
Browse files Browse the repository at this point in the history
The JDT project manages P-builds by itself since
eclipse-jdt/eclipse.jdt.core#3244

Therefore all files and content related to P-builds can be removed from
this repository.
  • Loading branch information
HannesWell committed Jan 28, 2025
1 parent da74c37 commit 1250dd1
Show file tree
Hide file tree
Showing 30 changed files with 10 additions and 1,058 deletions.
185 changes: 0 additions & 185 deletions JenkinsJobs/YBuilds/P_build.groovy

This file was deleted.

23 changes: 4 additions & 19 deletions RELENG.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ Every 6 months there is a new Java release which requires additional builds and
The **Y-build** is a full sdk build with the new java version for testing.

The **P-build** is a patch build that contains modified plugins designed to be installed on top of the current I-build to test the new java version.
They are now managed by the JDT-project itself in (org.eclipse.jdt.releng)[https://github.com/eclipse-jdt/eclipse.jdt/tree/master/org.eclipse.jdt.releng].

The builds themselves and their unit tests are in the (Y Builds)[JenkinsJobs/YBuilds] folder in git and the (Y and P Builds)[https://ci.eclipse.org/releng/job/YPBuilds/] folder in jenkins.

Expand All @@ -54,25 +55,9 @@ The builds themselves and their unit tests are in the (Y Builds)[JenkinsJobs/YBu
When the JDT team is ready they will raise an issue to create new Y and P builds and supply the name of the new branch, usually BETA_JAVA##.

**Things to Do:**
* Create a new maven profile for the java release by creating a patch folder under (eclipse.platform.releng.tychoeclipsebuilder)[eclipse.platform.releng.tychoeclipsebuilder].
- Name format should be java##patch
- Update the java and stream versions
- The `org.eclipse.jdt-feature-dummy/feature.xml` and `org.eclipse.jdt-feature-dummy/pom.xml` files need the version of the `org.eclipse.jdt` jar file. This can be found in the latest milestone builds updates folder, for example:
```
(https://download.eclipse.org/eclipse/updates/4.27-I-builds/I20230104-1800/features/org.eclipse.jdt_3.19.0.v20230104-1800.jar
```
the 4.27 M1 jdt version is 3.19.0.v20230104-1800.
- The plugins for `org.eclipse.jdt.java20patch/feature.xml` will need to be supplied by the JDT team. You can email them or comment on the issue, but only they know what plugins were modified and need to be listed here.
- The modules listed in the top level pom file (`java##pathc/pom.xml) should match the modified plugins.
* Update the Y-build (Y_build.groovy)[JenkinsJobs/YBuilds/Y_build.groovy] and (P_build.groovy)[JenkinsJobs/YBuilds/P_build.groovy].
- Update `PATCH_OR_BRANCH_LABEL` and `BUILD_TYPE_NAME` to the name of the new java version
* Update the Y-build (Y_build.groovy)[JenkinsJobs/YBuilds/Y_build.groovy].
- Update `branchLabel` and `typeName` to the name of the new java version
* Update and rename the java repository files in (cje-production/streams)[cje-production/streams]
- Repos without a BETA_JAVA## branch should be set to master
* Update (eclipse-platform-parent/pom.xml)[eclipse-platform-parent/pom.xml]
- Update all instances of java to the new java version
- Update all instances of the maven profile to the new name
- `<featureToPatchVersion>` corresponds to the feature version of jdt being replaced, the same version number as `org.eclipse.jdt-feature-dummy/feature.xml` in step 1.
- `<versionRangeForPatch>` defines what versions of jdt the patch can be applied to with the intention of invalidating the patch after the next major release. The minimum is the current jdt version, the convention for setting the maximum is `<JDTMajor>.<JDTMinor>.49` and the qualifier is the approximate date of the next major release. So for 4.27 the range would be: `[3.19.0.v20230104-1800,3.19.49.v20230604-1800)`
- The comparator repo should be the updates folder of the latest release/milestone.
* Add unit tests for the new java version in (JenkinsJobs/YBuilds)[JenkinsJobs/YBuilds]
* Add Y and P builds to (Create Jobs)[https://ci.eclipse.org/releng/job/Create%20Jobs/] in Jenkins if they've been removed
* Add Y builds to (Create Jobs)[https://ci.eclipse.org/releng/job/Create%20Jobs/] in Jenkins if they've been removed
12 changes: 4 additions & 8 deletions cje-production/mbscripts/mb220_buildSdkPatch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,9 @@ fi

mkdir -p $CJE_ROOT/$TMP_DIR
cd $CJE_ROOT/gitCache/eclipse.platform.releng.aggregator
if [ -z "$PATCH_BUILD" ];then
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
MVN_ARGS="${MVN_ARGS} -Dcbi-ecj-version=99.99"
else
MVN_ARGS="${MVN_ARGS} -f eclipse.platform.releng.tychoeclipsebuilder/${PATCH_OR_BRANCH_LABEL}/pom.xml -P${PATCH_OR_BRANCH_LABEL}"
fi
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

mvn clean verify -DskipTests=true ${MVN_ARGS} \
-Dtycho.debug.artifactcomparator \
Expand All @@ -52,6 +47,7 @@ mvn clean verify -DskipTests=true ${MVN_ARGS} \
-DbuildType=$BUILD_TYPE \
-DbuildId=$BUILD_ID \
-Declipse-p2-repo.url=NOT_FOR_PRODUCTION_USE \
-Dcbi-ecj-version=99.99 \
-e \
-T 1C \
${JAVA_DOC_TOOL}
13 changes: 2 additions & 11 deletions cje-production/mbscripts/mb300_gatherEclipseParts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,15 @@ JavaCMD=${JAVA_HOME}/bin/java
cp $CJE_ROOT/$AGG_DIR/eclipse-platform-parent/target/mavenproperties.properties $CJE_ROOT/$DROP_DIR/$BUILD_ID/mavenproperties.properties

# gather repo
echo "PATCH_BUILD: $PATCH_BUILD"
if [ -z "$PATCH_BUILD" ]; then
REPO_DIR=$PLATFORM_REPO_DIR
REPO_ZIP=$PLATFORM_TARGET_DIR/eclipse.platform.repository-${STREAMMajor}.${STREAMMinor}.${STREAMService}-SNAPSHOT.zip
else
REPO_DIR=$ECLIPSE_BUILDER_DIR/$PATCH_BUILD/eclipse.releng.repository.${PATCH_BUILD}/target/repository
fi
REPO_DIR=$PLATFORM_REPO_DIR
REPO_ZIP=$PLATFORM_TARGET_DIR/eclipse.platform.repository-${STREAMMajor}.${STREAMMinor}.${STREAMService}-SNAPSHOT.zip

if [ -d $REPO_DIR ]; then
pushd $REPO_DIR
cp -r * $CJE_ROOT/$UPDATES_DIR/$BUILD_ID
popd
fi

if [ -n "$PATCH_BUILD" ]; then
exit 0 # Nothing more to do for patch-builds
fi

if [ -f $REPO_ZIP ]; then
cp $REPO_ZIP $CJE_ROOT/$DROP_DIR/$BUILD_ID/repository-$BUILD_ID.zip
fi
Expand Down
2 changes: 0 additions & 2 deletions cje-production/mbscripts/mb620_promoteUpdateSite.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ popd
if [ "$COMPARATOR_ERRORS" == "true" ] && [ "$BUILD_TYPE" == "I" ]
then
exit 0
elif [ "$BUILD_TYPE" == "P" ]; then
exit 0
fi

epDownloadDir=/home/data/httpd/download.eclipse.org/eclipse
Expand Down
3 changes: 0 additions & 3 deletions cje-production/streams/repositories_java24patch.txt

This file was deleted.

35 changes: 0 additions & 35 deletions eclipse-platform-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -791,41 +791,6 @@
</pluginManagement>
</build>
<profiles>
<profile>
<id>java23patch</id>
<properties>
<tycho.buildqualifier.format>'v'yyyyMMdd-HHmm'_BETA_JAVA23'</tycho.buildqualifier.format>

<featureToPatch>org.eclipse.jdt</featureToPatch>

<!--
For future versions, in addition to changing this value of "featureToPatchVersion",
the same value needs to be edited in
.../java22patch/org.eclipse.jdt.java22patch/feature.xml
and
.../java22patch/org.eclipse.jdt-feature-dummy/feature.xml
and it of course, must "match" what ever version was produced by the build specified
a few lines below, as the eclipse-p2-repo-java20patch p2 repository, as well as the lower
bound, in 'versionRangeForPatch'.
Also, when new patch created, should update the wiki at
https://wiki.eclipse.org/Java23
-->
<!-- This needs the version of the feature to be patched. -->
<featureToPatchVersion>3.19.600.v20240827-1800</featureToPatchVersion>
<!-- Can specify an exact range here, or something of a loose range, depending on what's needed. -->
<versionRangeForPatch>[3.19.600.v20240827-1800,3.19.649.v20241205-1800)</versionRangeForPatch>
<!-- Comment this line when a patch is required on top of I-build -->
<comparator.repo>https://download.eclipse.org/eclipse/updates/4.34/R-4.34-202411201800/</comparator.repo>
</properties>
<repositories>
<repository>
<id>eclipse-p2-repo-java23patch</id>
<url>https://download.eclipse.org/eclipse/updates/4.34/R-4.34-202411201800/</url>
<layout>p2</layout>
</repository>
</repositories>
</profile>
<profile>
<id>build-individual-bundles</id>
<activation>
Expand Down

This file was deleted.

Loading

0 comments on commit 1250dd1

Please sign in to comment.