Skip to content

Commit

Permalink
Update previous release version to 4.30 GA across build scripts (#1620)
Browse files Browse the repository at this point in the history
Tracked in
#1619
  • Loading branch information
MohananRahul committed Dec 4, 2023
1 parent 6e01772 commit 4355f45
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 27 deletions.
12 changes: 6 additions & 6 deletions cje-production/Y-build/buildproperties.txt
Expand Up @@ -38,21 +38,21 @@ 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
#FREEZE_PARAMS="-DfreezeBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-${API_FREEZE_REF_LABEL}-202108251800/eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip -DfreezeName=Eclipse-SDK-${API_FREEZE_REF_LABEL} -DfreezeFilename=eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip"
# 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/"
Expand Down
8 changes: 4 additions & 4 deletions cje-production/buildproperties.txt
Expand Up @@ -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/"
Expand Down
6 changes: 3 additions & 3 deletions eclipse-platform-parent/pom.xml
Expand Up @@ -142,7 +142,7 @@
<tycho.useJDK>BREE</tycho.useJDK>

<compare-version-with-baselines.skip>true</compare-version-with-baselines.skip>
<previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.30-I-builds/I20231123-1700/</previous-release.baseline>
<previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110/</previous-release.baseline>

<!--
Declaration of properties that contribute to the arg line for the tycho-surefire-plugin.
Expand Down Expand Up @@ -737,12 +737,12 @@
<!-- Can specify an exact range here, or something of a loose range, depending on what's needed. -->
<versionRangeForPatch>[3.19.200.v20230705-1800,3.19.249.v20231213-1800)</versionRangeForPatch>
<!-- Comment this line when a patch is required on top of I-build -->
<comparator.repo>https://download.eclipse.org/eclipse/updates/4.29/R-4.29-202309031000/</comparator.repo>
<comparator.repo>https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110/</comparator.repo>
</properties>
<repositories>
<repository>
<id>eclipse-p2-repo-java21patch</id>
<url>https://download.eclipse.org/eclipse/updates/4.29/R-4.29-202309031000/</url>
<url>https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110/</url>
<layout>p2</layout>
</repository>
</repositories>
Expand Down
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.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/

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.30RC2
previousReleaseVersion=4.30
Expand Up @@ -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/

Expand Down
12 changes: 6 additions & 6 deletions production/testScripts/configuration/streamSpecific.properties
Expand Up @@ -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
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/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.
Expand Down
2 changes: 1 addition & 1 deletion production/testScripts/updateTestResultsPages.sh
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.30RC2-202311231700"
baselineCode="R-4.30-202312010110"
# to get time stamp, first remove initial IMN:
baselineForBuildSuffix=${buildId/[IMN]/}
#Then remove final '-' in build id
Expand Down

0 comments on commit 4355f45

Please sign in to comment.