diff options
12 files changed, 28 insertions, 28 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml index 0f4233fbb..f3afbea88 100644 --- a/eclipse-platform-parent/pom.xml +++ b/eclipse-platform-parent/pom.xml @@ -391,7 +391,7 @@ <configuration> <skip>${compare-version-with-baselines.skip}</skip> <baselines> - <baseline>http://download.eclipse.org/eclipse/updates/4.9/</baseline> <!-- Previous release) --> + <baseline>http://download.eclipse.org/eclipse/updates/4.10milestones/</baseline> <!-- Previous release) --> </baselines> <comparator>zip</comparator> </configuration> 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 9152f586d..d4d2299d8 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.9-linux-gtk-x86_64.tar.gz -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.9-win32-x86_64.zip -org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.9-macosx-cocoa-x86_64.tar.gz +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.10RC2-linux-gtk-x86_64.tar.gz +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.10RC2-win32-x86_64.zip +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.10RC2-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.9/R-4.9-201809060745 +org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.10milestones/S-4.10RC2-201812060815 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 725559c0d..dff3ff5b5 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.9 +previousReleaseVersion=4.10RC2 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 6f216d1dd..052eab5d5 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.9-201809060745/eclipse-SDK-4.9-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/ -cp /home/files/buildzips/oxygen/R/R-4.9-201809060745/eclipse-platform-4.9-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/ +#cp /home/files/buildzips/oxygen/R/S-4.10RC2-201812060815/eclipse-SDK-4.10RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/ +cp /home/files/buildzips/oxygen/R/S-4.10RC2-201812060815/eclipse-platform-4.10RC2-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 0e233c48b..fab1a0340 100755 --- a/production/build-functions.shsource +++ b/production/build-functions.shsource @@ -1156,7 +1156,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.9 + API_PREV_REF_LABEL=4.10RC2 fn-write-property API_PREV_REF_LABEL #API_FREEZE_REF_LABEL=4.11RC1 API_FREEZE_REF_LABEL=" " @@ -1170,9 +1170,9 @@ fn-summarize-apitooling () -DbuildId="$BUILD_ID" \ -DbuildLabel="$BUILD_ID" \ -DbuildWorkingArea="${BUILD_HOME}/4${BUILD_TYPE}/gitCache/eclipse.platform.releng.aggregator" \ - -DpreviousBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.9-201809060745/eclipse-SDK-4.9-win32-x86_64.zip \ - -DpreviousBaselineName=Eclipse-SDK-4.9 \ - -DpreviousBaselineFilename=eclipse-SDK-4.9-win32-x86_64.zip \ + -DpreviousBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.10RC2-201812060815/eclipse-SDK-4.10RC2-win32-x86_64.zip \ + -DpreviousBaselineName=Eclipse-SDK-4.10RC2 \ + -DpreviousBaselineFilename=eclipse-SDK-4.10RC2-win32-x86_64.zip \ -Djava.io.tmpdir=$TMP_DIR \ ${FREEZE_PARAMS} \ apiToolsReports diff --git a/production/createReports.sh b/production/createReports.sh index 1004310b7..757ab9d09 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.9/R-4.9-201809060745" +buildIdToCompare="4.10milestones/S-4.10RC2-201812060815" build_type=${buildIdToTest:0:1} echo -e "\tbuild_type: ${build_type}" @@ -68,7 +68,7 @@ if [[ ${build_type} == "I" ]] then update_dir_segment="4.11-I-builds" buildIdToCompare="4.10milestones/S-4.10RC2-201812060815" - echo -e "\tlatest_R_build: R-4.9-201809060745" + echo -e "\tlatest_R_build: S-4.10RC2-201812060815" elif [[ ${build_type} == "Y" ]] then update_dir_segment="4.11-Y-builds" diff --git a/production/miscToolsAndNotes/checkComposites/checkComposites.sh b/production/miscToolsAndNotes/checkComposites/checkComposites.sh index 96a5964f4..d077e69d3 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/R-4.9-201809060745 -baseEclipse=eclipse-platform-4.9-linux-gtk-x86_64.tar.gz +baseEclipseDirSegment=eclipse/downloads/drops4/S-4.10RC2-201812060815 +baseEclipse=eclipse-platform-4.10RC2-linux-gtk-x86_64.tar.gz repoFileAccess=file:///home/data/httpd/download.eclipse.org/ repoHttpAccess=http://download.eclipse.org repoAccess=${repoFileAccess} diff --git a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh index c83dce62e..9b89646d5 100755 --- a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh +++ b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.sh @@ -69,8 +69,8 @@ fi maintenanceStream=$2 if [[ -z "${maintenanceStream}" ]] then - printf "\n\t%s\t%s\n" "WARNING:" "Maintenance stream version not specified on command line, assuming 4.9" - maintenanceStream="4.9" + printf "\n\t%s\t%s\n" "WARNING:" "Maintenance stream version not specified on command line, assuming 4.10" + maintenanceStream="4.10" fi diff --git a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml index 871576833..8c085f4af 100644 --- a/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml +++ b/production/miscToolsAndNotes/updaterepo/updateGenericComposites.xml @@ -30,7 +30,7 @@ message="currentStream (such as '4.11') must be defined for this script" /> <fail unless="maintenanceStream" - message="maintenanceStream (such as '4.9') must be defined for this script" /> + message="maintenanceStream (such as '4.10') must be defined for this script" /> <!-- Note: we do not put stream number in 'name', since once a 'name' is defined in Eclipse's UI, it does not change. --> diff --git a/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh b/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh index 8d92deb75..5f23f985d 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.9-linux-gtk-x86_64.tar.gz + # should only be one tar file there, with a name similar to eclipse-platform-4.10-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 80d9df84c..e42f1a76a 100644 --- a/production/testScripts/configuration/streamSpecific.properties +++ b/production/testScripts/configuration/streamSpecific.properties @@ -11,16 +11,16 @@ streamSpecificPropertiesTitle="Properties for 4.11.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.9-201809060745 +previousReleaseLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.10RC2-201812060815 # 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.9 +previousReleaseVersion=4.10RC2 # 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.9 +previousReleaseVersionRepo=4.10milestones # 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 @@ -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://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.9-201809060745 -baselinePerfVersion=R-4.9-201809060745 +baselinePerfLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.10RC2-201812060815 +baselinePerfVersion=S-4.10RC2-201812060815 # TODO: could/should eventually "compute" label, from full version? -baselinePerfVersionLabel=4.9 -baselinePerfBuildId=I20180906-0745 +baselinePerfVersionLabel=4.10RC2 +baselinePerfBuildId=I20181206-0815 eclipse.perf.dbloc.value=//172.25.25.57:1527 diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh index 570206653..68f780326 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.9-201809060745" + baselineCode="S-4.10RC2-201812060815" # to get time stamp, first remove initial IMN: baselineForBuildSuffix=${buildId/[IMN]/} #Then remove final '-' in build id |