Skip to content

[RelEng] Automate early redirection for Platform Oomph Setup #3867

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

Draft
HannesWell wants to merge 1 commit into
base: master
Choose a base branch
from
+54 −13
Draft

[RelEng] Automate early redirection for Platform Oomph Setup #3867

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
30 changes: 30 additions & 0 deletions JenkinsJobs/Releng/prepareNextDevCycle.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,31 @@ pipeline {
done
git commit --message "Update doc bundles for ${NEXT_RELEASE_VERSION} development" .
'''

}
}
}
stage('Early setup redirection') {
steps {
dir('oomph') {
script {
def previousRCProperties = utilities.loadBuildDropProperties("${PREVIOUS_RELEASE_CANDIDATE_ID}")
def secondLastRelease = utilities.loadBuildDropProperties("${previousRCProperties.PREVIOUS_RELEASE_ID}")
replaceAllInFile('Platform.setup', [
"early.redirection.${PREVIOUS_RELEASE_VERSION}" : "early.redirection.${NEXT_RELEASE_VERSION}",
" ${PREVIOUS_RELEASE_VERSION}" : " ${NEXT_RELEASE_VERSION}",
" ${previousRCProperties.PREVIOUS_RELEASE_VER}" : " ${PREVIOUS_RELEASE_VERSION}",
])
replaceAllInFile('Platform.setup', [
*:redirectionTaskReplacementEntry('early.redirection.ibuild',
"https://download.eclipse.org/eclipse/updates/${PREVIOUS_RELEASE_VERSION}-I-builds",
"https://download.eclipse.org/eclipse/updates/${NEXT_RELEASE_VERSION}-I-builds"),
*:redirectionTaskReplacementEntry('early.redirection.baseline',
"https://download.eclipse.org/eclipse/updates/${previousRCProperties.PREVIOUS_RELEASE_VER}/${previousRCProperties.PREVIOUS_RELEASE_ID}",
"https://download.eclipse.org/eclipse/updates/${PREVIOUS_RELEASE_VERSION}-I-builds/${PREVIOUS_RELEASE_CANDIDATE_I_BUILD}"),
])
utilities.gitCommitAllExcludingSubmodules("Enable and update early redirection in platform setup for ${NEXT_RELEASE_VERSION}")
}
}
}
}
Expand Down Expand Up @@ -444,3 +469,8 @@ def replaceAllInFile(String filePath, Map<String,String> replacements) {
def gitCommitAllExcludingSubmodules(String commitMessage) {
utilities.gitCommitAllExcludingSubmodules(commitMessage)
}

def redirectionTaskReplacementEntry(String taskId, String source, String target) {
def regex = /(?s)(?<beforeSource><setupTask\s+xsi:type="setup:RedirectionTask"\s+id="${java.util.regex.Pattern.quote(taskId)}".+?sourceURL=")[^"]+(?<beforeTarget>".+?targetURL=")[^"]+(?<suffix>".+?)<\/setupTask>/
return [ (regex) : "\${beforeSource}${source}\${beforeTarget}${target}\${suffix}"]
}
6 changes: 6 additions & 0 deletions JenkinsJobs/Releng/promoteBuild.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,12 @@ pipeline {
}

utilities.gitCommitAllExcludingSubmodules("Update previous release version to ${BUILD_MAJOR}.${BUILD_MINOR} GA across build scripts")

// Disbale early setup redirection
utilities.replaceInFile('oomph/Platform.setup', [
'id="early.redirection"' : 'id="early.redirection"\n disabled="true"',
])
utilities.gitCommitAllExcludingSubmodules("Disable early redirect in platform setup for ${BUILD_MAJOR}.${BUILD_MINOR}")
}
script { // Update the maintenance branch
sh 'git checkout -b updateMaintenance "origin/${MAINTENANCE_BRANCH}"'
Expand Down
31 changes: 18 additions & 13 deletions oomph/Platform.setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,30 +172,35 @@
filePattern="*.json"
defaultEditorID="org.eclipse.ui.genericeditor.GenericEditor"/>
</setupTask>
<setupTask
xsi:type="setup:VariableTask"
type="BOOLEAN"
name="early.redirection.4.41"
defaultValue="true"
storageURI="scope://Workspace"
label="Early redirect to 4.41">
<description>Redirect 4.39 p2 repos to 4.40 and redirect 4.40 repos to 4.41 to begin development on the open master streams immediately.</description>
</setupTask>
<setupTask
xsi:type="setup:CompoundTask"
filter="(early.redirection.4.41=true)"
name="EarlyRedirection">
id="early.redirection"
disabled="true"
name="Early Redirection">
<setupTask
xsi:type="setup:VariableTask"
type="BOOLEAN"
name="early.redirection.4.41"
defaultValue="true"
storageURI="scope://Workspace"
label="Early redirect to 4.41">
<description>Redirect release p2 repo to 4.40 RC and the I-builds repo to 4.41-I-builds to begin development on the open master streams immediately.</description>
</setupTask>
<setupTask
xsi:type="setup:RedirectionTask"
id="early.redirection.ibuild"
filter="(early.redirection.4.41=true)"
sourceURL="https://download.eclipse.org/eclipse/updates/4.40-I-builds"
targetURL="https://download.eclipse.org/eclipse/updates/4.41-I-builds">
<description>Redirect 4.40 I-builds to 4.41 I-builds</description>
<description>Redirect previous release I-builds to next release I-builds</description>
</setupTask>
<setupTask
xsi:type="setup:RedirectionTask"
id="early.redirection.baseline"
filter="(early.redirection.4.41=true)"
sourceURL="https://download.eclipse.org/eclipse/updates/4.39/R-4.39-202602260420"
targetURL="https://download.eclipse.org/eclipse/updates/4.40-I-builds/I20260528-0011">
<description>Redirect the release 4.39 build to the final 4.40 I-build which should point at the simple repository to avoid redirecting to 4.40 while it's still empty before the actual release</description>
<description>Redirect the previous release baseline p2 repo to the final RC I-build repo of the upcomming release which should point at the simple repository to avoid redirecting to the upcomming release repo while it's still empty before the actual release.</description>
</setupTask>
</setupTask>
<project name="platform"
Expand Down
Loading