Skip to content

Commit 4355f45

Browse files
authored
Update previous release version to 4.30 GA across build scripts (#1620)
Tracked in #1619
1 parent 6e01772 commit 4355f45

8 files changed

Lines changed: 27 additions & 27 deletions

File tree

cje-production/Y-build/buildproperties.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,21 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
3838
LOCAL_REPO="localMavenRepo"
3939

4040
# Base builder parameters
41-
BASEBUILDER_TAG="4.29"
42-
API_PREV_REF_LABEL="4.29"
41+
BASEBUILDER_TAG="4.30"
42+
API_PREV_REF_LABEL="4.30"
4343
#API_FREEZE_REF_LABEL="4.30RC1"
4444
API_FREEZE_REF_LABEL=""
4545
# Change to appropriate versions and uncomment when entering API freeze
4646
#FREEZE_PARAMS="-DfreezeBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-${API_FREEZE_REF_LABEL}-202108251800/eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip -DfreezeName=Eclipse-SDK-${API_FREEZE_REF_LABEL} -DfreezeFilename=eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip"
4747
# Otherwise set to a blank space
4848
FREEZE_PARAMS=" "
4949

50-
PREVIOUS_RELEASE_VER="4.29"
51-
PREVIOUS_RELEASE_REPO_ID="4.29"
50+
PREVIOUS_RELEASE_VER="4.30"
51+
PREVIOUS_RELEASE_REPO_ID="4.30"
5252
#build id for getting repo
53-
BASEBUILD_ID="R-4.29-202309031000"
53+
BASEBUILD_ID="R-4.30-202312010110"
5454
#release id for downloading eclipse
55-
PREVIOUS_RELEASE_ID="R-4.29-202309031000"
55+
PREVIOUS_RELEASE_ID="R-4.30-202312010110"
5656

5757
BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
5858
WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.22.0/R-3.22.0-20210612170523/repositoryunittests/"

cje-production/buildproperties.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ API_FREEZE_REF_LABEL=""
4747
# Otherwise set to a blank space
4848
FREEZE_PARAMS=" "
4949

50-
PREVIOUS_RELEASE_VER="4.30RC2"
51-
PREVIOUS_RELEASE_REPO_ID="4.30-I-builds"
50+
PREVIOUS_RELEASE_VER="4.30"
51+
PREVIOUS_RELEASE_REPO_ID="4.30"
5252
#build id for getting repo
53-
BASEBUILD_ID="I20231123-1700"
53+
BASEBUILD_ID="R-4.30-202312010110"
5454
#release id for downloading eclipse
55-
PREVIOUS_RELEASE_ID="S-4.30RC2-202311231700"
55+
PREVIOUS_RELEASE_ID="R-4.30-202312010110"
5656

5757
BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
5858
WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.31.0/R-3.31.0-20230903090456/repositoryunittests/"

eclipse-platform-parent/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
<tycho.useJDK>BREE</tycho.useJDK>
143143

144144
<compare-version-with-baselines.skip>true</compare-version-with-baselines.skip>
145-
<previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.30-I-builds/I20231123-1700/</previous-release.baseline>
145+
<previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110/</previous-release.baseline>
146146

147147
<!--
148148
Declaration of properties that contribute to the arg line for the tycho-surefire-plugin.
@@ -737,12 +737,12 @@
737737
<!-- Can specify an exact range here, or something of a loose range, depending on what's needed. -->
738738
<versionRangeForPatch>[3.19.200.v20230705-1800,3.19.249.v20231213-1800)</versionRangeForPatch>
739739
<!-- Comment this line when a patch is required on top of I-build -->
740-
<comparator.repo>https://download.eclipse.org/eclipse/updates/4.29/R-4.29-202309031000/</comparator.repo>
740+
<comparator.repo>https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110/</comparator.repo>
741741
</properties>
742742
<repositories>
743743
<repository>
744744
<id>eclipse-p2-repo-java21patch</id>
745-
<url>https://download.eclipse.org/eclipse/updates/4.29/R-4.29-202309031000/</url>
745+
<url>https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110/</url>
746746
<layout>p2</layout>
747747
</repository>
748748
</repositories>

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.30RC2-linux-gtk-x86_64.tar.gz
9-
org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.30RC2-win32-x86_64.zip
10-
org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.30RC2-macosx-cocoa-x86_64.dmg
8+
org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.30-linux-gtk-x86_64.tar.gz
9+
org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.30-win32-x86_64.zip
10+
org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.30-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.30RC2-202311231700/
13+
org.eclipse.equinox.p2.tests.last.release.build.repo=https://download.eclipse.org/equinox/drops/R-4.30-202312010110/
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.30RC2
8+
previousReleaseVersion=4.30

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.30RC2-202311231700//eclipse-platform-4.30RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
10+
cp /home/files/buildzips/oxygen/R/R-4.30-202312010110//eclipse-platform-4.30-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
1111

12-
cp /home/files/buildzips/oxygen/R/S-4.30RC2-202311231700//eclipse-SDK-4.30RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
12+
cp /home/files/buildzips/oxygen/R/R-4.30-202312010110//eclipse-SDK-4.30-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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ streamSpecificPropertiesTitle="Properties for 4.31.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.30RC2-202311231700/
14+
previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.30-202312010110/
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.30RC2
18+
previousReleaseVersion=4.30
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.30-I-builds
23+
previousReleaseVersionRepo=4.30
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.30RC2-202311231700
37+
baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.30-202312010110
3838
# NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh
39-
baselinePerfVersion=S-4.30RC2-202311231700
39+
baselinePerfVersion=R-4.30-202312010110
4040
# TODO: could/should eventually "compute" label, from full version?
4141
baselinePerfVersionLabel=4.30
42-
baselinePerfBuildId=I20231123-1700
42+
baselinePerfBuildId=I20231201-0110
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.30RC2-202311231700"
298+
baselineCode="R-4.30-202312010110"
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)