Skip to content

Commit

Permalink
Fix response code for nonexistent attachment
Browse files Browse the repository at this point in the history
  • Loading branch information
@noahshaw11
noahshaw11 committed Jul 19, 2021
1 parent e580d71 commit 8052a97
Show file tree
Hide file tree
Showing 55 changed files with 1,354 additions and 301 deletions.
136 changes: 89 additions & 47 deletions build-aux/Jenkinsfile.full
View file
Expand Up @@ -558,54 +558,96 @@ pipeline {
} // post
} // stage

/*
- Removed 2020.09.15 - VMs are offline
*/
stage('Debian Buster ppc64le') {
agent {
docker {
image 'apache/couchdbci-debian:ppc64le-buster-erlang-20.3.8.26-1'
label 'ppc64le'
args "${DOCKER_ARGS}"
registryUrl 'https://docker.io/'
registryCredentialsId 'dockerhub_creds'
}
}
environment {
platform = 'buster'
sm_ver = '60'
}
stages {
stage('Build from tarball & test') {
steps {
unstash 'tarball'
sh( script: build_and_test )
}
post {
always {
junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml, **/src/mango/nosetests.xml, **/test/javascript/junit.xml'
}
}
}
stage('Build CouchDB packages') {
steps {
sh( script: make_packages )
sh( script: cleanup_and_save )
}
post {
success {
archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
}
}
}
} // stages
post {
cleanup {
sh 'rm -rf ${WORKSPACE}/*'
}
} // post
} // stage

// stage('Debian Buster s390x') {
// agent {
// docker {
// image 'apache/couchdbci-debian:s390x-buster-erlang-20.3.8.26-1'
// label 's390x'
// args "${DOCKER_ARGS}"
// registryUrl 'https://docker.io/'
// registryCredentialsId 'dockerhub_creds'
// }
// }
// environment {
// platform = 'buster'
// sm_ver = '60'
// }
// stages {
// stage('Build from tarball & test') {
// steps {
// unstash 'tarball'
// sh( script: build_and_test )
// }
// post {
// always {
// junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml, **/src/mango/nosetests.xml, **/test/javascript/junit.xml'
// }
// }
// }
// stage('Build CouchDB packages') {
// steps {
// sh( script: make_packages )
// sh( script: cleanup_and_save )
// }
// post {
// success {
// archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
// }
// }
// }
// } // stages
// post {
// cleanup {
// sh 'rm -rf ${WORKSPACE}/*'
// }
// } // post
// } // stage

// stage('Debian Buster ppc64le') {
// agent {
// docker {
// image 'apache/couchdbci-debian:ppc64le-buster-erlang-20.3.8.26-1'
// label 'ppc64le'
// args "${DOCKER_ARGS}"
// registryUrl 'https://docker.io/'
// registryCredentialsId 'dockerhub_creds'
// }
// }
// environment {
// platform = 'buster'
// sm_ver = '60'
// }
// stages {
// stage('Build from tarball & test') {
// steps {
// unstash 'tarball'
// sh( script: build_and_test )
// }
// post {
// always {
// junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml, **/src/mango/nosetests.xml, **/test/javascript/junit.xml'
// }
// }
// }
// stage('Build CouchDB packages') {
// steps {
// sh( script: make_packages )
// sh( script: cleanup_and_save )
// }
// post {
// success {
// archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
// }
// }
// }
// } // stages
// post {
// cleanup {
// sh 'rm -rf ${WORKSPACE}/*'
// }
// } // post
// } // stage

/*
* Example of how to do a qemu-based run, please leave here
Expand Down
1 change: 1 addition & 0 deletions configure
View file
Expand Up @@ -202,6 +202,7 @@ cat > rel/couchdb.config << EOF
{node_name, "-name couchdb@127.0.0.1"}.
{cluster_port, 5984}.
{backend_port, 5986}.
{prometheus_port, 17986}.
EOF

cat > install.mk << EOF
Expand Down
11 changes: 9 additions & 2 deletions dev/run
View file
Expand Up @@ -280,7 +280,9 @@ def check_boot_script(ctx):
@log("Prepare configuration files")
def setup_configs(ctx):
for idx, node in enumerate(ctx["nodes"]):
cluster_port, backend_port = get_ports(ctx, idx + ctx["node_number"])
cluster_port, backend_port, prometheus_port = get_ports(
ctx, idx + ctx["node_number"]
)
env = {
"prefix": toposixpath(ctx["rootdir"]),
"package_author_name": "The Apache Software Foundation",
Expand All @@ -293,6 +295,7 @@ def setup_configs(ctx):
"node_name": "-name %s@127.0.0.1" % node,
"cluster_port": cluster_port,
"backend_port": backend_port,
"prometheus_port": prometheus_port,
"uuid": "fake_uuid_for_dev",
"_default": "",
}
Expand Down Expand Up @@ -353,7 +356,11 @@ def apply_config_overrides(ctx, content):
def get_ports(ctx, idnode):
assert idnode
if idnode <= 5 and not ctx["auto_ports"]:
return ((10000 * idnode) + 5984, (10000 * idnode) + 5986)
return (
(10000 * idnode) + 5984,
(10000 * idnode) + 5986,
(10000 * idnode) + 7986,
)
else:
return tuple(get_available_ports(2))

Expand Down
12 changes: 6 additions & 6 deletions rebar.config.script
View file
Expand Up @@ -27,7 +27,6 @@ end.
VerList = lists:map(fun(X) -> {Int, _} = string:to_integer(X), Int end,
string:tokens(VerString, ".")).


DisplayMsg = fun(Msg, Args) ->
Base = iolist_to_binary(io_lib:format(Msg, Args)),
Lines = binary:split(Base, <<"\n">>, [global]),
Expand Down Expand Up @@ -140,12 +139,13 @@ SubDirs = [
"src/setup",
"src/smoosh",
"src/weatherreport",
"src/couch_prometheus",
"rel"
].

DepDescs = [
%% Independent Apps
{config, "config", {tag, "2.1.8"}},
{config, "config", {tag, "2.1.9"}},
{b64url, "b64url", {tag, "1.0.2"}},
{ets_lru, "ets-lru", {tag, "1.1.0"}},
{khash, "khash", {tag, "1.1.0"}},
Expand All @@ -159,9 +159,9 @@ DepDescs = [
%% Third party deps
{folsom, "folsom", {tag, "CouchDB-0.8.4"}},
{hyper, "hyper", {tag, "CouchDB-2.2.0-7"}},
{ibrowse, "ibrowse", {tag, "CouchDB-4.4.2-3"}},
{ibrowse, "ibrowse", {tag, "CouchDB-4.4.2-5"}},
{jiffy, "jiffy", {tag, "CouchDB-1.0.5-1"}},
{mochiweb, "mochiweb", {tag, "v2.20.0"}},
{mochiweb, "mochiweb", {tag, "v2.21.0"}},
{meck, "meck", {tag, "0.9.2"}},
{recon, "recon", {tag, "2.5.0"}}
].
Expand Down Expand Up @@ -196,12 +196,12 @@ ErlOpts = case os:getenv("ERL_OPTS") of
end.

AddConfig = [
{require_otp_vsn, "19|20|21|22|23|24"},
{require_otp_vsn, "20|21|22|23|24"},
{deps_dir, "src"},
{deps, lists:map(MakeDep, DepDescs ++ OptionalDeps)},
{sub_dirs, SubDirs},
{lib_dirs, ["src"]},
{erl_opts, [{i, "../"}] ++ ErlOpts},
{erl_opts, [{i, "../"}] ++ [{d, 'COUCHDB_ERLANG_VERSION', VerString}] ++ ErlOpts},
{eunit_opts, [verbose, {report,{eunit_surefire,[{dir,"."}]}}]},
{plugins, [eunit_plugin]},
{dialyzer, [
Expand Down

0 comments on commit 8052a97

Please sign in to comment.