aboutsummaryrefslogtreecommitdiff
path: root/tests/ci
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2018-09-05 21:23:41 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2018-09-08 17:44:57 +0300
commit70c1cdfd8f34472761fe5ec97f0713990c1b4f5b (patch)
treef2e631c10563bcc0cde07e4359c11b800a188d86 /tests/ci
parent3be834183ae36c321e4b560dce9a63cee846e63d (diff)
Add multi-tenancy support
Diffstat (limited to 'tests/ci')
-rw-r--r--tests/ci/ci-load.testscript13
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/ci/ci-load.testscript b/tests/ci/ci-load.testscript
index de23b79..c574a32 100644
--- a/tests/ci/ci-load.testscript
+++ b/tests/ci/ci-load.testscript
@@ -55,12 +55,14 @@
cat <<"EOI" >=$loader;
#!/usr/bin/env bash
- if [ "\$#" != 5 -o \
+ if [ "\$#" != 7 -o \
"\$1" != "--db-host=localhost" -o \
"\$2" != "--db-port=8432" -o \
"\$3" != "--force" -o \
"\$4" != "--shallow" -o \
- "\$5" != "$data_dir/loadtab" -o \
+ "\$5" != "--tenant" -o \
+ -z "\$6" -o \
+ "\$7" != "$data_dir/loadtab" -o \
! -f "$data_dir/cache/repositories.manifest" -o \
! -f "$data_dir/cache/packages.manifest" ]; then
exit 1
@@ -74,7 +76,7 @@
$clone_root_data;
- $* $loader --db-host=localhost --db-port=8432 $data_dir >>"EOO"
+ $* $loader --db-host=localhost --db-port=8432 $data_dir >>"EOO";
: 1
status: 200
message: CI request is queued
@@ -85,10 +87,11 @@
$* --result-url "http://example.com/" \
$loader --db-host=localhost --db-port=8432 \
- $data_dir >>"EOO"
+ $data_dir >>~"%EOO%"
: 1
status: 200
- message: CI request is queued: http://example.com
+ %message: CI request is queued: http://example.com/@.+%
+ %.
reference: $request_id
EOO
}