diff options
author | Sravan Kumar Lakkimsetti | 2017-08-21 10:19:40 +0000 |
---|---|---|
committer | Sravan Kumar Lakkimsetti | 2017-08-21 10:19:40 +0000 |
commit | 1778103393f2bc8fd86763e09baa75c056151e21 (patch) | |
tree | 2f82ef5030ee30f27bd234a42951c3761be733c4 /production | |
parent | 1079988b461bdf6896a447a888ee35aa4d0f3ca1 (diff) | |
download | eclipse.platform.releng.aggregator-1778103393f2bc8fd86763e09baa75c056151e21.tar.gz eclipse.platform.releng.aggregator-1778103393f2bc8fd86763e09baa75c056151e21.tar.xz eclipse.platform.releng.aggregator-1778103393f2bc8fd86763e09baa75c056151e21.zip |
Bug 518239: [JUnit 5] Feature patch for JUnit 5 support on 4.7
Change-Id: I63ca7330437c90e249b8f0e852e270bc71bfdd91
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Diffstat (limited to 'production')
-rw-r--r-- | production/bootstrapVariables.shsource | 4 | ||||
-rw-r--r-- | production/build_eclipse_org.shsource | 2 | ||||
-rwxr-xr-x | production/master-build.sh | 6 | ||||
-rw-r--r-- | production/sdk/bootstrap/bootstrap.shsource | 4 | ||||
-rw-r--r-- | production/sdk/collectTestResults.xml | 2 | ||||
-rwxr-xr-x | production/sdk/promotion/startTests.sh | 2 | ||||
-rwxr-xr-x | production/sdk/promotion/syncDropLocation.sh | 2 | ||||
-rw-r--r-- | production/sdk/promotion/syncUpdateUtils.shsource | 5 | ||||
-rw-r--r-- | production/testScripts/configuration/sdk.tests/testScripts/test.xml | 6 | ||||
-rw-r--r-- | production/testScripts/genTestIndexes.xml | 2 | ||||
-rw-r--r-- | production/testScripts/invokeTestsJSON.xml | 2 | ||||
-rw-r--r-- | production/testScripts/runTests2.xml | 6 | ||||
-rwxr-xr-x | production/testScripts/startTests.sh | 2 |
13 files changed, 25 insertions, 20 deletions
diff --git a/production/bootstrapVariables.shsource b/production/bootstrapVariables.shsource index 937a9f639..481e130de 100644 --- a/production/bootstrapVariables.shsource +++ b/production/bootstrapVariables.shsource @@ -144,8 +144,8 @@ fn-build-dir () # We do not expect S or R in this context # if we ever do, it is a 3 part id, not 2 part. # Either of the two "digits" forms should work. -#buildIdPattern="^[MNIPY][0-9]{8}-[0-9]{4}$" -buildIdPattern="^[MNIPY][[:digit:]]{8}-[[:digit:]]{4}$" +#buildIdPattern="^[MNIPYU][0-9]{8}-[0-9]{4}$" +buildIdPattern="^[MNIPYU][[:digit:]]{8}-[[:digit:]]{4}$" if [[ -z "${BUILD_ID}" || ! "${BUILD_ID}" =~ $buildIdPattern ]] then diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource index 53c8c6134..5dbbb566d 100644 --- a/production/build_eclipse_org.shsource +++ b/production/build_eclipse_org.shsource @@ -110,7 +110,7 @@ MAVEN_BREE=-Pbree-libs # local, non build.eclipse.org builds (or, test builds) may need to override, and turn off signing. # otherwise, we always sign if I or M builds, but not N builds # -if [[ $BUILD_TYPE =~ [IMXYP] ]] +if [[ $BUILD_TYPE =~ [IMXYPU] ]] then SIGNING=${SIGNING:-true} else diff --git a/production/master-build.sh b/production/master-build.sh index 406560002..9272ae4f0 100755 --- a/production/master-build.sh +++ b/production/master-build.sh @@ -150,7 +150,7 @@ then # the "day of the week" is Monday (day=1) so it is cleaned once # per week. We pick Monday since that is typically right before I-build, # so might avoid some surprises. - if [[ "$BUILD_TYPE" =~ [MIXYPS] || $(date +%u) == 1 ]] + if [[ "$BUILD_TYPE" =~ [MIXYPSU] || $(date +%u) == 1 ]] then rm -fr ${LOCAL_REPO}.bak 2>/dev/null mv ${LOCAL_REPO} ${LOCAL_REPO}.bak @@ -167,6 +167,8 @@ elif [ "$BUILD_TYPE" = X ]; then BUILD_TYPE_NAME="Experimental Branch" elif [ "$BUILD_TYPE" = Y ]; then BUILD_TYPE_NAME="BETA_JAVA9 Branch" +elif [ "$BUILD_TYPE" = U ]; then + BUILD_TYPE_NAME="BETA_JUNIT5 Branch" elif [ "$BUILD_TYPE" = P ]; then BUILD_TYPE_NAME="Patch" elif [ "$BUILD_TYPE" = S ]; then @@ -327,7 +329,7 @@ else echo "# (when repository is a branch, which it typically is)." >> ${buildDirectory}/directory.txt echo "# " >> ${buildDirectory}/directory.txt - if [[ $BUILD_TYPE =~ [IMXYP] ]] + if [[ $BUILD_TYPE =~ [IMXYPU] ]] then AGGRCOMMIT=$( git rev-parse HEAD ) echo "eclipse.platform.releng.aggregator TAGGED: ${BUILD_ID}" >> ${buildDirectory}/directory.txt diff --git a/production/sdk/bootstrap/bootstrap.shsource b/production/sdk/bootstrap/bootstrap.shsource index 9f71c0fc4..4c76be4f6 100644 --- a/production/sdk/bootstrap/bootstrap.shsource +++ b/production/sdk/bootstrap/bootstrap.shsource @@ -31,9 +31,9 @@ else exit 1 fi -if [[ ! "${BUILD_TYPE}" =~ [IMNPXY] ]] +if [[ ! "${BUILD_TYPE}" =~ [IMNPXYU] ]] then - echo "BUILD_TYPE must by I,M, N, P, X, or Y" + echo "BUILD_TYPE must by I,M, N, P, X, U or Y" echo " but found ${BUILD_TYPE}" exit 1 fi diff --git a/production/sdk/collectTestResults.xml b/production/sdk/collectTestResults.xml index 90f511865..9891066ab 100644 --- a/production/sdk/collectTestResults.xml +++ b/production/sdk/collectTestResults.xml @@ -181,7 +181,7 @@ <script language="javascript"><![CDATA[ var buildId = project.getProperty("buildId"); - var patternbuildType = new RegExp(/^([IMXYNSR])(\d{8})-(\d{4})$/); + var patternbuildType = new RegExp(/^([IMXYNSRU])(\d{8})-(\d{4})$/); var sArraybuildType = patternbuildType.exec(buildId); // sArray 0 is "whole match" diff --git a/production/sdk/promotion/startTests.sh b/production/sdk/promotion/startTests.sh index d3393593d..30d0d2654 100755 --- a/production/sdk/promotion/startTests.sh +++ b/production/sdk/promotion/startTests.sh @@ -90,7 +90,7 @@ else exit 1 fi -if [[ "${buildId}" =~ ([MNIXYP]+)([[:digit:]]*)\-([[:digit:]]*) ]] +if [[ "${buildId}" =~ ([MNIXYPU]+)([[:digit:]]*)\-([[:digit:]]*) ]] then # old, simpler way, if we don't do regex and input checking #buildType=${buildId:0:1} diff --git a/production/sdk/promotion/syncDropLocation.sh b/production/sdk/promotion/syncDropLocation.sh index 2f7044686..ed3147c7a 100755 --- a/production/sdk/promotion/syncDropLocation.sh +++ b/production/sdk/promotion/syncDropLocation.sh @@ -155,7 +155,7 @@ function sendPromoteMail () fi # Do not include Equinox, if build failed, or if patch or experimental build - if [[ -z "${BUILD_FAILED}" && ! "${buildType}" =~ [PYX] ]] + if [[ -z "${BUILD_FAILED}" && ! "${buildType}" =~ [PYXU] ]] then link=$(linkURL http://${SITE_HOST}/equinox/drops/${buildId}) message1="${message1}<p>Equinox downloads: <br />\n ${link}</p>\n" diff --git a/production/sdk/promotion/syncUpdateUtils.shsource b/production/sdk/promotion/syncUpdateUtils.shsource index d9894928f..c6226ac22 100644 --- a/production/sdk/promotion/syncUpdateUtils.shsource +++ b/production/sdk/promotion/syncUpdateUtils.shsource @@ -378,12 +378,15 @@ function setToAndFromAddresses () # override 'TO' in localBuildProperties.shsource if doing local tests # for initial testing, only to me -- change as desired after initial testing. -if [[ "${buildType}" =~ [PYX] ]] +if [[ "${buildType}" =~ [PYXU] ]] then case "${buildType}" in "P" ) export TO=${TO:-"sravankumarl@in.ibm.com,jdt-core-dev@eclipse.org"} export SUBJECT="Patch Build: ${SUBJECT}" ;; + "U" ) + export TO=${TO:-"sravankumarl@in.ibm.com,noopur_gupta@in.ibm.com,jdt-ui-dev@eclipse.org"} + export SUBJECT="Branch SDK Build: ${SUBJECT}" ;; "Y" ) export TO=${TO:-"sravankumarl@in.ibm.com,jdt-core-dev@eclipse.org"} export SUBJECT="Branch SDK Build: ${SUBJECT}" ;; diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml index e179414ec..73d0802dc 100644 --- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml +++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml @@ -537,16 +537,16 @@ --> <condition property="buildIdOK"> <matches - pattern="^[IMXYNPSR]\d{8}-\d{4}$" + pattern="^[IMXYNPSRU]\d{8}-\d{4}$" string="${buildId}" /> </condition> <fail - message="buildId variable had unexpected format. Should be of the form [IMXYNPSR] 8 digits '-' 4 digits, but was ${buildId}" + message="buildId variable had unexpected format. Should be of the form [IMXYNPSRU] 8 digits '-' 4 digits, but was ${buildId}" unless="buildIdOK" /> <script language="javascript"><![CDATA[ var buildId = project.getProperty("buildId"); - var pattern = new RegExp(/^([IMXYNPSR])(\d{8})-(\d{4})$/); + var pattern = new RegExp(/^([IMXYNPSRU])(\d{8})-(\d{4})$/); var sArray = pattern.exec(buildId); // sArray 0 is "whole match" diff --git a/production/testScripts/genTestIndexes.xml b/production/testScripts/genTestIndexes.xml index 04d25022e..cf41c37bc 100644 --- a/production/testScripts/genTestIndexes.xml +++ b/production/testScripts/genTestIndexes.xml @@ -18,7 +18,7 @@ <script language="javascript"> <![CDATA[ var buildId = project.getProperty("buildId"); - var pattern = new RegExp(/^([IMXYPNSR])(\d{8})-(\d{4})$/); + var pattern = new RegExp(/^([IMXYPNSRU])(\d{8})-(\d{4})$/); var sArray = pattern.exec(buildId); // sArray 0 is "whole match" diff --git a/production/testScripts/invokeTestsJSON.xml b/production/testScripts/invokeTestsJSON.xml index f6f5782bf..9a3e8cd12 100644 --- a/production/testScripts/invokeTestsJSON.xml +++ b/production/testScripts/invokeTestsJSON.xml @@ -426,7 +426,7 @@ <script language="javascript"> <![CDATA[ var buildId = project.getProperty("buildId"); - var pattern = new RegExp(/^([IMXYPNSR])(\d{8})-(\d{4})$/); + var pattern = new RegExp(/^([IMXYPNSRU])(\d{8})-(\d{4})$/); var sArray = pattern.exec(buildId); // sArray 0 is "whole match" diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml index 6294cfa48..ed5ec3806 100644 --- a/production/testScripts/runTests2.xml +++ b/production/testScripts/runTests2.xml @@ -780,17 +780,17 @@ for now, loosen in future if we start to find/have variety --> <condition property="buildIdOK"> <matches - pattern="^[IMXYNPSR]\d{8}-\d{4}$" + pattern="^[IMXYNPSRU]\d{8}-\d{4}$" string="${buildId}" /> </condition> <fail - message="buildId variable had unexpected format. Should be of the form [IMXYNPSR] 8 digits '-' 4 digits, but was ${buildId}" + message="buildId variable had unexpected format. Should be of the form [IMXYNPSRU] 8 digits '-' 4 digits, but was ${buildId}" unless="buildIdOK" /> <script language="javascript"> <![CDATA[ var buildId = project.getProperty("buildId"); - var pattern = new RegExp(/^([IMXYNPSR])(\d{8})-(\d{4})$/); + var pattern = new RegExp(/^([IMXYNPSRU])(\d{8})-(\d{4})$/); var sArray = pattern.exec(buildId); // sArray 0 is "whole match" diff --git a/production/testScripts/startTests.sh b/production/testScripts/startTests.sh index d29c63532..57116e2c2 100755 --- a/production/testScripts/startTests.sh +++ b/production/testScripts/startTests.sh @@ -91,7 +91,7 @@ else exit 1 fi -if [[ "${buildId}" =~ ([MNIXYP]+)([[:digit:]]*)\-([[:digit:]]*) ]] +if [[ "${buildId}" =~ ([MNIXYPU]+)([[:digit:]]*)\-([[:digit:]]*) ]] then # old, simpler way, if we don't do regex and input checking #buildType=${buildId:0:1} |