gitlab-qa 0.2.2 → 0.3.0

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

@@ -8,9 +8,13 @@ module Gitlab
           # including staging and on-premises installation.
           #
           class Any < Scenario::Template
-            def perform(release, tag, address)
-              Docker::Specs.perform do |instance|
-                instance.test_address(release, tag, address)
+            def perform(edition, tag, address)
+              release = Release.new(edition).tap do |r|
+                r.tag = tag
+              end
+
+              Component::Specs.perform do |instance|
+                instance.test_address(release: release, address: address)
               end
             end
           end

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

@@ -4,26 +4,21 @@ module Gitlab
       module Test
         module Instance
           class Image < Scenario::Template
-            attr_writer :tag, :volumes
+            attr_writer :volumes
 
             def initialize
               @volumes = {}
             end
 
-            # rubocop:disable Metrics/MethodLength
-            #
             def perform(release)
-              Docker::Gitlab.perform do |gitlab|
+              Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
-                gitlab.name = "gitlab-qa-#{gitlab.release.edition}"
-                gitlab.image = gitlab.release.image
-                gitlab.tag = @tag || gitlab.release.tag
                 gitlab.volumes = @volumes
                 gitlab.network = 'test'
 
                 gitlab.instance do
-                  Docker::Specs.perform do |instance|
-                    instance.test(gitlab)
+                  Component::Specs.perform do |instance|
+                    instance.test(gitlab: gitlab)
                   end
                 end
               end

data/lib/gitlab/qa/scenario/test/integration/mattermost.rb

@@ -0,0 +1,35 @@
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Integration
+          class Mattermost < Scenario::Template
+            # rubocop:disable Metrics/MethodLength
+            def perform(release)
+              Component::Gitlab.perform do |gitlab|
+                gitlab.release = release
+                gitlab.network = 'test'
+
+                mattermost_hostname = "mattermost.#{gitlab.network}"
+                mattermost_external_url = "http://#{mattermost_hostname}"
+                gitlab.omnibus_config =
+                  "mattermost_external_url '#{mattermost_external_url}'"
+                gitlab.network_aliases = [mattermost_hostname]
+
+                gitlab.instance do
+                  Component::Specs.perform do |instance|
+                    instance.test(
+                      gitlab: gitlab,
+                      suite: 'Test::Integration::Mattermost',
+                      extra_args: [mattermost_external_url]
+                    )
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -5,16 +5,12 @@ module Gitlab
         module Omnibus
           class Image < Scenario::Template
             # rubocop:disable Style/Semicolon
-            # rubocop:disable Metrics/MethodLength
             def perform(release)
-              Docker::Gitlab.perform do |instance|
-                instance.release = release
-                instance.name = "gitlab-qa-#{instance.release.edition}"
-                instance.image = instance.release.image
-                instance.tag = instance.release.tag
-                instance.network = 'bridge'
+              Component::Gitlab.perform do |gitlab|
+                gitlab.release = release
+                gitlab.network = 'bridge'
 
-                instance.act do
+                gitlab.act do
                   prepare; start; reconfigure
                   restart; wait; teardown
                 end

data/lib/gitlab/qa/scenario/test/omnibus/upgrade.rb

@@ -12,16 +12,18 @@ module Gitlab
                         'data' => '/var/opt/gitlab' }.freeze
 
             # rubocop:disable Metrics/MethodLength
-            def perform(release)
+            #
+            def perform(next_release)
+              next_release = Release.new(next_release)
+
               with_temporary_volumes do |volumes|
                 Scenario::Test::Instance::Image
-                  .perform(Release.new(release).edition) do |scenario|
-                  scenario.tag = 'latest'
+                  .perform(next_release.previous_stable) do |scenario|
                   scenario.volumes = volumes
                 end
 
                 Scenario::Test::Instance::Image
-                  .perform(release) do |scenario|
+                  .perform(next_release) do |scenario|
                   scenario.volumes = volumes
                 end
               end

data/lib/gitlab/qa/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-30 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,16 +106,18 @@ files:
 - exe/gitlab-qa
 - gitlab-qa.gemspec
 - lib/gitlab/qa.rb
+- lib/gitlab/qa/component/gitlab.rb
+- lib/gitlab/qa/component/specs.rb
 - lib/gitlab/qa/docker/command.rb
 - lib/gitlab/qa/docker/engine.rb
-- lib/gitlab/qa/docker/gitlab.rb
-- lib/gitlab/qa/docker/specs.rb
+- lib/gitlab/qa/docker/shellout.rb
 - lib/gitlab/qa/release.rb
 - lib/gitlab/qa/runtime/env.rb
 - lib/gitlab/qa/scenario/actable.rb
 - lib/gitlab/qa/scenario/template.rb
 - lib/gitlab/qa/scenario/test/instance/any.rb
 - lib/gitlab/qa/scenario/test/instance/image.rb
+- lib/gitlab/qa/scenario/test/integration/mattermost.rb
 - lib/gitlab/qa/scenario/test/omnibus/image.rb
 - lib/gitlab/qa/scenario/test/omnibus/upgrade.rb
 - lib/gitlab/qa/version.rb

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

@@ -1,40 +0,0 @@
-module Gitlab
-  module QA
-    module Docker
-      class Specs
-        include Scenario::Actable
-
-        IMAGE_NAME = 'gitlab/gitlab-qa'.freeze
-
-        def initialize
-          @docker = Docker::Engine.new
-        end
-
-        def test(gitlab)
-          test_address(gitlab.release.edition, gitlab.tag, gitlab.address,
-                       "#{gitlab.name}-specs", gitlab.network)
-        end
-
-        # rubocop:disable Metrics/MethodLength
-        #
-        def test_address(edition, tag, address, name = nil, network = nil)
-          puts 'Running instance test scenarios for Gitlab ' \
-               "#{edition.upcase} at #{address}"
-
-          args = ['Test::Instance', address]
-
-          @docker.run(IMAGE_NAME, "#{edition}-#{tag}", *args) do |command|
-            command << "-t --rm --net=#{network || 'bridge'}"
-
-            Runtime::Env.delegated.each do |env|
-              command << %(-e #{env}="$#{env}") if ENV[env]
-            end
-
-            command << "-v #{Runtime::Env.screenshots_dir}:/home/qa/tmp"
-            command << "--name #{name || ('gitlab-specs-' + Time.now.to_i)}"
-          end
-        end
-      end
-    end
-  end
-end