From 0e4fb784ed9c401cf861fd0ee03f5fbe0f00b725 Mon Sep 17 00:00:00 2001 From: Rahul Mohanan <121536011+MohananRahul@users.noreply.github.com> Date: Fri, 29 Nov 2024 22:06:46 +0530 Subject: [PATCH] Update previous release version to 4.34 GA across build scripts (#2608) Fix https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/2607 --- cje-production/P-build/buildproperties.txt | 10 +++++----- cje-production/Y-build/buildproperties.txt | 8 ++++---- cje-production/buildproperties.txt | 12 ++++++------ 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 | 10 +++++----- production/testScripts/updateTestResultsPages.sh | 2 +- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/cje-production/P-build/buildproperties.txt b/cje-production/P-build/buildproperties.txt index 81bd4353500..857aa6fe880 100644 --- a/cje-production/P-build/buildproperties.txt +++ b/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.33" -PREVIOUS_RELEASE_REPO_ID="4.33" +PREVIOUS_RELEASE_VER="4.34" +PREVIOUS_RELEASE_REPO_ID="4.34" #build id for getting repo -BASEBUILD_ID="R-4.33-202409030240" +BASEBUILD_ID="R-4.34-202411201800" #release id for downloading eclipse -PREVIOUS_RELEASE_ID="R-4.33-202409030240" +PREVIOUS_RELEASE_ID="R-4.34-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/" BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder" -ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.33/R-4.33-202409030240/" +ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.35-I-builds/" #Maven parameters MAVEN_OPTS="-Xmx6G" diff --git a/cje-production/Y-build/buildproperties.txt b/cje-production/Y-build/buildproperties.txt index dce5d2ffa21..1c8eaf12b58 100644 --- a/cje-production/Y-build/buildproperties.txt +++ b/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.33" -PREVIOUS_RELEASE_REPO_ID="4.33" +PREVIOUS_RELEASE_VER="4.34" +PREVIOUS_RELEASE_REPO_ID="4.34" #build id for getting repo -BASEBUILD_ID="R-4.33-202409030240" +BASEBUILD_ID="R-4.34-202411201800" #release id for downloading eclipse -PREVIOUS_RELEASE_ID="R-4.33-202409030240" +PREVIOUS_RELEASE_ID="R-4.34-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/" diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt index 9549af07eb1..9966104df4c 100644 --- a/cje-production/buildproperties.txt +++ b/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.33" -API_PREV_REF_LABEL="4.33" +BASEBUILDER_TAG="4.34" +API_PREV_REF_LABEL="4.34" -PREVIOUS_RELEASE_VER="4.34RC2" -PREVIOUS_RELEASE_REPO_ID="4.34-I-builds" +PREVIOUS_RELEASE_VER="4.34" +PREVIOUS_RELEASE_REPO_ID="4.34" #build id for getting repo -BASEBUILD_ID="I20241120-1800" +BASEBUILD_ID="R-4.34-202411201800" #release id for downloading eclipse -PREVIOUS_RELEASE_ID="S-4.34RC2-202411201800" +PREVIOUS_RELEASE_ID="R-4.34-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/" diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml index 3cc55feddd3..f9739af0c8e 100644 --- a/eclipse-platform-parent/pom.xml +++ b/eclipse-platform-parent/pom.xml @@ -126,7 +126,7 @@ true ${compare-version-with-baselines.skip} all - https://download.eclipse.org/eclipse/updates/4.34-I-builds/I20241120-1800/ + https://download.eclipse.org/eclipse/updates/4.34/R-4.34-202411201800/ [3.19.600.v20240827-1800,3.19.649.v20241205-1800) - https://download.eclipse.org/eclipse/updates/4.33/R-4.33-202409030240/ + https://download.eclipse.org/eclipse/updates/4.34/R-4.34-202411201800/ eclipse-p2-repo-java23patch - https://download.eclipse.org/eclipse/updates/4.33/R-4.33-202409030240/ + https://download.eclipse.org/eclipse/updates/4.34/R-4.34-202411201800/ 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 c9ac6d1e100..b68bfa2630f 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.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.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.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.34RC2-202411201800/ +org.eclipse.equinox.p2.tests.last.release.build.repo=https://download.eclipse.org/equinox/drops/R-4.34-202411201800/ 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 55044df2acd..7932f268fef 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.34RC2 \ No newline at end of file +previousReleaseVersion=4.34 \ 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 556b1edefab..be773b30653 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.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-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-SDK-4.34-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/ +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 eclipse-junit-tests-${buildId}.zip workarea/${buildId}/eclipse-testing/ diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties index 9bac6f0785f..ce15d3f6370 100644 --- a/production/testScripts/configuration/streamSpecific.properties +++ b/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.34RC2 +previousReleaseVersion=4.34 # 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-I-builds +previousReleaseVersionRepo=4.34 # 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.34RC2-202411201800 +baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.34-202411201800 # NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh -baselinePerfVersion=S-4.34RC2-202411201800 +baselinePerfVersion=R-4.34-202411201800 # TODO: could/should eventually "compute" label, from full version? baselinePerfVersionLabel=4.34 -baselinePerfBuildId=I20241120-1800 +baselinePerfBuildId=R-4.34-202411201800 # 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 e37c21c2b8e..b6b5e3e039b 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.34RC2-202411201800" + baselineCode="R-4.34-202411201800" # to get time stamp, first remove initial IMN: baselineForBuildSuffix=${buildId/[IMN]/} #Then remove final '-' in build id