From b3e6c47d1b994a7d2a9de02921c7a0563178efe2 Mon Sep 17 00:00:00 2001 From: Sravan Kumar Lakkimsetti Date: Fri, 13 Oct 2017 19:10:31 +0530 Subject: Bug 525883 - Adjust Baselines for API Tools and Deprecation Reports Change-Id: I4a26c92ca4af69a30c9c9638e08d934d53ce4bf0 Signed-off-by: Sravan Kumar Lakkimsetti --- .../src/main/resources/equinoxp2tests.properties | 12 ++++++------ .../eclipse-junit-tests/src/main/resources/label.properties | 2 +- .../src/main/scripts/getPreviousRelease.sh | 4 ++-- .../eclipse-junit-tests/src/main/scripts/runtests.sh | 2 +- production/build-functions.shsource | 8 ++++---- production/build_eclipse_org.shsource | 2 +- production/createReports.sh | 10 +++++----- .../miscToolsAndNotes/checkComposites/checkComposites.sh | 8 +++----- .../proxyRelated/getBaseBuilderAndTools.xml | 6 +++--- .../configuration/sdk.tests/testScripts/runtests.sh | 2 +- .../testScripts/configuration/streamSpecific.properties | 6 +++--- production/testScripts/updateTestResultsPages.sh | 2 +- 12 files changed, 31 insertions(+), 33 deletions(-) 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 ce926c5df..4238acbc5 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 @@ -7,12 +7,12 @@ org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32=\${basedir}\\\\ec 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=\${basedir}/eclipse-platform-4.7-linux-gtk.tar.gz -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.7-linux-gtk-x86_64.tar.gz -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=\${basedir}\\\\eclipse-platform-4.7-win32.zip -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.7-win32-x86_64.zip -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.7-macosx-cocoa-x86_64.tar.gz +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux=\${basedir}/eclipse-platform-4.7.1a-linux-gtk.tar.gz +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.7.1a-linux-gtk-x86_64.tar.gz +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=\${basedir}\\\\eclipse-platform-4.7.1a-win32.zip +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.7.1a-win32-x86_64.zip +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.7.1a-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.7/R-4.7-201706120950 +org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.7/R-4.7.1a-201710090410 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 8a30d6cf4..3f42e5b3c 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.7 +previousReleaseVersion=4.7.1a 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 1c02881b7..dfc2ac672 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,8 +7,8 @@ mkdir -p workarea/${buildId}/eclipse-testing -#cp /home/files/buildzips/oxygen/R/R-4.7-201706120950/eclipse-SDK-4.7-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/ -cp /home/files/buildzips/oxygen/R/R-4.7-201706120950/eclipse-platform-4.7-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/ +#cp /home/files/buildzips/oxygen/R/R-4.7.1a-201710090410/eclipse-SDK-4.7.1a-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/ +cp /home/files/buildzips/oxygen/R/R-4.7.1a-201710090410/eclipse-platform-4.7.1a-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/ cp ../../eclipse-SDK-${buildId}-linux-gtk-x86_64.tar.gz workarea/${buildId}/eclipse-testing/ diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh index be20ff761..bfed54dd4 100755 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh @@ -58,7 +58,7 @@ then exit 1 else echo "stableEclipseInstallation directory found, as expected, at ${stableEclipseInstallLocation}" - # should only be one tar file there, with a name similar to eclipse-platform-4.7-linux-gtk-x86_64.tar.gz + # should only be one tar file there, with a name similar to eclipse-platform-4.7.1a-linux-gtk-x86_64.tar.gz # so for simplicity, we'll assume all is well and untar what ever we find. tar -xf ${stableEclipseInstallLocation}/*tar.gz -C ${stableEclipseInstallLocation} fi diff --git a/production/build-functions.shsource b/production/build-functions.shsource index e1bebbd49..7f6918e63 100755 --- a/production/build-functions.shsource +++ b/production/build-functions.shsource @@ -1189,7 +1189,7 @@ 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.7 + API_PREV_REF_LABEL=4.7.1a fn-write-property API_PREV_REF_LABEL # API_FREEZE_REF_LABEL=4.7M6 API_FREEZE_REF_LABEL=" " @@ -1203,9 +1203,9 @@ fn-summarize-apitooling () -DbuildId="$BUILD_ID" \ -DbuildLabel="$BUILD_ID" \ -DbuildWorkingArea="${BUILD_HOME}/4${BUILD_TYPE}/gitCache/eclipse.platform.releng.aggregator" \ - -DpreviousBaseURL=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-SDK-4.7-win32.zip \ - -DpreviousBaselineName=Eclipse-SDK-4.7 \ - -DpreviousBaselineFilename=eclipse-SDK-4.7-win32.zip \ + -DpreviousBaseURL=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-SDK-4.7.1a-win32.zip \ + -DpreviousBaselineName=Eclipse-SDK-4.7.1a \ + -DpreviousBaselineFilename=eclipse-SDK-4.7.1a-win32.zip \ -Djava.io.tmpdir=$TMP_DIR \ ${FREEZE_PARAMS} \ apiToolsReports diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource index 34ddc122f..907eb9f1b 100644 --- a/production/build_eclipse_org.shsource +++ b/production/build_eclipse_org.shsource @@ -93,7 +93,7 @@ export PATH=$JAVA_HOME/bin:$MAVEN_PATH:$ANT_HOME/bin:$PATH # Only used to start antrunner for tests. # TODO: avoid this hard coding -BASEBUILDER_TAG=4.7 +BASEBUILDER_TAG=4.7.1a B_GIT_EMAIL=genie.releng@eclipse.org B_GIT_NAME="Releng HIPP" diff --git a/production/createReports.sh b/production/createReports.sh index 1f7004f72..733dc3a2c 100755 --- a/production/createReports.sh +++ b/production/createReports.sh @@ -33,7 +33,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.7/R-4.7-201706120950" +buildIdToCompare="4.7/R-4.7.1a-201710090410" build_type=${buildIdToTest:0:1} echo -e "\tbuild_type: ${build_type}" @@ -77,13 +77,13 @@ then elif [[ ${build_type} == "M" ]] then update_dir_segment="4.7-M-builds" - buildIdToCompare="4.7/R-4.7-201706120950" - echo -e "\tlatest_R_build: R-4.7-201706120950" + buildIdToCompare="4.7/R-4.7.1a-201710090410" + echo -e "\tlatest_R_build: R-4.7.1a-201710090410" elif [[ ${build_type} == "I" ]] then update_dir_segment="4.8-I-builds" - buildIdToCompare="4.7/R-4.7-201706120950" - echo -e "\tlatest_R_build: R-4.7-201706120950" + buildIdToCompare="4.7/R-4.7.1a-201710090410" + echo -e "\tlatest_R_build: R-4.7.1a-201710090410" elif [[ ${build_type} == "Y" ]] then update_dir_segment="4.8-Y-builds" diff --git a/production/miscToolsAndNotes/checkComposites/checkComposites.sh b/production/miscToolsAndNotes/checkComposites/checkComposites.sh index a3734b877..5ad77dab3 100755 --- a/production/miscToolsAndNotes/checkComposites/checkComposites.sh +++ b/production/miscToolsAndNotes/checkComposites/checkComposites.sh @@ -19,8 +19,8 @@ # and then executed in "bash script" build step. baseEclipseAccessDir=/home/data/httpd/download.eclipse.org -baseEclipseDirSegment=eclipse/downloads/drops4/R-4.7-201706120950 -baseEclipse=eclipse-platform-4.7-linux-gtk-x86_64.tar.gz +baseEclipseDirSegment=eclipse/downloads/drops4/R-4.7.1a-201710090410 +baseEclipse=eclipse-platform-4.7.1a-linux-gtk-x86_64.tar.gz repoFileAccess=file:///home/data/httpd/download.eclipse.org/ repoHttpAccess=http://download.eclipse.org repoAccess=${repoFileAccess} @@ -28,10 +28,8 @@ repoAccess=${repoFileAccess} repoList="\ /eclipse/updates/4.5/ \ /eclipse/updates/4.6/ \ -/eclipse/updates/4.7-P-builds/ \ +/eclipse/updates/4.7/ \ /eclipse/updates/4.7-U-builds/ \ -/eclipse/updates/4.8-P-builds/ \ -/eclipse/updates/4.8-Y-builds/ \ /eclipse/updates/4.8-I-builds/ \ /eclipse/updates/4.8milestones/ \ diff --git a/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml b/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml index e59d6c4c0..c661808bc 100644 --- a/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml +++ b/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml @@ -94,10 +94,10 @@ + value="R-4.7.1a-201710090410" /> + value="4.7.1a" /> + value="http://download.eclipse.org/eclipse/updates/4.8-I-builds/" />