gitlab-qa 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb5796aeaa95713a634a57f5f2a3975925f5c650
-  data.tar.gz: f3741401f66e6fa5c721fb0267d9f81363ea9111
+  metadata.gz: 8097807f4d1b16c09a377ae8cee10c9bf458d041
+  data.tar.gz: 8833864a7c92cf584bd413b505100e8032b2e7bb
 SHA512:
-  metadata.gz: adf3181a32f706baf8bcfc3867eb3147eea9d9b3e173687f00586d9e32d2610b1ccc90e5e62889b4ddec824b40e6a7423691772ad68d199a848560001023f78a
-  data.tar.gz: 35a214fa0a4797dd4cc14750aae925d63c75ddb02cdba19f2c118d147fa32abc4f27cf21521fa0ad3a721c892fffd83fdea7ec49e8d33f278704e1f4996f39cf
+  metadata.gz: b83456d9d1321d56b823ec39043555230d5dae561333b5fe5c23e43dfe498747fbeffa784e3e16849f611c8ceae63a539bc5a9acb41ee066318a403d3cadb5e9
+  data.tar.gz: 28eeb29cbc82b311ef0a262913cd49b0db5832daf012d11c6204f2af8487ab3f4c5c8fa58e8ede38fc905747b783ee0d19850043e1a099d1de7299a82b0474c8

data/README.md

@@ -23,16 +23,52 @@ command in your system.
 
 1. Run tests against a Docker image with GitLab:
 
-    `gitlab-qa Test::Instance::Image CE|EE`
+    `gitlab-qa Test::Instance::Image CE|EE|<full image address>`
 
 1. Test upgrade process:
 
-    `gitlab-qa Test::Omnibus::Upgrade CE|EE`
+    `gitlab-qa Test::Omnibus::Upgrade CE|EE|<full image address>`
 
 1. Run tests against any existing instance:
 
     `gitlab-qa Test::Instance::Any CE|EE nightly|latest http://your.instance.gitlab`
 
+## How does it work?
+
+GitLab QA handles a few scenarios:
+
+### `Test::Omnibus::Image CE|EE|<full image address>`
+
+This scenario only tests that a GitLab Docker container can be run.
+
+This spins up a GitLab Docker container based on the given edition or image:
+  - `gitlab/gitlab-ce:nightly` for `CE`
+  - `gitlab/gitlab-ee:nightly` for `EE`
+  - the given custom image for `<full image address>`
+
+### `Test::Omnibus::Upgrade CE|EE|<full image address>`
+
+This scenario tests that:
+
+- the GitLab Docker container works as expected by running tests against it (see
+  `Test::Instance::Image` below)
+- that it can be upgraded to a new (`nightly` or custom image) container
+- that the new GitLab container still works as expected
+
+### `Test::Instance::Image CE|EE|<full image address>`
+
+This scenario tests that the GitLab Docker container works as expected by
+running tests against it.
+
+To run tests against the GitLab containers, a GitLab QA (`gitlab/gitlab-qa`)
+container is spin up and tests are run from it by running the `Test::Instance`
+scenario (located under `qa/scenario/test/instance` in the GitLab codebase).
+
+### `Test::Instance::Any CE|EE|<full image address>`
+
+This scenario tests that the any GitLab instance works as expected by running
+tests against it (see `Test::Instance::Image` below).
+
 ## Supported environment variables
 
 * `GITLAB_USERNAME` - username to use when signing in to GitLab

data/lib/gitlab/qa/scenario/test/instance/image.rb

@@ -17,7 +17,7 @@ module Gitlab
                 gitlab.release = release
                 gitlab.name = "gitlab-qa-#{gitlab.release.edition}"
                 gitlab.image = gitlab.release.image
-                gitlab.tag = gitlab.release.tag
+                gitlab.tag = @tag || gitlab.release.tag
                 gitlab.volumes = @volumes
                 gitlab.network = 'test'
 

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '0.2.1'.freeze
+    VERSION = '0.2.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-29 00:00:00.000000000 Z
+date: 2017-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler