You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ko...@apache.org on 2022/01/15 22:45:25 UTC
[couchdb] branch jenkins-bump-erlang-and-debian-versions updated (267883b -> 2a9758d)
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a change to branch jenkins-bump-erlang-and-debian-versions
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
discard 267883b Fix Elixir formatting
new 9b13780 Tweak Elixir formatting
new 2a9758d Break build/test stage into multiple steps
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (267883b)
\
N -- N -- N refs/heads/jenkins-bump-erlang-and-debian-versions (2a9758d)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build-aux/Jenkinsfile.full | 13 +++++++---
src/chttpd/test/exunit/pagination_test.exs | 39 ++++++++++++++++++++----------
2 files changed, 36 insertions(+), 16 deletions(-)
[couchdb] 01/02: Tweak Elixir formatting
Posted by ko...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a commit to branch jenkins-bump-erlang-and-debian-versions
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 9b13780e200da9faf7d4a7141bbe5d39175ae5c4
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Sat Jan 15 21:02:05 2022 +0000
Tweak Elixir formatting
It seems different versions of mix cannot agree on how these lines
ought to be formatted, so let's try to help out.
---
src/chttpd/test/exunit/pagination_test.exs | 61 +++++++++++++-----------------
1 file changed, 26 insertions(+), 35 deletions(-)
diff --git a/src/chttpd/test/exunit/pagination_test.exs b/src/chttpd/test/exunit/pagination_test.exs
index f071036..cd541dc 100644
--- a/src/chttpd/test/exunit/pagination_test.exs
+++ b/src/chttpd/test/exunit/pagination_test.exs
@@ -580,9 +580,8 @@ defmodule Couch.Test.Pagination do
for descending <- [false, true] do
for n <- [4, 9] do
- describe "Pagination API (10 docs) : _all_docs?page_size=#{n}&descending=#{
- descending
- }" do
+ describe "Pagination API (10 docs) : _all_docs" <>
+ "?page_size=#{n}&descending=#{descending}" do
@describetag n_docs: 10
@describetag descending: descending
@describetag page_size: n
@@ -613,9 +612,8 @@ defmodule Couch.Test.Pagination do
end
end
- describe "Pagination API (10 docs) : _all_docs?page_size=#{n}&descending=#{
- descending
- } : range" do
+ describe "Pagination API (10 docs) : _all_docs" <>
+ "?page_size=#{n}&descending=#{descending} : range" do
@describetag n_docs: 10
@describetag descending: descending
@describetag page_size: n
@@ -706,9 +704,8 @@ defmodule Couch.Test.Pagination do
for descending <- [false, true] do
for n <- [4, 9] do
- describe "Pagination API (10 docs) : _all_docs?page_size=#{n}&descending=#{
- descending
- } : pages" do
+ describe "Pagination API (10 docs) : _all_docs" <>
+ "?page_size=#{n}&descending=#{descending} : pages" do
@describetag n_docs: 10
@describetag descending: descending
@describetag page_size: n
@@ -752,7 +749,8 @@ defmodule Couch.Test.Pagination do
end
for n <- 10..11 do
- describe "Pagination API (10 docs) : _all_docs?page_size=#{n}" do
+ describe "Pagination API (10 docs) : _all_docs" <>
+ "?page_size=#{n}" do
@describetag n_docs: 10
@describetag descending: false
@describetag page_size: n
@@ -772,9 +770,8 @@ defmodule Couch.Test.Pagination do
for descending <- [false, true] do
for n <- [4, 9] do
- describe "Pagination API (10 docs) : _all_docs/queries?page_size=#{n}&descending=#{
- descending
- } : pages" do
+ describe "Pagination API (10 docs) : _all_docs/queries" <>
+ "?page_size=#{n}&descending=#{descending} : pages" do
@describetag n_docs: 10
@describetag descending: descending
@describetag page_size: n
@@ -908,9 +905,8 @@ defmodule Couch.Test.Pagination do
for descending <- [false, true] do
for n <- [4, 9] do
- describe "Pagination API (10 docs) : /{db}/_design/{ddoc}/_view?page_size=#{n}&descending=#{
- descending
- }" do
+ describe "Pagination API (10 docs) : /{db}/_design/{ddoc}/_view" <>
+ "?page_size=#{n}&descending=#{descending}" do
@describetag n_docs: 10
@describetag descending: descending
@describetag page_size: n
@@ -1015,7 +1011,8 @@ defmodule Couch.Test.Pagination do
end
for n <- 10..11 do
- describe "Pagination API (10 docs) : /{db}/_design/{ddoc}/_view?page_size=#{n}" do
+ describe "Pagination API (10 docs) : /{db}/_design/{ddoc}/_view" <>
+ "?page_size=#{n}" do
@describetag n_docs: 10
@describetag descending: false
@describetag page_size: n
@@ -1062,9 +1059,8 @@ defmodule Couch.Test.Pagination do
for descending <- [false, true] do
for n <- [4, 9] do
- describe "Pagination API (10 docs) : /{db}/_design/{ddoc}/_view/queries?page_size=#{
- n
- }&descending=#{descending} : pages" do
+ describe "Pagination API (10 docs) : /{db}/_design/{ddoc}/_view/queries" <>
+ "?page_size=#{n}&descending=#{descending} : pages" do
@describetag n_docs: 10
@describetag descending: descending
@describetag page_size: n
@@ -1224,14 +1220,12 @@ defmodule Couch.Test.Pagination do
expected_ids_order = :ascending
assert expected_key_order == ordering?(results, "key"),
- "expecting keys in #{expected_key_order} order, got: #{
- inspect(field(results, "key"))
- }"
+ "expecting keys in #{expected_key_order} order, " <>
+ "got: #{inspect(field(results, "key"))}"
assert expected_ids_order == ordering?(results, "id"),
- "expecting ids in #{expected_ids_order} order, got: #{
- inspect(field(results, "id"))
- }"
+ "expecting ids in #{expected_ids_order} order, " <>
+ "got: #{inspect(field(results, "id"))}"
results = List.flatten(limit_query)
[_descendiing_query, query] = ctx.queries[:queries]
@@ -1253,14 +1247,12 @@ defmodule Couch.Test.Pagination do
end
assert expected_key_order == ordering?(results, "key"),
- ~s(expecting keys in #{expected_key_order} order, got: #{
- inspect(field(results, "key"))
- })
+ "expecting keys in #{expected_key_order} order, " <>
+ "got: #{inspect(field(results, "key"))}"
assert expected_ids_order == ordering?(results, "id"),
- ~s(expecting keys in #{expected_ids_order} order, got: #{
- inspect(field(results, "id"))
- })
+ "expecting keys in #{expected_ids_order} order, " <>
+ "got: #{inspect(field(results, "id"))}"
_keys = Enum.map(results, &Map.get(&1, "key"))
end
@@ -1270,9 +1262,8 @@ defmodule Couch.Test.Pagination do
for descending <- [false, true] do
for n <- [4, 9] do
- describe "Pagination API (10 docs) : /{db}/_design/{ddoc}/_view/queries?page_size=#{
- n
- }&descending=#{descending} : pages with same key" do
+ describe "Pagination API (10 docs) : /{db}/_design/{ddoc}/_view/queries" <>
+ "?page_size=#{n}&descending=#{descending} : pages with same key" do
@describetag descending: descending
@describetag n_docs: 10
@describetag page_size: n
[couchdb] 02/02: Break build/test stage into multiple steps
Posted by ko...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a commit to branch jenkins-bump-erlang-and-debian-versions
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 2a9758dff5a44f8b0a6e5021489ab4de7c1325d7
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Sat Jan 15 17:43:53 2022 -0500
Break build/test stage into multiple steps
This should help with the debugging UX since the logging will be a bit
more focused, at the expense of not automatically inheriting any changes
to the "check" meta-target.
---
build-aux/Jenkinsfile.full | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 7a56312..323beaa 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -13,7 +13,7 @@
// License for the specific language governing permissions and limitations under
// the License.
-build_and_test = '''
+configure = '''
mkdir -p ${COUCHDB_IO_LOG_DIR} ${platform}
cd ${platform}
rm -rf build
@@ -22,7 +22,6 @@ cd build
tar -xf ${WORKSPACE}/apache-couchdb-*.tar.gz
cd apache-couchdb-*
./configure --spidermonkey-version ${sm_ver}
-make check || (make build-report && false)
'''
make_packages = '''
@@ -266,12 +265,20 @@ pipeline {
stage('Build from tarball & test') {
steps {
unstash 'tarball'
- sh( script: build_and_test )
+ sh( script: configure, label: 'unpack tarball and configure' )
+ sh 'make'
+ sh 'make eunit'
+ sh 'make elixir-suite'
+ sh 'make exunit'
+ sh 'make mango-test'
}
post {
always {
junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml, **/src/mango/nosetests.xml, **/test/javascript/junit.xml'
}
+ failure {
+ sh 'make build-report'
+ }
}
}