From 4355f4537180e453557eaad1c6cb76b28c529aa4 Mon Sep 17 00:00:00 2001
From: Rahul Mohanan <121536011+MohananRahul@users.noreply.github.com>
Date: Mon, 4 Dec 2023 12:38:12 +0530
Subject: [PATCH] Update previous release version to 4.30 GA across build
scripts (#1620)
Tracked in
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1619
---
cje-production/Y-build/buildproperties.txt | 12 ++++++------
cje-production/buildproperties.txt | 8 ++++----
eclipse-platform-parent/pom.xml | 6 +++---
.../src/main/resources/equinoxp2tests.properties | 8 ++++----
.../src/main/resources/label.properties | 2 +-
.../src/main/scripts/getPreviousRelease.sh | 4 ++--
.../configuration/streamSpecific.properties | 12 ++++++------
production/testScripts/updateTestResultsPages.sh | 2 +-
8 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/cje-production/Y-build/buildproperties.txt b/cje-production/Y-build/buildproperties.txt
index b8f4ad994d4..46ede163060 100644
--- a/cje-production/Y-build/buildproperties.txt
+++ b/cje-production/Y-build/buildproperties.txt
@@ -38,8 +38,8 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
LOCAL_REPO="localMavenRepo"
# Base builder parameters
-BASEBUILDER_TAG="4.29"
-API_PREV_REF_LABEL="4.29"
+BASEBUILDER_TAG="4.30"
+API_PREV_REF_LABEL="4.30"
#API_FREEZE_REF_LABEL="4.30RC1"
API_FREEZE_REF_LABEL=""
# Change to appropriate versions and uncomment when entering API freeze
@@ -47,12 +47,12 @@ API_FREEZE_REF_LABEL=""
# Otherwise set to a blank space
FREEZE_PARAMS=" "
-PREVIOUS_RELEASE_VER="4.29"
-PREVIOUS_RELEASE_REPO_ID="4.29"
+PREVIOUS_RELEASE_VER="4.30"
+PREVIOUS_RELEASE_REPO_ID="4.30"
#build id for getting repo
-BASEBUILD_ID="R-4.29-202309031000"
+BASEBUILD_ID="R-4.30-202312010110"
#release id for downloading eclipse
-PREVIOUS_RELEASE_ID="R-4.29-202309031000"
+PREVIOUS_RELEASE_ID="R-4.30-202312010110"
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
index 9755ff8cd15..d5d71b26468 100644
--- a/cje-production/buildproperties.txt
+++ b/cje-production/buildproperties.txt
@@ -47,12 +47,12 @@ API_FREEZE_REF_LABEL=""
# Otherwise set to a blank space
FREEZE_PARAMS=" "
-PREVIOUS_RELEASE_VER="4.30RC2"
-PREVIOUS_RELEASE_REPO_ID="4.30-I-builds"
+PREVIOUS_RELEASE_VER="4.30"
+PREVIOUS_RELEASE_REPO_ID="4.30"
#build id for getting repo
-BASEBUILD_ID="I20231123-1700"
+BASEBUILD_ID="R-4.30-202312010110"
#release id for downloading eclipse
-PREVIOUS_RELEASE_ID="S-4.30RC2-202311231700"
+PREVIOUS_RELEASE_ID="R-4.30-202312010110"
BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.31.0/R-3.31.0-20230903090456/repositoryunittests/"
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index 461dc305140..85b7f7aa625 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -142,7 +142,7 @@
BREE
true
- https://download.eclipse.org/eclipse/updates/4.30-I-builds/I20231123-1700/
+ https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110/
[3.19.200.v20230705-1800,3.19.249.v20231213-1800)
- https://download.eclipse.org/eclipse/updates/4.29/R-4.29-202309031000/
+ https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110/
eclipse-p2-repo-java21patch
- https://download.eclipse.org/eclipse/updates/4.29/R-4.29-202309031000/
+ https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110/
p2
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 ba8e2a7811e..7d43c2e8b1d 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.30RC2-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.30RC2-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.30RC2-macosx-cocoa-x86_64.dmg
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.30-linux-gtk-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.30-win32-x86_64.zip
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.30-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/S-4.30RC2-202311231700/
+org.eclipse.equinox.p2.tests.last.release.build.repo=https://download.eclipse.org/equinox/drops/R-4.30-202312010110/
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 5b3636557c0..d8137aa2a56 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.30RC2
+previousReleaseVersion=4.30
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 ec0422c41bc..028f4e61d73 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/S-4.30RC2-202311231700//eclipse-platform-4.30RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+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/
-cp /home/files/buildzips/oxygen/R/S-4.30RC2-202311231700//eclipse-SDK-4.30RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
+cp /home/files/buildzips/oxygen/R/R-4.30-202312010110//eclipse-SDK-4.30-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 8705bef42e3..cf79c9e018a 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -11,16 +11,16 @@ streamSpecificPropertiesTitle="Properties for 4.31.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/S-4.30RC2-202311231700/
+previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.30-202312010110/
# 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.30RC2
+previousReleaseVersion=4.30
# 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.30-I-builds
+previousReleaseVersionRepo=4.30
# 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/S-4.30RC2-202311231700
+baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.30-202312010110
# NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh
-baselinePerfVersion=S-4.30RC2-202311231700
+baselinePerfVersion=R-4.30-202312010110
# TODO: could/should eventually "compute" label, from full version?
baselinePerfVersionLabel=4.30
-baselinePerfBuildId=I20231123-1700
+baselinePerfBuildId=I20231201-0110
# 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
index 9453df6e14a..893a096299d 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="S-4.30RC2-202311231700"
+ baselineCode="R-4.30-202312010110"
# to get time stamp, first remove initial IMN:
baselineForBuildSuffix=${buildId/[IMN]/}
#Then remove final '-' in build id