Skip to content

Conversation

@merks
Copy link
Contributor

@merks merks commented Jun 10, 2025

No description provided.

@merks merks marked this pull request as draft June 10, 2025 15:12
@merks
Copy link
Contributor Author

merks commented Jun 10, 2025

This is just a draft. It's fully generated so it can be tossed away. I need to review it for missing things. If you see something that's missing, please let me know! I see the manifests are not updated...

@merks merks force-pushed the pr-applied-updater branch from ee5a0d0 to fb30e53 Compare June 10, 2025 15:18
@merks merks requested a review from jonahgraham June 10, 2025 15:19
@merks
Copy link
Contributor Author

merks commented Jun 10, 2025

I see there are these:

image

And some more 4.36 things need attention.

@merks merks force-pushed the pr-applied-updater branch from fb30e53 to e971f68 Compare June 10, 2025 15:36
@merks
Copy link
Contributor Author

merks commented Jun 10, 2025

These remaining ones are relatively special:

image

And of course all these _NAME values should stay as the are now until after all the final tasks to update latest and create the new repos.

Copy link
Contributor

@jonahgraham jonahgraham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After the needed fixup (#321) I am happy to see more of this automated.

The change from 2025-06-R -> 2025-09-M1 is much bigger than the change from 2025-09-M1 -> 2025-09-M2. Over time I reduced the latter to just be the entries in epp.website.xml + the block of main pom.xml. Because of this I was considering changing epp.website.xml to be a pre-processed file that was processed as part of the build. That would make it, for normal milestones, a change just to these sections of pom.xml:

<RELEASE_MILESTONE>R</RELEASE_MILESTONE>

<RELEASE_DIR>202506041200</RELEASE_DIR>

I would also be open to converting SIMREL_REPO back to a Jenkinsfile parameter. When I first removed all the parameters there were many of them, but if we save the SIMREL_REPO setting to https://download.eclipse.org/technology/epp/staging/_ci-info.txt then we can keep reproducible/recorded builds:

# place a timestamp and CI build info in the directory
echo "TIMESTAMP: $(date)" > _ci-info.txt
echo "CI URL: ${BUILD_URL}" >> _ci-info.txt
${SCP} -rp _ci-info.txt "${SSHUSER}:"${BUILDING}

(probably should have sha1 of git repo in there too)

The final change I want to make is removing the use of forceQualifierUpdate. Part of their original intention was to make the timestamps nice round numbers in the bundles, something that seems rather unimportant now for the hassle of doing it.


By default, the EPP build uses the content of the Eclipse Simultaneous Release _Staging_
repository at <https://download.eclipse.org/staging/2025-03/> as input. Sometimes it is
repository at <https://download.eclipse.org/staging/2025-09/> as input. Sometimes it is
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your program has found items that were missed in the 2025-03 to 2025-06 👍

<build>${maven.build.timestamp}</build>
<!-- Name of the release (no milestone) and the prev/next release name (for where links are needed)-->
<RELEASE_NAME>2025-06</RELEASE_NAME>
<RELEASE_NAME>2025-09</RELEASE_NAME>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The next two lines should be:

    <PREV_RELEASE_NAME>2025-06</PREV_RELEASE_NAME>
    <NEXT_RELEASE_NAME>2025-12</NEXT_RELEASE_NAME>

These variables were added to make the steps to update this part of release.xml easier along with automating finalize-release

<past>2024-12/R</past>
EOM
if [ "$RELEASE_MILESTONE" != "R" ]; then
cat >> release.xml <<EOM
<present>${PREV_RELEASE_NAME}/R</present>
<future>${RELEASE_NAME}/${RELEASE_MILESTONE}</future>
</packages>
EOM
else
cat >> release.xml <<EOM
<past>${PREV_RELEASE_NAME}/R</past>
<present>${RELEASE_NAME}/R</present>
</packages>
EOM
fi

So this step from releasing.md still needs doing:

- [ ] Adding the previous past release explicitly to list in release.xml, located in promote-a-build.sh

<RELEASE_DIR>202506041200</RELEASE_DIR>
<!-- SimRel Repo to build from -->
<SIMREL_REPO>https://download.eclipse.org/staging/2025-06/</SIMREL_REPO>
<SIMREL_REPO>https://download.eclipse.org/staging/2025-09/</SIMREL_REPO>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Its quite annoying that putting comments on unedited lines is so hard in github - one of the things I miss about gerrit, anyway...)

A few lines below this is a TODO that is referenced from releasing.md that there are two ways of defining eclipse.simultaneous.release.name

<repository location="https://download.eclipse.org/eclipse/updates/4.36" name="The Eclipse Project Updates" enabled="true" />
<repository location="https://download.eclipse.org/releases/2025-06" name="2025-06" enabled="true" />
<repository location="https://download.eclipse.org/eclipse/updates/4.37" name="The Eclipse Project Updates" enabled="true" />
<repository location="https://download.eclipse.org/releases/2025-09" name="2025-06" enabled="true" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A small update missing on this line in all epp.products

Suggested change
<repository location="https://download.eclipse.org/releases/2025-09" name="2025-06" enabled="true" />
<repository location="https://download.eclipse.org/releases/2025-09" name="2025-09" enabled="true" />

@merks merks force-pushed the pr-applied-updater branch from e971f68 to 958a0b5 Compare June 11, 2025 06:58
@merks merks marked this pull request as ready for review June 11, 2025 07:18
@merks merks force-pushed the pr-applied-updater branch from 958a0b5 to d4453d8 Compare June 11, 2025 07:24
@merks merks merged commit 1292f9e into eclipse-packaging:master Jun 11, 2025
1 of 11 checks passed
@merks merks deleted the pr-applied-updater branch June 11, 2025 07:25
@merks
Copy link
Contributor Author

merks commented Jun 11, 2025

Re

The final change I want to make is removing the use of forceQualifierUpdate. Part of their original intention was to make the timestamps nice round numbers in the bundles, something that seems rather unimportant now for the hassle of doing it.

There have been a number of occasions where it's proven useful that each feature updates with each milestone, i.e., for the Notification framework I can show the "update to a milestone notification" only if folks don't have the latest milestone installed.

I find it a very small detail and I simply use "run external program" to run it.

@jonahgraham
Copy link
Contributor

number of occasions where it's proven useful

OK - I will not aim to remove it. My first step was trying to verify if it was usable by someone anyway, so thanks for being proactive and sharing the use case.

@merks
Copy link
Contributor Author

merks commented Jun 11, 2025

I’ll share my updater very soon and then we can discuss the automation details more concretely. I think we are on a good track though. It’s nicer to automate what needs to be done than document it and do it manually.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants