diff options
author | Vikas Chandra | 2019-09-18 11:12:03 +0000 |
---|---|---|
committer | Vikas Chandra | 2019-09-18 11:50:49 +0000 |
commit | 2b0d7f88248bbf46424468e3966ec84b4e11d762 (patch) | |
tree | cd8adf6b684904d738e7e0d627ab2366103253a3 | |
parent | 87e8c4d522385abd5c6e576ebee719afa0e3c8ed (diff) | |
download | eclipse.platform.releng.aggregator-2b0d7f88248bbf46424468e3966ec84b4e11d762.tar.gz eclipse.platform.releng.aggregator-2b0d7f88248bbf46424468e3966ec84b4e11d762.tar.xz eclipse.platform.releng.aggregator-2b0d7f88248bbf46424468e3966ec84b4e11d762.zip |
Bug 550775 - Move to release version of 4.13 in build scripts
Change-Id: Iff6bf5521b74d4f0b50adef7c0306f9d4bf17ad6
Signed-off-by: Vikas Chandra <Vikas.Chandra@in.ibm.com>
11 files changed, 28 insertions, 30 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml index ad3e830da..3328066ec 100644 --- a/eclipse-platform-parent/pom.xml +++ b/eclipse-platform-parent/pom.xml @@ -157,7 +157,7 @@ <qualifier.format>'v'yyyyMMdd-HHmm</qualifier.format> <compare-version-with-baselines.skip>true</compare-version-with-baselines.skip> - <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.13-I-builds/</previous-release.baseline> + <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.13/</previous-release.baseline> <!-- Declaration of properties that contribute to the arg line for the tycho-surefire-plugin. 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 add344ba8..0facf7eeb 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.tar.gz -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.13RC2-linux-gtk-x86_64.tar.gz -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.13RC2-win32-x86_64.zip -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.13RC2-macosx-cocoa-x86_64.tar.gz +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.13-linux-gtk-x86_64.tar.gz +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.13-win32-x86_64.zip +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.13-macosx-cocoa-x86_64.tar.gz org.eclipse.equinox.p2.tests.current.build.repo=http\://download.eclipse.org/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds/${buildId} -org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.13milestones/S-4.13RC2-201909071130/ +org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.13milestones/R-4.13-201909161045/ 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 acb380360..dd7c87bb8 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.12 +previousReleaseVersion=4.13 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 92d8e09c3..9dbc58201 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.13RC2-201909071130/eclipse-platform-4.13RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/ +cp /home/files/buildzips/oxygen/R/R-4.13-201909161045/eclipse-platform-4.13-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/ -cp /home/files/buildzips/oxygen/R/S-4.13RC2-201909071130/eclipse-SDK-4.13RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/ +cp /home/files/buildzips/oxygen/R/R-4.13-201909161045/eclipse-SDK-4.13-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/ cp eclipse-junit-tests-${buildId}.zip workarea/${buildId}/eclipse-testing/ diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml index e0a9e50f4..8b91f0ef0 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml @@ -96,10 +96,10 @@ <!-- for I or M build (which is the unusual case) the build directory and label are the same --> <property name="eclipseBaseDir" - value="S-4.13RC2-201909071130" /> + value="R-4.13-201909161045" /> <property name="eclispeBaseLabel" - value="4.13RC2" /> + value="4.13" /> <property name="platformURL" diff --git a/production/build-functions.shsource b/production/build-functions.shsource index 9663c7a1f..3160ccb69 100755 --- a/production/build-functions.shsource +++ b/production/build-functions.shsource @@ -1155,9 +1155,9 @@ fn-summarize-apitooling () # place, and not have to make further, hard-coded changes to php files. # Similar for freeze label. # NOTE: the *reference* for API changes should be the "previous release", even if it is a "service release". - API_PREV_REF_LABEL=4.12 + API_PREV_REF_LABEL=4.13 fn-write-property API_PREV_REF_LABEL - #API_FREEZE_REF_LABEL=4.13RC2 + #API_FREEZE_REF_LABEL=4.14RC1 API_FREEZE_REF_LABEL=" " fn-write-property API_FREEZE_REF_LABEL java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \ @@ -1169,9 +1169,9 @@ fn-summarize-apitooling () -DbuildId="$BUILD_ID" \ -DbuildLabel="$BUILD_ID" \ -DbuildWorkingArea="${BUILD_HOME}/4${BUILD_TYPE}/gitCache/eclipse.platform.releng.aggregator" \ - -DpreviousBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.13RC2-201909071130/eclipse-SDK-4.13RC2-win32-x86_64.zip \ - -DpreviousBaselineName=Eclipse-SDK-4.13RC2 \ - -DpreviousBaselineFilename=eclipse-SDK-4.13RC2-win32-x86_64.zip \ + -DpreviousBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.13-201909161045/eclipse-SDK-4.13-win32-x86_64.zip \ + -DpreviousBaselineName=Eclipse-SDK-4.13 \ + -DpreviousBaselineFilename=eclipse-SDK-4.13-win32-x86_64.zip \ -Djava.io.tmpdir=$TMP_DIR \ ${FREEZE_PARAMS} \ apiToolsReports diff --git a/production/createReports.sh b/production/createReports.sh index 89bbe9ab5..f0f737719 100755 --- a/production/createReports.sh +++ b/production/createReports.sh @@ -36,7 +36,7 @@ echo -e "\tbuildIdToTest: ${BUILD_ID}" # TODO: we could have a "previous_release" sort of variable that # would be defined in parent pom or build_eclipse_org.shsource so that # we do not need to change this source. -buildIdToCompare="4.13milestones/S-4.13RC2-201909071130" +buildIdToCompare="4.13milestones/R-4.13-201909161045" build_type=${buildIdToTest:0:1} echo -e "\tbuild_type: ${build_type}" @@ -67,8 +67,8 @@ function latestSimpleRepo if [[ ${build_type} == "I" ]] then update_dir_segment="4.14-I-builds" - buildIdToCompare="4.13milestones/S-4.13RC2-201909071130" - echo -e "\tlatest_R_build: S-4.13RC2-201909071130" + buildIdToCompare="4.13milestones/R-4.13-201909161045" + echo -e "\tlatest_R_build: R-4.13-201909161045" elif [[ ${build_type} == "Y" ]] then update_dir_segment="4.14-Y-builds" diff --git a/production/miscToolsAndNotes/checkComposites/checkComposites.sh b/production/miscToolsAndNotes/checkComposites/checkComposites.sh index eca96894f..4c0a86b74 100755 --- a/production/miscToolsAndNotes/checkComposites/checkComposites.sh +++ b/production/miscToolsAndNotes/checkComposites/checkComposites.sh @@ -22,8 +22,8 @@ # and then executed in "bash script" build step. baseEclipseAccessDir=/home/data/httpd/download.eclipse.org -baseEclipseDirSegment=eclipse/downloads/drops4/S-4.13RC2-201909071130 -baseEclipse=eclipse-platform-4.13RC2-linux-gtk-x86_64.tar.gz +baseEclipseDirSegment=eclipse/downloads/drops4/R-4.13-201909161045 +baseEclipse=eclipse-platform-4.13-linux-gtk-x86_64.tar.gz repoFileAccess=file:///home/data/httpd/download.eclipse.org/ repoHttpAccess=http://download.eclipse.org repoAccess=${repoFileAccess} @@ -33,8 +33,6 @@ repoList="\ /eclipse/updates/4.14/ \ /eclipse/updates/4.14-I-builds/ \ /eclipse/updates/4.14milestones/ \ -/eclipse/updates/4.13-I-builds/ \ -/eclipse/updates/4.13milestones/ \ /eclipse/updates/4.13-Y-builds/ \ /eclipse/updates/4.13-P-builds/ \ " diff --git a/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml b/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml index c5b74f0d7..3388052c5 100644 --- a/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml +++ b/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml @@ -97,10 +97,10 @@ <!-- for I or M build (which is the unusual case) the build directory and label are the same --> <property name="eclipseBaseDir" - value="S-4.13RC2-201909071130" /> + value="R-4.13-201909161045" /> <property name="eclispeBaseLabel" - value="4.13RC2" /> + value="4.13" /> <property name="platformURL" diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties index 647316940..9e773e113 100644 --- a/production/testScripts/configuration/streamSpecific.properties +++ b/production/testScripts/configuration/streamSpecific.properties @@ -11,11 +11,11 @@ streamSpecificPropertiesTitle="Properties for 4.14.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=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.13RC2-201909071130 +previousReleaseLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.13-201909161045 # 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.13RC2 +previousReleaseVersion=4.13 # 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, @@ -34,11 +34,11 @@ 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=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.13RC2-201909071130 -baselinePerfVersion=4.13RC2-201909071130 +baselinePerfLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.13-201909161045 +baselinePerfVersion=4.13-201909161045 # TODO: could/should eventually "compute" label, from full version? baselinePerfVersionLabel=4.13 -baselinePerfBuildId=I20190907-1130 +baselinePerfBuildId=I20190916-1045 # Derby database cannot used to store performance results anymore. (see Bug 548523) # Instead samples are serialized into a file and included in build artifacts. diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh index f4f937a09..1b1517891 100755 --- a/production/testScripts/updateTestResultsPages.sh +++ b/production/testScripts/updateTestResultsPages.sh @@ -314,7 +314,7 @@ then RAW_DATE_START=$( date -u +%s ) # TODO: avoid this hard coding of baseline value - baselineCode="S-4.13RC2-201909071130" + baselineCode="R-4.13-201909161045" # to get time stamp, first remove initial IMN: baselineForBuildSuffix=${buildId/[IMN]/} #Then remove final '-' in build id |