diff options
author | genie.releng | 2018-12-18 23:05:56 +0000 |
---|---|---|
committer | Niraj Modi | 2018-12-19 09:52:23 +0000 |
commit | f5b7a37caf0663f73bef0549f619ae526419a644 (patch) | |
tree | 3ef9efe75e49d73859e9526ad12517b6db8418d1 | |
parent | 37fff5016954677c434690dadb6596a466fdadc2 (diff) | |
download | eclipse.platform.releng.aggregator-f5b7a37caf0663f73bef0549f619ae526419a644.tar.gz eclipse.platform.releng.aggregator-f5b7a37caf0663f73bef0549f619ae526419a644.tar.xz eclipse.platform.releng.aggregator-f5b7a37caf0663f73bef0549f619ae526419a644.zip |
Bug 542548 - Move to release version of 4.10 in build scripts
Change-Id: I509c1b91ba03068195f1d9e0feea11faf8e7dd8d
Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
12 files changed, 28 insertions, 28 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml index fd2ff4ef9..8ac237515 100644 --- a/eclipse-platform-parent/pom.xml +++ b/eclipse-platform-parent/pom.xml @@ -375,7 +375,7 @@ <configuration> <skip>${compare-version-with-baselines.skip}</skip> <baselines> - <baseline>http://download.eclipse.org/eclipse/updates/4.10milestones/</baseline> <!-- Previous release) --> + <baseline>http://download.eclipse.org/eclipse/updates/4.10/</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 d4d2299d8..4e5e1b9c8 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.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.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.10-linux-gtk-x86_64.tar.gz +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.10-win32-x86_64.zip +org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.10-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.10milestones/S-4.10RC2-201812060815 +org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.10/R-4.10-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 dff3ff5b5..f71750da9 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.10RC2 +previousReleaseVersion=4.10 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 052eab5d5..ac0dd2517 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/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 /home/files/buildzips/oxygen/R/R-4.10-201812060815/eclipse-SDK-4.10-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/ +cp /home/files/buildzips/oxygen/R/R-4.10-201812060815/eclipse-platform-4.10-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/getBaseBuilderAndTools.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml index 1ed0ee515..079729a5e 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml @@ -141,7 +141,7 @@ <echo message="DEBUG: Before setting default, eclisperun-repo was found to be ${eclipserun-repo-is-set}" /> <!-- the following setting is just to make sure we have a reasonable "fallback" value, such as when using this script on Hudson to do "clean up" of repositories. Should change it to "well known" version, - such as updates/4.9/ once it is ready. + such as updates/4.10/ once it is ready. --> <property name="eclipserun-repo" diff --git a/production/build-functions.shsource b/production/build-functions.shsource index a9d4a4c67..b481b62a3 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.10RC2 + API_PREV_REF_LABEL=4.10 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/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 \ + -DpreviousBaseURL=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.10-201812060815/eclipse-SDK-4.10-win32-x86_64.zip \ + -DpreviousBaselineName=Eclipse-SDK-4.10 \ + -DpreviousBaselineFilename=eclipse-SDK-4.10-win32-x86_64.zip \ -Djava.io.tmpdir=$TMP_DIR \ ${FREEZE_PARAMS} \ apiToolsReports diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource index e8894a09b..d0bce9a44 100644 --- a/production/build_eclipse_org.shsource +++ b/production/build_eclipse_org.shsource @@ -96,7 +96,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.9 +BASEBUILDER_TAG=4.10 B_GIT_EMAIL=genie.releng@eclipse.org B_GIT_NAME="Releng HIPP" diff --git a/production/createReports.sh b/production/createReports.sh index 757ab9d09..35b1af148 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.10milestones/S-4.10RC2-201812060815" +buildIdToCompare="4.10/R-4.10-201812060815" 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.11-I-builds" - buildIdToCompare="4.10milestones/S-4.10RC2-201812060815" - echo -e "\tlatest_R_build: S-4.10RC2-201812060815" + buildIdToCompare="4.10/R-4.10-201812060815" + echo -e "\tlatest_R_build: R-4.10-201812060815" elif [[ ${build_type} == "Y" ]] then update_dir_segment="4.11-Y-builds" @@ -107,7 +107,7 @@ then mkdir -p ${output_dir} # This analyzersBuildId can (currently) be found by "drilling down" at - # http://download.eclipse.org/cbi/updates/analyzers/4.9/ + # http://download.eclipse.org/cbi/updates/analyzers/4.10/ # analyzersBuildId=I20161201-1633 # We use analyzer from hipp this way we have one less version to track tar_name=org.eclipse.cbi.p2repo.analyzers.product-linux.gtk.x86_64.tar.gz diff --git a/production/miscToolsAndNotes/checkComposites/checkComposites.sh b/production/miscToolsAndNotes/checkComposites/checkComposites.sh index d077e69d3..ccc7b6b93 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.10RC2-201812060815 -baseEclipse=eclipse-platform-4.10RC2-linux-gtk-x86_64.tar.gz +baseEclipseDirSegment=eclipse/downloads/drops4/R-4.10-201812060815 +baseEclipse=eclipse-platform-4.10-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/proxyRelated/getBaseBuilderAndTools.xml b/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml index b24b40ebf..7a1749628 100644 --- a/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml +++ b/production/miscToolsAndNotes/proxyRelated/getBaseBuilderAndTools.xml @@ -142,7 +142,7 @@ <echo message="DEBUG: Before setting default, eclisperun-repo was found to be ${eclipserun-repo-is-set}" /> <!-- the following setting is just to make sure we have a reasonable "fallback" value, such as when using this script on Hudson to do "clean up" of repositories. Should change it to "well known" version, - such as updates/4.9/ once it is ready. + such as updates/4.10/ once it is ready. --> <property name="eclipserun-repo" diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties index e42f1a76a..ad9cb06f6 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://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.10RC2-201812060815 +previousReleaseLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.10-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.10RC2 +previousReleaseVersion=4.10 # 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.10milestones +previousReleaseVersionRepo=4.10 # 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,10 +34,10 @@ 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.10RC2-201812060815 -baselinePerfVersion=S-4.10RC2-201812060815 +baselinePerfLocation=http://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.10-201812060815 +baselinePerfVersion=R-4.10-201812060815 # TODO: could/should eventually "compute" label, from full version? -baselinePerfVersionLabel=4.10RC2 +baselinePerfVersionLabel=4.10 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 68f780326..dbebd2ddd 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.10RC2-201812060815" + baselineCode="R-4.10-201812060815" # to get time stamp, first remove initial IMN: baselineForBuildSuffix=${buildId/[IMN]/} #Then remove final '-' in build id |