diff options
| author | Nick Vatamaniuc <vatamane@apache.org> | 2020-04-09 17:25:42 -0400 |
|---|---|---|
| committer | Nick Vatamaniuc <vatamane@apache.org> | 2020-04-09 18:01:56 -0400 |
| commit | ae772e89938b27b20d28ba659355458665d07ada (patch) | |
| tree | 639e9571a3ab60101ffa903803d4cf030275d918 | |
| parent | 56137f341e0fd22c7027a52b5c7e5eb1aa75aee0 (diff) | |
| download | couchdb-use-make-check-fdb-for-fdb.tar.gz | |
Make 'make check' run all the passing FDB tests on this branchuse-make-check-fdb-for-fdb
This will let CI gate PRs hopefully as we now have the necessary FDB server
bits installed in Jenkins.
Eventually when we can run all the tests revert to using `make check-all-tests`
as the default.
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | build-aux/Jenkinsfile.pr | 4 |
2 files changed, 8 insertions, 6 deletions
@@ -144,9 +144,11 @@ fauxton: share/www ################################################################################ -.PHONY: check +# When we can run all the tests with FDB switch this back to be the default +# "make check" command +.PHONY: check-all-tests # target: check - Test everything -check: all python-black +check-all-tests: all python-black @$(MAKE) eunit @$(MAKE) javascript @$(MAKE) mango-test @@ -158,8 +160,8 @@ else subdirs=$(shell ls src) endif -.PHONY: check-fdb -check-fdb: +.PHONY: check +check: all make eunit apps=couch_eval,couch_expiring_cache,ctrace,couch_jobs,couch_views,fabric,mango,chttpd make elixir tests=test/elixir/test/basics_test.exs,test/elixir/test/replication_test.exs,test/elixir/test/map_test.exs,test/elixir/test/all_docs_test.exs,test/elixir/test/bulk_docs_test.exs make exunit tests=src/couch_rate/test/exunit/ diff --git a/build-aux/Jenkinsfile.pr b/build-aux/Jenkinsfile.pr index 8c9cbd930..37dd2e55a 100644 --- a/build-aux/Jenkinsfile.pr +++ b/build-aux/Jenkinsfile.pr @@ -21,7 +21,7 @@ cd build tar -xf ${WORKSPACE}/apache-couchdb-*.tar.gz cd apache-couchdb-* . /usr/local/kerl/${KERL_VER}/activate -./configure --with-curl --spidermonkey-version 60 +./configure --with-curl make check || (make build-report && false) ''' @@ -56,7 +56,7 @@ pipeline { options { buildDiscarder(logRotator(numToKeepStr: '10', artifactNumToKeepStr: '10')) // This fails the build immediately if any parallel step fails - parallelsAlwaysFailFast() + // parallelsAlwaysFailFast() preserveStashes(buildCount: 10) timeout(time: 3, unit: 'HOURS') timestamps() |