From 28531a3052725dbcc8e860e20c0f006b7ba51322 Mon Sep 17 00:00:00 2001 From: Rahul Mohanan Date: Fri, 6 Sep 2024 23:03:02 +0530 Subject: [PATCH] Update previous release version to 4.33 GA across build scripts https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/2325 --- cje-production/P-build/buildproperties.txt | 10 +++++----- cje-production/Y-build/buildproperties.txt | 8 ++++---- 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 +- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/cje-production/P-build/buildproperties.txt b/cje-production/P-build/buildproperties.txt index 8d853c60b9a..3380a069c16 100644 --- a/cje-production/P-build/buildproperties.txt +++ b/cje-production/P-build/buildproperties.txt @@ -48,17 +48,17 @@ API_FREEZE_REF_LABEL="" # Otherwise set to a blank space FREEZE_PARAMS=" " -PREVIOUS_RELEASE_VER="4.32" -PREVIOUS_RELEASE_REPO_ID="4.32" +PREVIOUS_RELEASE_VER="4.33" +PREVIOUS_RELEASE_REPO_ID="4.33" #build id for getting repo -BASEBUILD_ID="R-4.32-202406010610" +BASEBUILD_ID="R-4.33-202409030240" #release id for downloading eclipse -PREVIOUS_RELEASE_ID="R-4.32-202406010610" +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.33-I-builds/" +ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.33/R-4.33-202409030240/" #Maven parameters MAVEN_OPTS="-Xmx6G" diff --git a/cje-production/Y-build/buildproperties.txt b/cje-production/Y-build/buildproperties.txt index 40f32489dba..f1c4578d795 100644 --- a/cje-production/Y-build/buildproperties.txt +++ b/cje-production/Y-build/buildproperties.txt @@ -47,12 +47,12 @@ API_FREEZE_REF_LABEL="" # Otherwise set to a blank space FREEZE_PARAMS=" " -PREVIOUS_RELEASE_VER="4.33RC2" -PREVIOUS_RELEASE_REPO_ID="4.33-I-builds" +PREVIOUS_RELEASE_VER="4.33" +PREVIOUS_RELEASE_REPO_ID="4.33" #build id for getting repo -BASEBUILD_ID="I20240828-1820" +BASEBUILD_ID="R-4.33-202409030240" #release id for downloading eclipse -PREVIOUS_RELEASE_ID="S-4.33RC2-202408281820" +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.31.0/R-3.31.0-20230903090456/repositoryunittests/" diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt index cd71c854e9d..6b3e64824fb 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.33RC2a" -PREVIOUS_RELEASE_REPO_ID="4.33-I-builds" +PREVIOUS_RELEASE_VER="4.33" +PREVIOUS_RELEASE_REPO_ID="4.33" #build id for getting repo -BASEBUILD_ID="I20240903-0240" +BASEBUILD_ID="R-4.33-202409030240" #release id for downloading eclipse -PREVIOUS_RELEASE_ID="S-4.33RC2a-202409030240" +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/" diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml index e551546da66..15dd4bd76cf 100644 --- a/eclipse-platform-parent/pom.xml +++ b/eclipse-platform-parent/pom.xml @@ -127,7 +127,7 @@ true all - https://download.eclipse.org/eclipse/updates/4.33-I-builds/I20240903-0240/ + https://download.eclipse.org/eclipse/updates/4.33/R-4.33-202409030240/ [3.19.600.v20240827-1800,3.19.649.v20241205-1800) - https://download.eclipse.org/eclipse/updates/4.33-I-builds/I20240822-0100/ + https://download.eclipse.org/eclipse/updates/4.33/R-4.33-202409030240/ eclipse-p2-repo-java23patch - https://download.eclipse.org/eclipse/updates/4.33-I-builds/I20240822-0100/ + https://download.eclipse.org/eclipse/updates/4.33/R-4.33-202409030240/ 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 852fa99a6f3..454824edb7e 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.33RC2a-linux-gtk-x86_64.tar.gz -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.33RC2a-win32-x86_64.zip -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.33RC2a-macosx-cocoa-x86_64.dmg +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.33-linux-gtk-x86_64.tar.gz +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.33-win32-x86_64.zip +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.33-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.33RC2a-202409030240/ +org.eclipse.equinox.p2.tests.last.release.build.repo=https://download.eclipse.org/equinox/drops/R-4.33-202409030240/ 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 c389e5e9790..8d22fc33bb6 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.33RC2a \ No newline at end of file +previousReleaseVersion=4.33 \ 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 2bd0e6329ea..1ac6592803a 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.33RC2a-202409030240//eclipse-platform-4.33-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/ +cp /home/files/buildzips/oxygen/R/R-4.33-202409030240//eclipse-platform-4.33-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/ -cp /home/files/buildzips/oxygen/R/S-4.33RC2a-202409030240//eclipse-SDK-4.33-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/ +cp /home/files/buildzips/oxygen/R/R-4.33-202409030240//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 0406d799255..ab56a35f5fd 100644 --- a/production/testScripts/configuration/streamSpecific.properties +++ b/production/testScripts/configuration/streamSpecific.properties @@ -11,16 +11,16 @@ streamSpecificPropertiesTitle="Properties for 4.34.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.33RC2a-202409030240/ +previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.33-202409030240/ # 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.33RC2a +previousReleaseVersion=4.33 # 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.33RC2a +previousReleaseVersionRepo=4.33 # 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.33RC2a-202409030240 +baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.33-202409030240 # NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh -baselinePerfVersion=S-4.33RC2a-202409030240 +baselinePerfVersion=R-4.33-202409030240 # TODO: could/should eventually "compute" label, from full version? baselinePerfVersionLabel=4.33 -baselinePerfBuildId=I20240903-0240 +baselinePerfBuildId=R-4.33-202409030240 # 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 42c267bf9d8..a38668625ae 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.33RC2a-202409030240" + baselineCode="R-4.33-202409030240" # to get time stamp, first remove initial IMN: baselineForBuildSuffix=${buildId/[IMN]/} #Then remove final '-' in build id