Revert "Update previous release version to 4.34 GA across build scrip…

…ts (#2608)"

This reverts commit 0e4fb78.

cje-production/P-build/buildproperties.txt

@@ -42,17 +42,17 @@ LOCAL_REPO="localMavenRepo"
 BASEBUILDER_TAG="4.34"
 API_PREV_REF_LABEL="4.31"
 
-PREVIOUS_RELEASE_VER="4.34"
-PREVIOUS_RELEASE_REPO_ID="4.34"
+PREVIOUS_RELEASE_VER="4.33"
+PREVIOUS_RELEASE_REPO_ID="4.33"
 #build id for getting repo
-BASEBUILD_ID="R-4.34-202411201800"
+BASEBUILD_ID="R-4.33-202409030240"
 #release id for downloading eclipse
-PREVIOUS_RELEASE_ID="R-4.34-202411201800"
+PREVIOUS_RELEASE_ID="R-4.33-202409030240"
 
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
 WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.33.0/R-3.33.0-20240304165142/repositoryunittests/"
 BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder"
-ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.35-I-builds/"
+ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.33/R-4.33-202409030240/"
 
 #Maven parameters
 MAVEN_OPTS="-Xmx6G"

cje-production/Y-build/buildproperties.txt

@@ -41,12 +41,12 @@ LOCAL_REPO="localMavenRepo"
 BASEBUILDER_TAG="4.34"
 API_PREV_REF_LABEL="4.32"
 
-PREVIOUS_RELEASE_VER="4.34"
-PREVIOUS_RELEASE_REPO_ID="4.34"
+PREVIOUS_RELEASE_VER="4.33"
+PREVIOUS_RELEASE_REPO_ID="4.33"
 #build id for getting repo
-BASEBUILD_ID="R-4.34-202411201800"
+BASEBUILD_ID="R-4.33-202409030240"
 #release id for downloading eclipse
-PREVIOUS_RELEASE_ID="R-4.34-202411201800"
+PREVIOUS_RELEASE_ID="R-4.33-202409030240"
 
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
 WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.33.0/R-3.33.0-20240304165142/repositoryunittests/"

cje-production/buildproperties.txt

@@ -38,15 +38,15 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
 LOCAL_REPO="localMavenRepo"
 
 # Base builder parameters
-BASEBUILDER_TAG="4.34"
-API_PREV_REF_LABEL="4.34"
+BASEBUILDER_TAG="4.33"
+API_PREV_REF_LABEL="4.33"
 
-PREVIOUS_RELEASE_VER="4.34"
-PREVIOUS_RELEASE_REPO_ID="4.34"
+PREVIOUS_RELEASE_VER="4.34RC2"
+PREVIOUS_RELEASE_REPO_ID="4.34-I-builds"
 #build id for getting repo
-BASEBUILD_ID="R-4.34-202411201800"
+BASEBUILD_ID="I20241120-1800"
 #release id for downloading eclipse
-PREVIOUS_RELEASE_ID="R-4.34-202411201800"
+PREVIOUS_RELEASE_ID="S-4.34RC2-202411201800"
 
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
 WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.33.0/R-3.33.0-20240304165142/repositoryunittests/"

eclipse-platform-parent/pom.xml

@@ -126,7 +126,7 @@
     <compare-version-with-baselines.skip>true</compare-version-with-baselines.skip>
     <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. -->
     <tycho.baseline.replace>all</tycho.baseline.replace>
-    <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.34/R-4.34-202411201800/</previous-release.baseline>
+    <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.34-I-builds/I20241120-1800/</previous-release.baseline>
 
     <!--
       Declaration of properties that contribute to the arg line for the tycho-surefire-plugin.
@@ -735,12 +735,12 @@
         <!-- Can specify an exact range here, or something of a loose range, depending on what's needed. -->
         <versionRangeForPatch>[3.19.600.v20240827-1800,3.19.649.v20241205-1800)</versionRangeForPatch>
         <!-- Comment this line when a patch is required on top of I-build -->
-        <comparator.repo>https://download.eclipse.org/eclipse/updates/4.34/R-4.34-202411201800/</comparator.repo>
+        <comparator.repo>https://download.eclipse.org/eclipse/updates/4.33/R-4.33-202409030240/</comparator.repo>
       </properties>
       <repositories>
        <repository>
          <id>eclipse-p2-repo-java23patch</id>
-         <url>https://download.eclipse.org/eclipse/updates/4.34/R-4.34-202411201800/</url>
+         <url>https://download.eclipse.org/eclipse/updates/4.33/R-4.33-202409030240/</url>
          <layout>p2</layout>
        </repository>
      </repositories>

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.34-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.34-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.34-macosx-cocoa-x86_64.dmg
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.34RC2-linux-gtk-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.34RC2-win32-x86_64.zip
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.34RC2-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.34-202411201800/
+org.eclipse.equinox.p2.tests.last.release.build.repo=https://download.eclipse.org/equinox/drops/S-4.34RC2-202411201800/
 

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.34
+previousReleaseVersion=4.34RC2

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.34-202411201800//eclipse-platform-4.34-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+cp /home/files/buildzips/oxygen/R/S-4.34RC2-202411201800//eclipse-platform-4.34-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
 
-cp /home/files/buildzips/oxygen/R/R-4.34-202411201800//eclipse-SDK-4.34-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
+cp /home/files/buildzips/oxygen/R/S-4.34RC2-202411201800//eclipse-SDK-4.34-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
 
 cp eclipse-junit-tests-${buildId}.zip workarea/${buildId}/eclipse-testing/
 

production/testScripts/configuration/streamSpecific.properties

@@ -15,12 +15,12 @@ previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.34
 # 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.34
+previousReleaseVersion=4.34RC2
 # 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.34
+previousReleaseVersionRepo=4.34-I-builds
 
 # 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.34-202411201800
+baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.34RC2-202411201800
 # NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh
-baselinePerfVersion=R-4.34-202411201800
+baselinePerfVersion=S-4.34RC2-202411201800
 # TODO: could/should eventually "compute" label, from full version?
 baselinePerfVersionLabel=4.34
-baselinePerfBuildId=R-4.34-202411201800
+baselinePerfBuildId=I20241120-1800
 
 # We currently set here, but would be better to compute this value 
 # by peeking in the "to be tested" tar file. 

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.34-202411201800"
+  baselineCode="S-4.34RC2-202411201800"
   # to get time stamp, first remove initial IMN:
   baselineForBuildSuffix=${buildId/[IMN]/}
   #Then remove final '-' in build id