From eff552d9bd39e25fae2e75e6febeb1d3ab0e18ba Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 9 Mar 2017 15:16:03 +0100 Subject: [PATCH] [ci] Remove ppc64el checks from run-test-default.sh This was initially done so we didn't get orange builds when ppc64el was in the same job as our other archs. ppc64el was since moved into a separate job so we can stop skipping the test suites. Also fixed badges in README.md for ppc64el and s390x --- README.md | 7 +++++-- scripts/ci/run-test-default.sh | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c530d4a18bb..87b01137506 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ The Mono project is part of the [.NET Foundation](http://www.dotnetfoundation.or | Windows | amd64 | [![windows-amd64][15]][16] | | Windows | i386 | [![windows-amd64][17]][18] | | CentOS | s390x (cs) | [![centos-s390x][19]][20] | +| Debian 8 | ppc64el (cs) | [![debian-8-ppc64el][21]][22]| _(cs) = community supported architecture_ @@ -50,8 +51,10 @@ _(cs) = community supported architecture_ [16]: https://jenkins.mono-project.com/job/z/label=w64/ [17]: https://jenkins.mono-project.com/job/z/label=w32/badge/icon [18]: https://jenkins.mono-project.com/job/z/label=w32/ -[19]: https://jenkins.mono-project.com/job/z/label=centos-s390x/badge/icon -[20]: https://jenkins.mono-project.com/job/z/label=centos-s390x +[19]: https://jenkins.mono-project.com/job/test-mono-mainline-community/label=centos-s390x/badge/icon +[20]: https://jenkins.mono-project.com/job/test-mono-mainline-community/label=centos-s390x +[21]: https://jenkins.mono-project.com/job/test-mono-mainline-community-chroot/label=debian-8-ppc64el/badge/icon +[22]: https://jenkins.mono-project.com/job/test-mono-mainline-community-chroot/label=debian-8-ppc64el Compilation and Installation ============================ diff --git a/scripts/ci/run-test-default.sh b/scripts/ci/run-test-default.sh index 10184928fde..2e7c807d924 100755 --- a/scripts/ci/run-test-default.sh +++ b/scripts/ci/run-test-default.sh @@ -8,14 +8,14 @@ fi ${TESTCMD} --label=compile-runtime-tests --timeout=40m make -w -C mono/tests -j4 tests ${TESTCMD} --label=runtime --timeout=160m make -w -C mono/tests -k test-wrench V=1 CI=1 CI_PR=${ghprbPullId} ${TESTCMD} --label=runtime-unit-tests --timeout=5m make -w -C mono/unit-tests -k check -if [[ ${label} == 'debian-8-ppc64el' ]]; then ${TESTCMD} --label=corlib --skip; else ${TESTCMD} --label=corlib --timeout=30m make -w -C mcs/class/corlib run-test; fi +${TESTCMD} --label=corlib --timeout=30m make -w -C mcs/class/corlib run-test ${TESTCMD} --label=verify --timeout=15m make -w -C runtime mcs-compileall ${TESTCMD} --label=profiler --timeout=30m make -w -C mono/profiler -k check ${TESTCMD} --label=compiler --timeout=30m make -w -C mcs/tests run-test ${TESTCMD} --label=compiler-errors --timeout=30m make -w -C mcs/errors run-test ${TESTCMD} --label=System --timeout=10m bash -c "export MONO_TLS_PROVIDER=legacy && make -w -C mcs/class/System run-test" if [[ ${label} == osx-* ]]; then ${TESTCMD} --label=System-btls --timeout=10m bash -c "export MONO_TLS_PROVIDER=btls && make -w -C mcs/class/System run-test"; fi -if [[ ${label} == 'debian-8-ppc64el' ]]; then ${TESTCMD} --label=System.XML --skip; else ${TESTCMD} --label=System.XML --timeout=5m make -w -C mcs/class/System.XML run-test; fi +${TESTCMD} --label=System.XML --timeout=5m make -w -C mcs/class/System.XML run-test ${TESTCMD} --label=Mono.Security --timeout=5m make -w -C mcs/class/Mono.Security run-test ${TESTCMD} --label=System.Security --timeout=5m make -w -C mcs/class/System.Security run-test if [[ ${label} == w* ]] @@ -55,7 +55,7 @@ ${TESTCMD} --label=System.Configuration --timeout=5m make -w -C mcs/class/System ${TESTCMD} --label=System.Transactions --timeout=5m make -w -C mcs/class/System.Transactions run-test ${TESTCMD} --label=System.Web.Extensions --timeout=5m make -w -C mcs/class/System.Web.Extensions run-test ${TESTCMD} --label=System.Core --timeout=15m make -w -C mcs/class/System.Core run-test -if [[ ${label} == w* || ${label} == 'debian-8-ppc64el' ]]; then ${TESTCMD} --label=symbolicate --skip; else ${TESTCMD} --label=symbolicate --timeout=60m make -w -C mcs/tools/mono-symbolicate check; fi +if [[ ${label} == w* ]]; then ${TESTCMD} --label=symbolicate --skip; else ${TESTCMD} --label=symbolicate --timeout=60m make -w -C mcs/tools/mono-symbolicate check; fi ${TESTCMD} --label=System.Xml.Linq --timeout=5m make -w -C mcs/class/System.Xml.Linq run-test ${TESTCMD} --label=System.Data.DSE --timeout=5m make -w -C mcs/class/System.Data.DataSetExtensions run-test ${TESTCMD} --label=System.Web.Abstractions --timeout=5m make -w -C mcs/class/System.Web.Abstractions run-test @@ -79,7 +79,7 @@ ${TESTCMD} --label=System.Xaml --timeout=5m make -w -C mcs/class/System.Xaml run ${TESTCMD} --label=System.Net.Http --timeout=5m make -w -C mcs/class/System.Net.Http run-test ${TESTCMD} --label=System.Json --timeout=5m make -w -C mcs/class/System.Json run-test ${TESTCMD} --label=System.Threading.Tasks.Dataflow --timeout=5m make -w -C mcs/class/System.Threading.Tasks.Dataflow run-test -if [[ ${label} == 'debian-8-ppc64el' ]]; then ${TESTCMD} --label=Mono.Debugger.Soft --skip; else ${TESTCMD} --label=Mono.Debugger.Soft --timeout=5m make -w -C mcs/class/Mono.Debugger.Soft run-test; fi +${TESTCMD} --label=Mono.Debugger.Soft --timeout=5m make -w -C mcs/class/Mono.Debugger.Soft run-test ${TESTCMD} --label=Microsoft.Build --timeout=5m make -w -C mcs/class/Microsoft.Build run-test ${TESTCMD} --label=monodoc --timeout=10m make -w -C mcs/tools/mdoc run-test ${TESTCMD} --label=Microsoft.Build-12 --timeout=10m make -w -C mcs/class/Microsoft.Build run-test PROFILE=xbuild_12 -- 2.25.1