Skip to content

Commit 2c0c9ef

Browse files
authored
Update previous release version to 4.35 GA across build scripts (#2909)
#2908
1 parent c2ee399 commit 2c0c9ef

File tree

7 files changed

+22
-22
lines changed

7 files changed

+22
-22
lines changed

cje-production/buildproperties.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
3535
LOCAL_REPO="localMavenRepo"
3636

3737
# Base builder parameters
38-
BASEBUILDER_TAG="4.34"
39-
API_PREV_REF_LABEL="4.34"
38+
BASEBUILDER_TAG="4.35"
39+
API_PREV_REF_LABEL="4.35"
4040

41-
PREVIOUS_RELEASE_VER="4.35RC2"
42-
PREVIOUS_RELEASE_REPO_ID="4.35-I-builds"
41+
PREVIOUS_RELEASE_VER="4.35"
42+
PREVIOUS_RELEASE_REPO_ID="4.35"
4343
#build id for getting repo
44-
BASEBUILD_ID="I20250228-0140"
44+
BASEBUILD_ID="R-4.35-202502280140"
4545
#release id for downloading eclipse
46-
PREVIOUS_RELEASE_ID="S-4.35RC2-202502280140"
46+
PREVIOUS_RELEASE_ID="R-4.35-202502280140"
4747

4848
BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
4949
WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.36.0/R-3.36.0-20241110095156/repositoryunittests/"

eclipse-platform-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
<compare-version-with-baselines.skip>true</compare-version-with-baselines.skip>
132132
<version.baseline.check.skip>${compare-version-with-baselines.skip}</version.baseline.check.skip> <!-- Allows projects to overwrite the value set on the CLI to skip the check in any case. -->
133133
<tycho.baseline.replace>all</tycho.baseline.replace>
134-
<previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.35-I-builds/I20250228-0140/</previous-release.baseline>
134+
<previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.35/R-4.35-202502280140/</previous-release.baseline>
135135

136136
<!--
137137
Declaration of properties that contribute to the arg line for the tycho-surefire-plugin.

eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux-x86_64=\${basedir
55
org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-${buildId}-win32-x86_64.zip
66
org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.dmg
77

8-
org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.35RC2-linux-gtk-x86_64.tar.gz
9-
org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.35RC2-win32-x86_64.zip
10-
org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.35RC2-macosx-cocoa-x86_64.dmg
8+
org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.35-linux-gtk-x86_64.tar.gz
9+
org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.35-win32-x86_64.zip
10+
org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.35-macosx-cocoa-x86_64.dmg
1111

1212
org.eclipse.equinox.p2.tests.current.build.repo=https://download.eclipse.org/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds/${buildId}
13-
org.eclipse.equinox.p2.tests.last.release.build.repo=https://download.eclipse.org/equinox/drops/S-4.35RC2-202502280140/
13+
org.eclipse.equinox.p2.tests.last.release.build.repo=https://download.eclipse.org/equinox/drops/R-4.35-202502280140/
1414

eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ buildId=${buildId}
55
# such as "4.5" instead of "4.5.0".
66
eclipseStream=${releaseNumberSDK}
77
# similar for previous release version
8-
previousReleaseVersion=4.35RC2
8+
previousReleaseVersion=4.35

eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88

99
mkdir -p workarea/${buildId}/eclipse-testing
10-
cp /home/files/buildzips/oxygen/R/S-4.35RC2-202502280140//eclipse-platform-4.35RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
10+
cp /home/files/buildzips/oxygen/R/R-4.35-202502280140//eclipse-platform-4.35-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
1111

12-
cp /home/files/buildzips/oxygen/R/S-4.35RC2-202502280140//eclipse-SDK-4.35RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
12+
cp /home/files/buildzips/oxygen/R/R-4.35-202502280140//eclipse-SDK-4.35-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
1313

1414
cp eclipse-junit-tests-${buildId}.zip workarea/${buildId}/eclipse-testing/
1515

production/testScripts/configuration/streamSpecific.properties

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ streamSpecificPropertiesTitle="Properties for 4.36.0 builds and tests"
1111
# stable version of Eclipse, that is used, for example, for it's p2
1212
# director, etc., so that "running the tests" is not actually using
1313
# the "just built" versions.
14-
previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.35RC2-202502280140/
14+
previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.35-202502280140/
1515
# version here is "build label" ... in general form, the "middle" of archive name,
1616
# such as "eclipse-platform-${previousReleaseVersion}-linux-gtk-x86_64.tar.gz
1717
# Also used used in p2 testing?
18-
previousReleaseVersion=4.35RC2
18+
previousReleaseVersion=4.35
1919
# This is last segment of last release repo, such as in
2020
# http://${ARCHIVE_HOST}/eclipse/updates/${previousReleaseVersion}
2121
# NOTE: I am assuming the "composite" repo is suitable for p2. In theory,
2222
# they might want the simple repo, such as at 4.4/R-4.4.1-201409250400
23-
previousReleaseVersionRepo=4.35-I-builds
23+
previousReleaseVersionRepo=4.35
2424

2525
# Note: API tests needs the _base_ of previous release, and also the previous service release
2626
# Bug 378587 - update releng tests (data) to go work against previous release
@@ -34,12 +34,12 @@ apiTestsPreviousRefererenceWin32Filename=obsoleteAndNotUsed
3434
# baselinePerf=true
3535
# are specified. The baselinePerf will often be the same as "previous release", but
3636
# not necessarily, so is not hard coded in assumptions.
37-
baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.35RC2-202502280140
37+
baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.35-202502280140
3838
# NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh
39-
baselinePerfVersion=S-4.35RC2-202502280140
39+
baselinePerfVersion=R-4.35-202502280140
4040
# TODO: could/should eventually "compute" label, from full version?
41-
baselinePerfVersionLabel=4.35RC2
42-
baselinePerfBuildId=I20250228-0140
41+
baselinePerfVersionLabel=4.35
42+
baselinePerfBuildId=R-4.35-202502280140
4343

4444
# We currently set here, but would be better to compute this value
4545
# by peeking in the "to be tested" tar file.

production/testScripts/updateTestResultsPages.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ then
295295

296296
# TODO: avoid this hard coding of baseline value
297297
# NOTE: value must start with a letter match baselinePerfVersion in testScripts/configuration/streamSpecific.properties
298-
baselineCode="S-4.35RC2-202502280140"
298+
baselineCode="R-4.35-202502280140"
299299
# to get time stamp, first remove initial IMN:
300300
baselineForBuildSuffix=${buildId/[IMN]/}
301301
#Then remove final '-' in build id

0 commit comments

Comments
 (0)