From ff8a20408b12505c597d0ba448bfbbc53924d2e1 Mon Sep 17 00:00:00 2001
From: Rahul Mohanan <121536011+MohananRahul@users.noreply.github.com>
Date: Mon, 2 Sep 2024 15:49:16 +0530
Subject: [PATCH] Move previous version to 4.33RC2 across build scripts (#2291)

https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/2290
---
 eclipse-platform-parent/pom.xml                  |  2 +-
 .../src/main/resources/equinoxp2tests.properties |  8 ++++----
 .../src/main/resources/label.properties          |  2 +-
 .../src/main/scripts/getPreviousRelease.sh       |  4 ++--
 .../configuration/streamSpecific.properties      | 16 ++++++++--------
 production/testScripts/test_runTests2.xml.sh     |  2 +-
 production/testScripts/updateTestResultsPages.sh |  2 +-
 scripts/updateProductVersion.sh                  |  8 ++++----
 8 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index 12c7328c2b7..38eff8a288a 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -127,7 +127,7 @@
     
     <compare-version-with-baselines.skip>true</compare-version-with-baselines.skip>
     <tycho.baseline.replace>all</tycho.baseline.replace>
-    <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.32/R-4.32-202406010610/</previous-release.baseline>
+    <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.33-I-builds/I20240828-1820/</previous-release.baseline>
 
     <!--
       Declaration of properties that contribute to the arg line for the tycho-surefire-plugin.
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
index 75253cda9df..a7ea83f6690 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
@@ -5,10 +5,10 @@ org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux-x86_64=\${basedir
 org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-${buildId}-win32-x86_64.zip
 org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.dmg
 
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.32-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.32-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.32-macosx-cocoa-x86_64.dmg
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.33RC2-linux-gtk-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.33RC2-win32-x86_64.zip
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.33RC2-macosx-cocoa-x86_64.dmg
 
 org.eclipse.equinox.p2.tests.current.build.repo=https://download.eclipse.org/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds/${buildId}
-org.eclipse.equinox.p2.tests.last.release.build.repo=https://download.eclipse.org/equinox/drops/R-4.32-202406010610/
+org.eclipse.equinox.p2.tests.last.release.build.repo=https://download.eclipse.org/eclipse/updates/4.33-I-builds/I20240828-1820/
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties
index 7ebe72b1e04..5000393fbd2 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties
@@ -5,4 +5,4 @@ buildId=${buildId}
 # such as "4.5" instead of "4.5.0".
 eclipseStream=${releaseNumberSDK}
 # similar for previous release version
-previousReleaseVersion=4.32
+previousReleaseVersion=4.33RC2
\ No newline at end of file
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh
index 0aa9b4410f1..bb4bc823fdc 100755
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh
@@ -7,9 +7,9 @@
 
 
 mkdir -p workarea/${buildId}/eclipse-testing
-cp /home/files/buildzips/oxygen/R/R-4.32-202406010610//eclipse-platform-4.32-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+cp /home/files/buildzips/oxygen/R/S-4.33RC2-202408281820//eclipse-platform-4.33-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
 
-cp /home/files/buildzips/oxygen/R/R-4.32-202406010610//eclipse-SDK-4.32-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
+cp /home/files/buildzips/oxygen/R/S-4.33RC2-202408281820//eclipse-SDK-4.33-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
 
 cp eclipse-junit-tests-${buildId}.zip workarea/${buildId}/eclipse-testing/
 
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index 2dde87b5efc..7986cc4d9d7 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -5,22 +5,22 @@
 
 # purely title or identifier for display, to help confirm right file
 # is being retrieved and used.
-streamSpecificPropertiesTitle="Properties for 4.33.0 builds and tests"
+streamSpecificPropertiesTitle="Properties for 4.34.0 builds and tests"
 
 # These "previousRelease" variables are primarily used to have a
 # stable version of Eclipse, that is used, for example, for it's p2
 # director, etc., so that "running the tests" is not actually using
 # the "just built" versions.
-previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.32-202406010610/
+previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.33RC2-202408281820/
 # version here is "build label" ... in general form, the "middle" of archive name,
 # such as  "eclipse-platform-${previousReleaseVersion}-linux-gtk-x86_64.tar.gz
 # Also used used in p2 testing?
-previousReleaseVersion=4.32
+previousReleaseVersion=4.33RC2
 # This is last segment of last release repo, such as in
 #  http://${ARCHIVE_HOST}/eclipse/updates/${previousReleaseVersion}
 # NOTE: I am assuming the "composite" repo is suitable for p2. In theory,
 # they might want the simple repo, such as at 4.4/R-4.4.1-201409250400
-previousReleaseVersionRepo=4.32
+previousReleaseVersionRepo=4.33RC2
 
 # Note: API tests needs the _base_ of previous release, and also the previous service release
 # Bug 378587 - update releng tests (data) to go work against previous release
@@ -34,12 +34,12 @@ apiTestsPreviousRefererenceWin32Filename=obsoleteAndNotUsed
 # baselinePerf=true
 # are specified. The baselinePerf will often be the same as "previous release", but
 # not necessarily, so is not hard coded in assumptions.
-baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.32-202406010610
+baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.33RC2-202408281820
 # NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh
-baselinePerfVersion=R-4.32-202406010610
+baselinePerfVersion=S-4.33RC2-202408281820
 # TODO: could/should eventually "compute" label, from full version?
-baselinePerfVersionLabel=4.32
-baselinePerfBuildId=I20240601-0610
+baselinePerfVersionLabel=4.33
+baselinePerfBuildId=I20240828-1820
 
 # We currently set here, but would be better to compute this value 
 # by peeking in the "to be tested" tar file. 
diff --git a/production/testScripts/test_runTests2.xml.sh b/production/testScripts/test_runTests2.xml.sh
index dcfa83e4188..29f1c69edc7 100755
--- a/production/testScripts/test_runTests2.xml.sh
+++ b/production/testScripts/test_runTests2.xml.sh
@@ -81,7 +81,7 @@ wget -O ${WORKSPACE}/getEBuilder.xml --no-verbose   https://${GIT_HOST}/c/platfo
 
 ANTFILE=getEBuilder.xml
 buildId=I20150320-0800
-eclipseStream=4.32.0
+eclipseStream=4.34.0
 EBUILDER_HASH=master
 #EBUILDER_HASH=4295494c43e464a0c4ee39b7e0c847fbc3263f2a
 
diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh
index 5b60468586f..f20eaa8d0c3 100755
--- a/production/testScripts/updateTestResultsPages.sh
+++ b/production/testScripts/updateTestResultsPages.sh
@@ -295,7 +295,7 @@ then
 
   # TODO: avoid this hard coding of baseline value
   # NOTE: value must start with a letter match baselinePerfVersion in testScripts/configuration/streamSpecific.properties
-  baselineCode="R-4.32-202406010610"
+  baselineCode="S-4.33RC2-202408281820"
   # to get time stamp, first remove initial IMN:
   baselineForBuildSuffix=${buildId/[IMN]/}
   #Then remove final '-' in build id
diff --git a/scripts/updateProductVersion.sh b/scripts/updateProductVersion.sh
index fcd75376ebf..9b2fb685a2b 100755
--- a/scripts/updateProductVersion.sh
+++ b/scripts/updateProductVersion.sh
@@ -15,7 +15,7 @@
 
 script_location=$( (cd $(dirname $0) && pwd) )
 
-find $script_location/.. -name pom.xml -exec sed -i 's/4.32.0/4.33.0/g' {} \;
-find $script_location/.. -name MANIFEST.MF -exec sed -i 's/4.32.0/4.33.0/g' {} \;
-find $script_location/.. -type f -name *.product -exec sed -i 's/4.32.0/4.33.0/g' {} \;
-find $script_location/.. -name feature.xml -exec sed -i 's/4.32.0/4.33.0/g' {} \;
+find $script_location/.. -name pom.xml -exec sed -i 's/4.33.0/4.34.0/g' {} \;
+find $script_location/.. -name MANIFEST.MF -exec sed -i 's/4.33.0/4.34.0/g' {} \;
+find $script_location/.. -type f -name *.product -exec sed -i 's/4.33.0/4.34.0/g' {} \;
+find $script_location/.. -name feature.xml -exec sed -i 's/4.33.0/4.34.0/g' {} \;