summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2018-02-08 22:34:56 +0800
committerLin Jen-Shin <godfat@godfat.org>2018-02-08 22:34:56 +0800
commit133b3f20fc60a9294eede7c4233c5272566e580e (patch)
tree1bb34342f8ec63f738be7752b9efac45a92fb520
parent828357fb828fc2d07b201f4f97f22ef964ab6a89 (diff)
downloadgitlab-ce-133b3f20fc60a9294eede7c4233c5272566e580e.tar.gz
Allow using a different sandbox group for QA
-rw-r--r--qa/README.md8
-rw-r--r--qa/qa/runtime/namespace.rb2
2 files changed, 9 insertions, 1 deletions
diff --git a/qa/README.md b/qa/README.md
index 3c1b61900d9..29720668251 100644
--- a/qa/README.md
+++ b/qa/README.md
@@ -70,6 +70,14 @@ If you need to authenticate as a different user, you can provide the
GITLAB_USERNAME=jsmith GITLAB_PASSWORD=password bin/qa Test::Instance https://gitlab.example.com
```
+If your user doesn't have permission to default sandbox group
+`gitlab-qa-sandbox`, you could also use another sandbox group by giving
+`GITLAB_SANDBOX_NAME`:
+
+```
+GITLAB_USERNAME=jsmith GITLAB_PASSWORD=password GITLAB_SANDBOX_NAME=jsmith-qa-sandbox bin/qa Test::Instance https://gitlab.example.com
+```
+
All [supported environment variables are here](https://gitlab.com/gitlab-org/gitlab-qa#supported-environment-variables).
[GDK]: https://gitlab.com/gitlab-org/gitlab-development-kit/
diff --git a/qa/qa/runtime/namespace.rb b/qa/qa/runtime/namespace.rb
index a72c2d21898..2ff5686c78d 100644
--- a/qa/qa/runtime/namespace.rb
+++ b/qa/qa/runtime/namespace.rb
@@ -16,7 +16,7 @@ module QA
end
def sandbox_name
- 'gitlab-qa-sandbox'
+ ENV['GITLAB_SANDBOX_NAME'] || 'gitlab-qa-sandbox'
end
end
end