Merge branch 'qa-allow-setting-sandbox-group' into 'master'

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/

qa/qa/runtime/env.rb

@@ -16,6 +16,18 @@ module QA
       def personal_access_token
         ENV['PERSONAL_ACCESS_TOKEN']
       end
+
+      def user_username
+        ENV['GITLAB_USERNAME']
+      end
+
+      def user_password
+        ENV['GITLAB_PASSWORD']
+      end
+
+      def sandbox_name
+        ENV['GITLAB_SANDBOX_NAME']
+      end
     end
   end
 end

qa/qa/runtime/namespace.rb

@@ -16,7 +16,7 @@ module QA
       end
 
       def sandbox_name
-        'gitlab-qa-sandbox'
+        Runtime::Env.sandbox_name || 'gitlab-qa-sandbox'
       end
     end
   end

qa/qa/runtime/user.rb

@@ -4,11 +4,11 @@ module QA
       extend self
 
       def name
-        ENV['GITLAB_USERNAME'] || 'root'
+        Runtime::Env.user_username || 'root'
       end
 
       def password
-        ENV['GITLAB_PASSWORD'] || '5iveL!fe'
+        Runtime::Env.user_password || '5iveL!fe'
       end
     end
   end