Skip to content

Commit

Permalink
Update previous release version to 4.27 GA across build scripts (#962)
Browse files Browse the repository at this point in the history
Tracked by
#957
  • Loading branch information
MohananRahul authored Mar 14, 2023
1 parent 9f3a2ba commit 567b278
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 23 deletions.
8 changes: 4 additions & 4 deletions cje-production/Y-build/buildproperties.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ API_FREEZE_REF_LABEL=""
# Otherwise set to a blank space
FREEZE_PARAMS=" "

PREVIOUS_RELEASE_VER="4.26"
PREVIOUS_RELEASE_REPO_ID="4.26"
PREVIOUS_RELEASE_VER="4.27"
PREVIOUS_RELEASE_REPO_ID="4.27"
#build id for getting repo
BASEBUILD_ID="R-4.26-202211231800"
BASEBUILD_ID="R-4.27-202303020300"
#release id for downloading eclipse
PREVIOUS_RELEASE_ID="R-4.26-202211231800"
PREVIOUS_RELEASE_ID="R-4.27-202303020300"

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/"
Expand Down
8 changes: 4 additions & 4 deletions cje-production/buildproperties.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ API_FREEZE_REF_LABEL=""
# Otherwise set to a blank space
FREEZE_PARAMS=" "

PREVIOUS_RELEASE_VER="4.27RC2"
PREVIOUS_RELEASE_REPO_ID="4.27-I-builds"
PREVIOUS_RELEASE_VER="4.27"
PREVIOUS_RELEASE_REPO_ID="4.27"
#build id for getting repo
BASEBUILD_ID="I20230302-0300"
BASEBUILD_ID="R-4.27-202303020300"
#release id for downloading eclipse
PREVIOUS_RELEASE_ID="S-4.27RC2-202303020300"
PREVIOUS_RELEASE_ID="R-4.27-202303020300"

BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.27.0/R-3.27.0-20220829002010/repositoryunittests/"
Expand Down
6 changes: 3 additions & 3 deletions eclipse-platform-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.27-I-builds/I20230302-0300/</previous-release.baseline>
<previous-release.baseline> https://download.eclipse.org/eclipse/updates/4.27/R-4.27-202303020300/</previous-release.baseline>

<!--
Declaration of properties that contribute to the arg line for the tycho-surefire-plugin.
Expand Down Expand Up @@ -608,12 +608,12 @@
<!-- Can specify an exact range here, or something of a loose range, depending on what's needed. -->
<versionRangeForPatch>[3.19.0.v20230302-0300,3.19.49.v20230604-1800)</versionRangeForPatch>
<!-- Comment this line when a patch is required on top of I-build -->
<comparator.repo>https://download.eclipse.org/eclipse/updates/4.27-I-builds/I20230302-0300/</comparator.repo>
<comparator.repo>https://download.eclipse.org/eclipse/updates/4.27/R-4.27-202303020300/</comparator.repo>
</properties>
<repositories>
<repository>
<id>eclipse-p2-repo-java20patch</id>
<url>https://download.eclipse.org/eclipse/updates/4.27-I-builds/I20230302-0300/</url>
<url>https://download.eclipse.org/eclipse/updates/4.27/R-4.27-202303020300/</url>
<layout>p2</layout>
</repository>
</repositories>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_6
org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.27-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.27RC2-202303020300/
org.eclipse.equinox.p2.tests.last.release.build.repo=https://download.eclipse.org/equinox/drops/R-4.27-202303020300/

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.27RC2
previousReleaseVersion=4.27
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/S-4.27RC2-202303020300//eclipse-platform-4.27RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
cp /home/files/buildzips/oxygen/R/R-4.27-202303020300//eclipse-platform-4.27-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/

cp /home/files/buildzips/oxygen/R/S-4.27RC2-202303020300//eclipse-SDK-4.27RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
cp /home/files/buildzips/oxygen/R/R-4.27-202303020300//eclipse-SDK-4.27-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/

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

Expand Down
14 changes: 7 additions & 7 deletions production/testScripts/configuration/streamSpecific.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ streamSpecificPropertiesTitle="Properties for 4.28.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.26-202211231800/
previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.27-202303020300/
# 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.26
previousReleaseVersion=4.27
# 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.26
previousReleaseVersionRepo=4.27

# 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.26-202211231800
baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.27-202303020300
# NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh
baselinePerfVersion=R-4.26-202211231800
baselinePerfVersion=R-4.27-202303020300
# TODO: could/should eventually "compute" label, from full version?
baselinePerfVersionLabel=4.26
baselinePerfBuildId=I20221123-1800
baselinePerfVersionLabel=4.27
baselinePerfBuildId=I20230302-0300

# 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="S-4.27RC2-202303020300"
baselineCode="R-4.27-202303020300"
# to get time stamp, first remove initial IMN:
baselineForBuildSuffix=${buildId/[IMN]/}
#Then remove final '-' in build id
Expand Down

0 comments on commit 567b278

Please sign in to comment.