diff options
author | Sravan Kumar Lakkimsetti | 2018-04-12 10:32:43 +0000 |
---|---|---|
committer | Sravan Kumar Lakkimsetti | 2018-04-12 10:32:43 +0000 |
commit | d262cba7bf5274b9dbb88996098e47af52bcc6f4 (patch) | |
tree | 5efff8bb764fe8a683cc0a04f44a8c517f6c0212 | |
parent | b6c1c2c2fc0d410d9db7b7415c023ef51bdd0221 (diff) | |
download | eclipse.platform.releng.aggregator-d262cba7bf5274b9dbb88996098e47af52bcc6f4.tar.gz eclipse.platform.releng.aggregator-d262cba7bf5274b9dbb88996098e47af52bcc6f4.tar.xz eclipse.platform.releng.aggregator-d262cba7bf5274b9dbb88996098e47af52bcc6f4.zip |
Bug 533494 - Adjust baselines to R4.7.3a release for API Tools and
Deprecation reports
Change-Id: I47c44c774f835f2c75a25a85d2a3d5e3948d734d
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
10 files changed, 26 insertions, 29 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 c4a99f54b..83ea0d09c 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.3-linux-gtk.tar.gz -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.7.3-linux-gtk-x86_64.tar.gz -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=\${basedir}\\\\eclipse-platform-4.7.3-win32.zip -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.7.3-win32-x86_64.zip -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.7.3-macosx-cocoa-x86_64.tar.gz +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux=\${basedir}/eclipse-platform-4.7.3a-linux-gtk.tar.gz +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.7.3a-linux-gtk-x86_64.tar.gz +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32=\${basedir}\\\\eclipse-platform-4.7.3a-win32.zip +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.7.3a-win32-x86_64.zip +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.7.3a-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.3-201803010715 +org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.7/R-4.7.3a-201803300640 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 dc5893e55..f1947a6f0 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.3 +previousReleaseVersion=4.7.3a 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 357ad9c7b..9753c8a63 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.3-201803010715/eclipse-SDK-4.7.3-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/ -cp /home/files/buildzips/oxygen/R/R-4.7.3-201803010715/eclipse-platform-4.7.3-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/ +#cp /home/files/buildzips/oxygen/R/R-4.7.3a-201803300640/eclipse-SDK-4.7.3a-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/ +cp /home/files/buildzips/oxygen/R/R-4.7.3a-201803300640/eclipse-platform-4.7.3a-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/production/build-functions.shsource b/production/build-functions.shsource index e0917e7e4..0e29d6f09 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.3 + API_PREV_REF_LABEL=4.7.3a fn-write-property API_PREV_REF_LABEL API_FREEZE_REF_LABEL=4.8M6 # 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.3-201803010715/eclipse-SDK-4.7.3-win32.zip \ - -DpreviousBaselineName=Eclipse-SDK-4.7.3 \ - -DpreviousBaselineFilename=eclipse-SDK-4.7.3-win32.zip \ + -DpreviousBaseURL=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-SDK-4.7.3a-win32.zip \ + -DpreviousBaselineName=Eclipse-SDK-4.7.3a \ + -DpreviousBaselineFilename=eclipse-SDK-4.7.3a-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 6f996a750..db980028b 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.3 +BASEBUILDER_TAG=4.7.3a B_GIT_EMAIL=genie.releng@eclipse.org B_GIT_NAME="Releng HIPP" diff --git a/production/createReports.sh b/production/createReports.sh index b2fb67adf..f67ab9e38 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.3-201803010715" +buildIdToCompare="4.7/R-4.7.3a-201803300640" 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.3-201803010715" - echo -e "\tlatest_R_build: R-4.7.3-201803010715" + buildIdToCompare="4.7/R-4.7.3a-201803300640" + echo -e "\tlatest_R_build: R-4.7.3a-201803300640" elif [[ ${build_type} == "I" ]] then update_dir_segment="4.8-I-builds" - buildIdToCompare="4.7/R-4.7.3-201803010715" - echo -e "\tlatest_R_build: R-4.7.3-201803010715" + buildIdToCompare="4.7/R-4.7.3a-201803300640" + echo -e "\tlatest_R_build: R-4.7.3a-201803300640" 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 371b94a89..c0f4c4a9d 100755 --- a/production/miscToolsAndNotes/checkComposites/checkComposites.sh +++ b/production/miscToolsAndNotes/checkComposites/checkComposites.sh @@ -19,17 +19,14 @@ # and then executed in "bash script" build step. baseEclipseAccessDir=/home/data/httpd/download.eclipse.org -baseEclipseDirSegment=eclipse/downloads/drops4/R-4.7.3-201803010715 -baseEclipse=eclipse-platform-4.7.3-linux-gtk-x86_64.tar.gz +baseEclipseDirSegment=eclipse/downloads/drops4/R-4.7.3a-201803300640 +baseEclipse=eclipse-platform-4.7.3a-linux-gtk-x86_64.tar.gz repoFileAccess=file:///home/data/httpd/download.eclipse.org/ repoHttpAccess=http://download.eclipse.org repoAccess=${repoFileAccess} # TODO: reduce this list soon repoList="\ -/eclipse/updates/4.5/ \ -/eclipse/updates/4.6/ \ /eclipse/updates/4.7/ \ -/eclipse/updates/4.7-U-builds/ \ /eclipse/updates/4.8-I-builds/ \ /eclipse/updates/4.8milestones/ \ diff --git a/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh b/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh index bb8274d85..42b4f1da2 100755 --- a/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh +++ b/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh @@ -50,7 +50,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.3-linux-gtk-x86_64.tar.gz + # should only be one tar file there, with a name similar to eclipse-platform-4.7.3a-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/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties index f5010d355..8397179a6 100644 --- a/production/testScripts/configuration/streamSpecific.properties +++ b/production/testScripts/configuration/streamSpecific.properties @@ -11,16 +11,16 @@ streamSpecificPropertiesTitle="Properties for 4.8.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://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.7.3-201803010715 +previousReleaseLocation=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.7.3a-201803300640 # 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.7.3 +previousReleaseVersion=4.7.3a # 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.7.3 +previousReleaseVersionRepo=4.7 # 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 diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh index 1f9237b73..54bd43b8c 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="R-4.7.3-201803010715" + baselineCode="R-4.7.3a-201803300640" # to get time stamp, first remove initial IMN: baselineForBuildSuffix=${buildId/[IMN]/} #Then remove final '-' in build id |