gitlab-qa 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55a7f55cf9ae0ed256e9471c8f0339891efd0ff8
-  data.tar.gz: 7d0a29fc73eebbfd0664a682bfc964429fe3c25c
+  metadata.gz: b0ad531bf801a69e5e18a9df200d92235791d228
+  data.tar.gz: da43c04b1a583bede10237208f3c44df8000413a
 SHA512:
-  metadata.gz: 83348ec223aed07efecbf57e30bb9a7987a13dcb1cc317e426c7dd0ecba303a24388e6885409d8753ff4871e21ab8a62018684035ff6c2c9f04e768209dfd66f
-  data.tar.gz: c4b4bcdfb0c9521cae38da8a594e664e6f8d77169fe9408346c178951fe1afb0e15e4244a5a71f9204e0b6818af8c440c7396b8497a47fc3e06daaa904c39652
+  metadata.gz: 55271d4161762055138ace63cef2aa27d481e56017253516d1c3d2719c540d715ff32541268bbd8d6ac80ce5aca0477c2be1c496035ef909aad28c4cf05acf08
+  data.tar.gz: 494d2e9284a7bd9a2053482bd055ede19579be96325fa83ca011977019ff328458f55541ddb2895163de0ae74af83633144eede41c5eb80905236626e3b4748d

data/.gitlab-ci.yml

@@ -41,7 +41,7 @@ check:rspec:
     when: on_failure
     expire_in: 30d
     paths:
-      - tmp/*.png
+      - /tmp/gitlab-qa-screenshots/*.png
 
 ce:instance:
   script: bin/qa Test::Instance::Image CE

data/lib/gitlab/qa/docker/gitlab.rb

@@ -21,10 +21,6 @@ module Gitlab
           @name = "#{name}-#{SecureRandom.hex(4)}"
         end
 
-        def ee?
-          @release == :ee
-        end
-
         def address
           "http://#{hostname}"
         end

data/lib/gitlab/qa/docker/specs.rb

@@ -6,25 +6,36 @@ module Gitlab
 
         IMAGE_NAME = 'gitlab/gitlab-qa'.freeze
 
-        attr_accessor :env
+        ENVS = %w(GITLAB_USERNAME GITLAB_PASSWORD
+                  GITLAB_URL EE_LICENSE).freeze
 
         def initialize
           @docker = Docker::Engine.new
         end
 
-        # rubocop:disable Metrics/AbcSize
-        #
         def test(gitlab)
-          tag = "#{gitlab.release}-#{gitlab.tag}"
-          args = ['Test::Instance', gitlab.address]
+          test_address(gitlab.release, gitlab.tag, gitlab.address,
+                       "#{gitlab.name}-specs", gitlab.network)
+        end
 
+        # rubocop:disable Metrics/MethodLength
+        #
+        def test_address(release, tag, address, name = nil, network = nil)
           puts 'Running instance test scenarios for Gitlab ' \
-               "#{gitlab.release.upcase} at #{gitlab.address}"
+               "#{release.upcase} at #{address}"
+
+          args = ['Test::Instance', address]
+
+          @docker.run(IMAGE_NAME, "#{release}-#{tag}", *args) do |command|
+            command << %(-t --rm)
+            command << "--net=#{network}" if network
+
+            ENVS.each do |env|
+              command << %(-e #{env}="$#{env}") if ENV[env]
+            end
 
-          @docker.run(IMAGE_NAME, tag, *args) do |command|
-            command << "-t --rm --net #{gitlab.network}"
-            command << %(-e #{env}="$#{env}") if env
-            command << "--name #{gitlab.name}-specs"
+            command << '-v /tmp/gitlab-qa-screenshots:/home/qa/tmp/'
+            command << "--name #{name || ('gitlab-specs-' + Time.now.to_i)}"
           end
         end
       end

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

@@ -8,9 +8,9 @@ module Gitlab
           # including staging and on-premises installation.
           #
           class Any < Scenario::Template
-            def perform(address)
-              Spec::Image.perform do |specs|
-                specs.test(address)
+            def perform(release, tag, address)
+              Docker::Specs.perform do |instance|
+                instance.test_address(release, tag, address)
               end
             end
           end

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

@@ -28,7 +28,6 @@ module Gitlab
 
                 gitlab.instance do
                   Docker::Specs.perform do |instance|
-                    instance.env = 'EE_LICENSE' if gitlab.ee?
                     instance.test(gitlab)
                   end
                 end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '0.0.1'.freeze
+    VERSION = '0.1.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Integration tests for GitLab