Move previous version to 4.29RC2a across build scripts (#1302)

Tracked in #1301
eclipse-platform · Sep 5, 2023 · 6452458 · 6452458
1 parent 209f1ca
commit 6452458
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 28 deletions.
diff --git a/cje-production/Y-build/buildproperties.txt b/cje-production/Y-build/buildproperties.txt
@@ -24,7 +24,7 @@ TESTED_BUILD_TYPE="Y"
 RELEASE_VER="4.30"
 STREAM="4.30.0"
 STREAMMajor="4"
-STREAMMinor="29"
+STREAMMinor="30"
 STREAMService="0"
 GIT_ROOT="git@github.com:"
 AGG_REPO="eclipse-platform/eclipse.platform.releng.aggregator.git"
@@ -38,21 +38,21 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
 LOCAL_REPO="localMavenRepo"
 
 # Base builder parameters
-BASEBUILDER_TAG="4.28"
-API_PREV_REF_LABEL="4.28"
+BASEBUILDER_TAG="4.29"
+API_PREV_REF_LABEL="4.29"
 #API_FREEZE_REF_LABEL="4.30RC1"
 API_FREEZE_REF_LABEL=""
 # Change to appropriate versions and uncomment when entering API freeze
 #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"
 # Otherwise set to a blank space
 FREEZE_PARAMS=" "
 
-PREVIOUS_RELEASE_VER="4.28"
-PREVIOUS_RELEASE_REPO_ID="4.28"
+PREVIOUS_RELEASE_VER="4.29RC2a"
+PREVIOUS_RELEASE_REPO_ID="4.29-I-builds"
 #build id for getting repo
-BASEBUILD_ID="R-4.28-202306050440"
+BASEBUILD_ID="I20230903-1000"
 #release id for downloading eclipse
-PREVIOUS_RELEASE_ID="R-4.28-202306050440"
+PREVIOUS_RELEASE_ID="S-4.29RC2a-202309031000"
 
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
 WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.22.0/R-3.22.0-20210612170523/repositoryunittests/"

diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt
@@ -24,7 +24,7 @@ TESTED_BUILD_TYPE="I"
 RELEASE_VER="4.30"
 STREAM="4.30.0"
 STREAMMajor="4"
-STREAMMinor="29"
+STREAMMinor="30"
 STREAMService="0"
 GIT_ROOT="git@github.com:"
 AGG_REPO="eclipse-platform/eclipse.platform.releng.aggregator.git"

diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
@@ -140,7 +140,7 @@
     <tycho.mapP2Dependencies>false</tycho.mapP2Dependencies>
 
     <compare-version-with-baselines.skip>true</compare-version-with-baselines.skip>
-    <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.28/R-4.28-202306050440/</previous-release.baseline>
+    <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.29-I-builds/I20230903-1000/</previous-release.baseline>
 
     <!--
       Declaration of properties that contribute to the arg line for the tycho-surefire-plugin.

diff --git a/...leng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties b/...leng.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.28RC2a-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.28RC2a-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.28RC2a-macosx-cocoa-x86_64.dmg
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.29RC2a-linux-gtk-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.29RC2a-win32-x86_64.zip
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.29RC2a-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.28-202306050440/
+org.eclipse.equinox.p2.tests.last.release.build.repo=https://download.eclipse.org/equinox/drops/S-4.29RC2a-202309031000/
 
diff --git a/...atform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties b/...atform.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.28
+previousReleaseVersion=4.29RC2a
diff --git a/...orm.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh b/...orm.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.28-202306050440//eclipse-platform-4.28-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+cp /home/files/buildzips/oxygen/R/S-4.29RC2a-202309031000//eclipse-platform-4.29RC2a-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
 
-cp /home/files/buildzips/oxygen/R/R-4.28-202306050440//eclipse-SDK-4.28-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
+cp /home/files/buildzips/oxygen/R/S-4.29RC2a-202309031000//eclipse-SDK-4.29RC2a-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
@@ -11,16 +11,16 @@ streamSpecificPropertiesTitle="Properties for 4.30.0 builds and tests"
 # 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.28-202306050440/
+previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.29RC2a-202309031000/
 # 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.28
+previousReleaseVersion=4.29RC2a
 # 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.28
+previousReleaseVersionRepo=4.29-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.28-202306050440
+baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.29RC2a-202309031000
 # NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh
-baselinePerfVersion=R-4.28-202306050440
+baselinePerfVersion=S-4.29RC2a-202309031000
 # TODO: could/should eventually "compute" label, from full version?
-baselinePerfVersionLabel=4.28
-baselinePerfBuildId=I20230605-0440
+baselinePerfVersionLabel=4.29
+baselinePerfBuildId=I20230903-1000
 
 # 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/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.28-202306050440"
+  baselineCode="S-4.29RC2a-202309031000"
   # 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
@@ -15,7 +15,7 @@
 
 script_location=$( (cd $(dirname $0) && pwd) )
 
-find $script_location/.. -name pom.xml -exec sed -i 's/4.28.0/4.30.0/g' {} \;
-find $script_location/.. -name MANIFEST.MF -exec sed -i 's/4.28.0/4.30.0/g' {} \;
-find $script_location/.. -type f -name *.product -exec sed -i 's/4.28.0/4.30.0/g' {} \;
-find $script_location/.. -name feature.xml -exec sed -i 's/4.28.0/4.30.0/g' {} \;
+find $script_location/.. -name pom.xml -exec sed -i 's/4.29.0/4.30.0/g' {} \;
+find $script_location/.. -name MANIFEST.MF -exec sed -i 's/4.29.0/4.30.0/g' {} \;
+find $script_location/.. -type f -name *.product -exec sed -i 's/4.29.0/4.30.0/g' {} \;
+find $script_location/.. -name feature.xml -exec sed -i 's/4.29.0/4.30.0/g' {} \;