Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move previous version to 4.32RC2a across build scripts #2081

Merged
merged 1 commit into from
Jun 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eclipse-platform-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@

<compare-version-with-baselines.skip>true</compare-version-with-baselines.skip>
<tycho.baseline.replace>all</tycho.baseline.replace>
<previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.31/R-4.31-202402290520/</previous-release.baseline>
<previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.32-I-builds/I20240601-0610/</previous-release.baseline>

<!--
Declaration of properties that contribute to the arg line for the tycho-surefire-plugin.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.31-linux-gtk-x86_64.tar.gz
org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.31-win32-x86_64.zip
org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.31-macosx-cocoa-x86_64.dmg
org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.32RC2a-linux-gtk-x86_64.tar.gz
org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.32RC2a-win32-x86_64.zip
org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.32RC2a-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.31-202402290520/
org.eclipse.equinox.p2.tests.last.release.build.repo=https://download.eclipse.org/equinox/drops/S-4.32RC2a-202406010610/

Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ buildId=${buildId}
# such as "4.5" instead of "4.5.0".
eclipseStream=${releaseNumberSDK}
# similar for previous release version
previousReleaseVersion=4.31
previousReleaseVersion=4.32RC2a
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@


mkdir -p workarea/${buildId}/eclipse-testing
cp /home/files/buildzips/oxygen/R/R-4.31-202402290520//eclipse-platform-4.31-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
cp /home/files/buildzips/oxygen/R/S-4.32RC2a-202406010610//eclipse-platform-4.32RC2a-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/

cp /home/files/buildzips/oxygen/R/R-4.31-202402290520//eclipse-SDK-4.31-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
cp /home/files/buildzips/oxygen/R/S-4.32RC2a-202406010610//eclipse-SDK-4.32RC2a-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/

cp eclipse-junit-tests-${buildId}.zip workarea/${buildId}/eclipse-testing/

Expand Down
16 changes: 8 additions & 8 deletions production/testScripts/configuration/streamSpecific.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@

# purely title or identifier for display, to help confirm right file
# is being retrieved and used.
streamSpecificPropertiesTitle="Properties for 4.32.0 builds and tests"
streamSpecificPropertiesTitle="Properties for 4.33.0 builds and tests"

# These "previousRelease" variables are primarily used to have a
# 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.31-202402290520/
previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.32RC2a-202406010610/
# 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.31
previousReleaseVersion=4.32RC2a
# 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.31
previousReleaseVersionRepo=4.32RC2a

# 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
Expand All @@ -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.31-202402290520
baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.32RC2a-202406010610
# NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh
baselinePerfVersion=R-4.31-202402290520
baselinePerfVersion=S-4.32RC2a-202406010610
# TODO: could/should eventually "compute" label, from full version?
baselinePerfVersionLabel=4.31
baselinePerfBuildId=I20240229-0520
baselinePerfVersionLabel=4.32
baselinePerfBuildId=I20240601-0610

# We currently set here, but would be better to compute this value
# by peeking in the "to be tested" tar file.
Expand Down
2 changes: 1 addition & 1 deletion production/testScripts/updateTestResultsPages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.31-202402290520"
baselineCode="S-4.32RC2a-202406010610"
# to get time stamp, first remove initial IMN:
baselineForBuildSuffix=${buildId/[IMN]/}
#Then remove final '-' in build id
Expand Down
8 changes: 4 additions & 4 deletions scripts/updateProductVersion.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

script_location=$( (cd $(dirname $0) && pwd) )

find $script_location/.. -name pom.xml -exec sed -i 's/4.31.0/4.32.0/g' {} \;
find $script_location/.. -name MANIFEST.MF -exec sed -i 's/4.31.0/4.32.0/g' {} \;
find $script_location/.. -type f -name *.product -exec sed -i 's/4.31.0/4.32.0/g' {} \;
find $script_location/.. -name feature.xml -exec sed -i 's/4.31.0/4.32.0/g' {} \;
find $script_location/.. -name pom.xml -exec sed -i 's/4.32.0/4.33.0/g' {} \;
find $script_location/.. -name MANIFEST.MF -exec sed -i 's/4.32.0/4.33.0/g' {} \;
find $script_location/.. -type f -name *.product -exec sed -i 's/4.32.0/4.33.0/g' {} \;
find $script_location/.. -name feature.xml -exec sed -i 's/4.32.0/4.33.0/g' {} \;
Loading