gitlab-qa 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d83b347ec8981ab144775468b910e228caa43412
-  data.tar.gz: 7934fdefcdf098dd3191d3b5d18a235821d20211
+  metadata.gz: 32ba2e013021db66a5aa650661b9b84853494bb4
+  data.tar.gz: e46916c8c07a846e132713918c7cb27aaf0688dc
 SHA512:
-  metadata.gz: 56c3cff94ff316d86c7ad90005596cde353ba858d006640bd5a7b340790bd3a815c94067c3fd4db7c3ff1a2c4f9143636c8a1d7a1e865facd5a33a3e9590b678
-  data.tar.gz: 1691de3953e20cbb89b8d168e435fed51c23c69dd1c2d9430ab90863d8e20d4add63138f9f67286d791593bdbea0a7704d35c792414a23aaa3bf3225d8a7d43d
+  metadata.gz: c5c3a6a1b4eeffd67ef375c288217e2501371ae8c36f5bba98902f16e02893b5befc1b94fea238b34e2aeefd94411198c10481202df78c2cb7fd3f4a66365e8e
+  data.tar.gz: 69d51e22a352ed08f05ca2bd99adcc3ec59ccc3b32fde0c5cddd22f9b29ab19cf6ebe88d8eaea69bed34a02a420efbc5c98bc79c6b04fe7b2449b6eb557f3419

data/.gitlab-ci.yml

@@ -3,8 +3,8 @@ services:
 
 stages:
   - check
+  - sanity
   - test
-  - notify
 
 variables:
   TEST_IMAGE: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa
@@ -33,6 +33,24 @@ check:rspec:
   tags:
     - docker
 
+.sanity: &sanity
+  stage: sanity
+  image: $TEST_IMAGE
+  except:
+    - triggers
+  tags:
+    - docker
+
+ce:version:
+  script: bin/qa Test::Sanity::Version CE
+  allow_failure: true
+  <<: *sanity
+
+ee:version:
+  script: bin/qa Test::Sanity::Version EE
+  allow_failure: true
+  <<: *sanity
+
 .test: &test
   stage: test
   image: $TEST_IMAGE
@@ -76,14 +94,11 @@ ee:mattermost:
   script: bin/qa Test::Integration::Mattermost EE
   <<: *test
 
-notify:slack:
-  before_script:
-    - apk update && apk add git curl bash
-  image: alpine
-  stage: notify
-  script:
-    - bin/slack "#development" "Pipeline on \`$CI_BUILD_REF_NAME\` failed! Commit \`$(git log -1 --oneline | sed 's|\"|\\\\\"|g')\` See <https://gitlab.com/gitlab-org/gitlab-qa/commit/"$CI_BUILD_REF"/pipelines>"
-  when: on_failure
-  only:
-    - master
-    - tags@gitlab-org/gitlab-qa
+ee:geo:
+  script: bin/qa Test::Integration::Geo EE
+  <<: *test
+  allow_failure: true
+  tags:
+    - docker
+    - 7gb
+    - triggered-packages

data/.rubocop.yml

@@ -1,3 +1,6 @@
+AllCops:
+  TargetRubyVersion: 2.3
+
 Style/Documentation:
   Enabled: false
 
@@ -13,5 +16,11 @@ Lint/ShadowingOuterLocalVariable:
 Metrics/BlockLength:
   Enabled: false
 
-Style/PredicateName:
+Style/FrozenStringLiteralComment:
   Enabled: false
+
+Metrics/MethodLength:
+  Max: 20
+
+Metrics/AbcSize:
+  Max: 18

data/CONTRIBUTING.md

@@ -1,46 +1,12 @@
-## Contributing
+## Developer Certificate of Origin + License
 
-Thank you for your interest in contributing to this GitLab project! We welcome
-all contributions. By participating in this project, you agree to abide by the
-[code of conduct](#code-of-conduct).
+By contributing to GitLab B.V., You accept and agree to the following terms and
+conditions for Your present and future Contributions submitted to GitLab B.V.
+Except for the license granted herein to GitLab B.V. and recipients of software
+distributed by GitLab B.V., You reserve all right, title, and interest in and to
+Your Contributions. All Contributions are subject to the following DCO + License
+terms.
 
-## Contributor license agreement
+[DCO + License](https://gitlab.com/gitlab-org/dco/blob/master/README.md)
 
-By submitting code as an individual you agree to the [individual contributor
-license agreement][individual-agreement].
-
-By submitting code as an entity you agree to the [corporate contributor license
-agreement][corporate-agreement].
-
-## Code of conduct
-
-As contributors and maintainers of this project, we pledge to respect all people
-who contribute through reporting issues, posting feature requests, updating
-documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free
-experience for everyone, regardless of level of experience, gender, gender
-identity and expression, sexual orientation, disability, personal appearance,
-body size, race, ethnicity, age, or religion.
-
-Examples of unacceptable behavior by participants include the use of sexual
-language or imagery, derogatory comments or personal attacks, trolling, public
-or private harassment, insults, or other unprofessional conduct.
-
-Project maintainers have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct. Project maintainers who do not follow the
-Code of Conduct may be removed from the project team.
-
-This code of conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior can be
-reported by emailing contact@gitlab.com.
-
-This Code of Conduct is adapted from the [Contributor Covenant][contributor-covenant], version 1.1.0,
-available at [http://contributor-covenant.org/version/1/1/0/](http://contributor-covenant.org/version/1/1/0/).
-
-[contributor-covenant]: http://contributor-covenant.org
-[individual-agreement]: https://docs.gitlab.com/ee/legal/individual_contributor_license_agreement.html
-[corporate-agreement]: https://docs.gitlab.com/ee/legal/corporate_contributor_license_agreement.html
+_This notice should stay as the first item in the CONTRIBUTING.md file._

data/LICENSE

@@ -1,6 +1,6 @@
-The MIT License
+Copyright (c) 2011-2017 GitLab B.V.
 
-Copyright (c) 2016-2017 GitLab Inc.
+With regard to the GitLab Software:
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +9,17 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+For all third party components incorporated into the GitLab Software, those
+components are licensed under the original license provided by the owner of the
+applicable component.

data/README.md

@@ -10,6 +10,10 @@ GitLab consists of multiple pieces configured and packaged by
 
 The purpose of this test suite is to verify that all pieces do integrate well together.
 
+## Architecture
+
+See the [GitLab QA architecture](/docs/architecture.md).
+
 ## How do we use it
 
 Currently we trigger test suite against GitLab Docker images created by Omnibus nightly.
@@ -37,6 +41,10 @@ command in your system.
 
     `gitlab-qa Test::Instance::Any CE|EE nightly|latest http://your.instance.gitlab`
 
+    For instance, to run it against https://staging.gitlab.com:
+
+    `GITLAB_USERNAME=your_username GITLAB_PASSWORD=your_password gitlab-qa Test::Instance::Any EE latest https://staging.gitlab.com`
+
 ## How does it work?
 
 GitLab QA handles a few scenarios:

data/docs/architecture.md

@@ -0,0 +1,5 @@
+# GitLab QA architecture
+
+<img src="https://docs.google.com/drawings/d/e/2PACX-1vTBlBcIBFFnQOd9xGQ7-2rij96mP2-ajNd9sQILhSI2D7x-q_8oMuO_GFG8-BWRoQZkVHWdQZTdXF8c/pub?w=855&amp;h=2426">
+
+_[edit diagram (for GitLab team members only)](https://docs.google.com/drawings/d/12mTCF7BU-xaxxS9MmIjkSYnf31RN4wgkkHcXTmS0NoA/edit)_

data/gitlab-qa.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'gitlab/qa/version'
@@ -19,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.47.1'
-  spec.add_development_dependency 'pry', '~> 0.10.4'
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'pry', '~> 0.11'
+  spec.add_development_dependency 'rake', '~> 12.2'
+  spec.add_development_dependency 'rspec', '~> 3.7'
+  spec.add_development_dependency 'rubocop', '~> 0.51'
 end

data/lib/gitlab/qa.rb

@@ -1,4 +1,4 @@
-$LOAD_PATH << File.expand_path(File.dirname(__FILE__))
+$LOAD_PATH << File.expand_path(__dir__)
 
 module Gitlab
   module QA
@@ -25,6 +25,11 @@ module Gitlab
 
         module Integration
           autoload :Mattermost, 'qa/scenario/test/integration/mattermost'
+          autoload :Geo, 'qa/scenario/test/integration/geo'
+        end
+
+        module Sanity
+          autoload :Version, 'qa/scenario/test/sanity/version'
         end
       end
     end

data/lib/gitlab/qa/component/gitlab.rb

@@ -2,7 +2,6 @@ require 'securerandom'
 require 'net/http'
 require 'uri'
 require 'forwardable'
-require 'shellwords'
 
 module Gitlab
   module QA
@@ -14,7 +13,8 @@ module Gitlab
         # rubocop:disable Style/Semicolon
 
         attr_reader :release, :docker
-        attr_accessor :volumes, :network, :environment, :network_aliases
+        attr_accessor :volumes, :network, :environment
+        attr_writer :name
 
         def_delegators :release, :tag, :image, :edition
 
@@ -28,7 +28,11 @@ module Gitlab
         end
 
         def omnibus_config=(config)
-          @environment['GITLAB_OMNIBUS_CONFIG'] = config
+          @environment['GITLAB_OMNIBUS_CONFIG'] = config.tr("\n", ' ')
+        end
+
+        def add_network_alias(name)
+          @network_aliases.push(name)
         end
 
         def release=(release)
@@ -64,13 +68,12 @@ module Gitlab
           @docker.network_create(network)
         end
 
-        # rubocop:disable Metrics/MethodLength
         # rubocop:disable Metrics/AbcSize
         def start
           ensure_configured!
 
           docker.run(image, tag) do |command|
-            command << '-d -p 80:80'
+            command << '-d -p 80'
             command << "--name #{name}"
             command << "--net #{network}"
             command << "--hostname #{hostname}"
@@ -80,8 +83,7 @@ module Gitlab
             end
 
             @environment.to_h.each do |key, value|
-              escaped_value = Shellwords.escape(value)
-              command << "--env #{key}=#{escaped_value}"
+              command << %(--env #{key}="#{value}")
             end
 
             @network_aliases.to_a.each do |network_alias|
@@ -92,6 +94,7 @@ module Gitlab
 
         def reconfigure
           @docker.attach(name) do |line, wait|
+            puts line
             # TODO, workaround which allows to detach from the container
             #
             Process.kill('INT', wait.pid) if line =~ /gitlab Reconfigured!/
@@ -110,10 +113,7 @@ module Gitlab
         end
 
         def wait
-          puts "GitLab URL: #{address}"
-          print 'Waiting for GitLab to become available '
-
-          if Availability.new("http://#{@docker.hostname}").check(180)
+          if Availability.new(name).check(180)
             sleep 12 # TODO, handle that better
             puts ' -> GitLab is available.'
           else
@@ -121,6 +121,20 @@ module Gitlab
           end
         end
 
+        def pull
+          @docker.pull(@release.image, @release.tag)
+        end
+
+        def sha_version
+          json = @docker.read_file(
+            @release.image, @release.tag,
+            '/opt/gitlab/version-manifest.json'
+          )
+
+          manifest = JSON.parse(json)
+          manifest['software']['gitlab-rails']['locked_version']
+        end
+
         private
 
         # rubocop:disable Style/GuardClause
@@ -131,11 +145,18 @@ module Gitlab
         end
 
         class Availability
-          def initialize(address)
-            @uri = URI.join(address, '/help')
+          def initialize(name)
+            @docker = Docker::Engine.new
+
+            host = @docker.hostname
+            port = @docker.port(name, 80).split(':').last
+
+            @uri = URI.join("http://#{host}:#{port}", '/help')
           end
 
           def check(retries)
+            print "Waiting for GitLab at `#{@uri}` to become available "
+
             retries.times do
               return true if service_available?
 

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

@@ -5,53 +5,31 @@ module Gitlab
       # This class represents GitLab QA specs image that is implemented in
       # the `qa/` directory located in GitLab CE / EE repositories.
       #
-      # TODO, it needs some refactoring.
-      #
-      class Specs
-        include Scenario::Actable
+      class Specs < Scenario::Template
+        IMAGE = 'gitlab/gitlab-qa'.freeze
 
-        IMAGE_NAME = 'gitlab/gitlab-qa'.freeze
+        attr_accessor :suite, :release, :network, :args
 
         def initialize
           @docker = Docker::Engine.new
         end
 
-        def test(gitlab:, suite: 'Test::Instance', extra_args: [])
-          test_address(
-            release: gitlab.release,
-            address: gitlab.address,
-            name: "#{gitlab.name}-specs",
-            network: gitlab.network,
-            suite: suite,
-            extra_args: extra_args
-          )
-        end
+        def perform # rubocop:disable Metrics/AbcSize
+          raise ArgumentError unless [suite, release].all?
 
-        # rubocop:disable Metrics/ParameterLists
-        def test_address(release:, address:, name: nil, network: nil,
-                         suite: 'Test::Instance', extra_args: [])
-          puts "Running instance suite #{suite} for Gitlab " \
-               "#{release.edition.upcase} at #{address}"
+          puts "Running test suite `#{suite}` for #{release.project_name}"
 
-          args = [suite, address] + extra_args
+          @docker.run(IMAGE, release.edition_tag, suite, *args) do |command|
+            command << "-t --rm --net=#{network || 'bridge'}"
 
-          @docker.run(IMAGE_NAME, release.edition_tag, *args) do |command|
-            build_command(command, name, network)
-          end
-        end
+            Runtime::Env.delegated.each do |env|
+              command.env(env, "$#{env}")
+            end
 
-        private
-
-        def build_command(command, name, network)
-          command << "-t --rm --net=#{network || 'bridge'}"
-
-          Runtime::Env.delegated.each do |env|
-            command.env(env, "$#{env}")
+            command.volume('/var/run/docker.sock', '/var/run/docker.sock')
+            command.volume(Runtime::Env.screenshots_dir, '/home/qa/tmp')
+            command.name("gitlab-specs-#{Time.now.to_i}")
           end
-
-          command.volume('/var/run/docker.sock', '/var/run/docker.sock')
-          command.volume(Runtime::Env.screenshots_dir, '/home/qa/tmp')
-          command.name(name || "gitlab-specs-#{Time.now.to_i}")
         end
       end
     end

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

@@ -28,8 +28,12 @@ module Gitlab
           "docker #{@args.join(' ')}"
         end
 
+        def ==(other)
+          to_s == other.to_s
+        end
+
         def execute!(&block)
-          Docker::Shellout.execute!(self, &block)
+          Docker::Shellout.new(self).execute!(&block)
         end
 
         def self.execute(cmd, &block)

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

@@ -14,7 +14,7 @@ module Gitlab
 
         def run(image, tag, *args)
           Docker::Command.new('run').tap do |command|
-            yield command
+            yield command if block_given?
 
             command << "#{image}:#{tag}"
             command << args if args.any?
@@ -23,6 +23,11 @@ module Gitlab
           end
         end
 
+        def read_file(image, tag, path, &block)
+          cat_file = "run --rm --entrypoint /bin/cat #{image}:#{tag} #{path}"
+          Docker::Command.execute(cat_file, &block)
+        end
+
         def attach(name, &block)
           Docker::Command.execute("attach --sig-proxy=false #{name}", &block)
         end
@@ -50,6 +55,10 @@ module Gitlab
         def network_create(name)
           Docker::Command.execute("network create #{name}")
         end
+
+        def port(name, port)
+          Docker::Command.execute("port #{name} #{port}/tcp")
+        end
       end
     end
   end

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

@@ -6,20 +6,33 @@ module Gitlab
       class Shellout
         class StatusError < StandardError; end
 
-        def self.execute!(command)
-          puts "Running shell command: `#{command}`"
+        def initialize(command)
+          @command = command
+          @output = []
 
-          Open3.popen2e(command.to_s) do |_in, out, wait|
+          puts "Docker shell command: `#{@command}`"
+        end
+
+        def execute!
+          raise StatusError, 'Command already executed' if @output.any?
+
+          Open3.popen2e(@command.to_s) do |_in, out, wait|
             out.each do |line|
-              puts line
+              @output.push(line)
 
-              yield line, wait if block_given?
+              if block_given?
+                yield line, wait
+              else
+                puts line
+              end
             end
 
             if wait.value.exited? && wait.value.exitstatus.nonzero?
-              raise StatusError, "Docker command `#{command}` failed!"
+              raise StatusError, "Docker command `#{@command}` failed!"
             end
           end
+
+          @output.join.chomp
         end
       end
     end

data/lib/gitlab/qa/release.rb

@@ -1,14 +1,15 @@
 module Gitlab
   module QA
     class Release
-      CUSTOM_GITLAB_IMAGE_REGEX = %r{/gitlab-([ce]e):(.+)\z}
+      CANONICAL_REGEX = /\A(?<edition>ce|ee):?(?<tag>.+)?/i
+      CUSTOM_GITLAB_IMAGE_REGEX = %r{/gitlab-(?<edition>[ce]e):(?<tag>.+)\z}
       DEFAULT_TAG = 'nightly'.freeze
 
       attr_reader :release
       attr_writer :tag
 
       def initialize(release)
-        @release = release.to_s
+        @release = release.to_s.downcase
       end
 
       def to_s
@@ -24,9 +25,9 @@ module Gitlab
       def edition
         @edition ||=
           if canonical?
-            release.downcase.to_sym
+            release.match(CANONICAL_REGEX)[:edition].to_sym
           else
-            release.match(CUSTOM_GITLAB_IMAGE_REGEX)[1].to_sym
+            release.match(CUSTOM_GITLAB_IMAGE_REGEX)[:edition].to_sym
           end
       end
 
@@ -39,16 +40,16 @@ module Gitlab
           end
       end
 
-      def canonical_image
-        @canonical_image ||= "gitlab/gitlab-#{edition}"
+      def project_name
+        @project_name ||= image.sub(%r{^gitlab\/}, '')
       end
 
       def tag
         @tag ||=
           if canonical?
-            DEFAULT_TAG
+            release.match(CANONICAL_REGEX)[:tag] || DEFAULT_TAG
           else
-            release.match(CUSTOM_GITLAB_IMAGE_REGEX)[2]
+            release.match(CUSTOM_GITLAB_IMAGE_REGEX)[:tag]
           end
       end
 
@@ -59,7 +60,11 @@ module Gitlab
       private
 
       def canonical?
-        %w(ce ee).include?(release.downcase)
+        release =~ CANONICAL_REGEX
+      end
+
+      def canonical_image
+        @canonical_image ||= "gitlab/gitlab-#{edition}"
       end
     end
   end

data/lib/gitlab/qa/runtime/env.rb

@@ -4,10 +4,10 @@ module Gitlab
       module Env
         extend self
 
-        VARIABLES = %w(GITLAB_USERNAME
+        VARIABLES = %w[GITLAB_USERNAME
                        GITLAB_PASSWORD
                        GITLAB_URL
-                       EE_LICENSE).freeze
+                       EE_LICENSE].freeze
 
         def screenshots_dir
           ENV['QA_SCREENSHOTS_DIR'] || '/tmp/gitlab-qa-screenshots'

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

@@ -13,8 +13,10 @@ module Gitlab
                 r.tag = tag
               end
 
-              Component::Specs.perform do |instance|
-                instance.test_address(release: release, address: address)
+              Component::Specs.perform do |specs|
+                specs.suite = 'Test::Instance'
+                specs.release = release
+                specs.args = [address]
               end
             end
           end

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

@@ -17,8 +17,11 @@ module Gitlab
                 gitlab.network = 'test'
 
                 gitlab.instance do
-                  Component::Specs.perform do |instance|
-                    instance.test(gitlab: gitlab)
+                  Component::Specs.perform do |specs|
+                    specs.suite = 'Test::Instance'
+                    specs.release = gitlab.release
+                    specs.network = gitlab.network
+                    specs.args = [gitlab.address]
                   end
                 end
               end

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

@@ -0,0 +1,74 @@
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Integration
+          class Geo < Scenario::Template
+            ##
+            # rubocop:disable Metrics/MethodLength
+            # rubocop:disable Metrics/AbcSize
+            #
+            def perform(release)
+              release = Release.new(release)
+
+              unless release.edition == :ee
+                raise ArgumentError, 'Geo is EE only!'
+              end
+
+              Component::Gitlab.perform do |primary|
+                primary.release = release
+                primary.name = 'gitlab-primary'
+                primary.network = 'geo'
+                primary.omnibus_config = <<~OMNIBUS
+                  geo_primary_role['enable'] = true;
+                  postgresql['listen_address'] = '0.0.0.0';
+                  postgresql['trust_auth_cidr_addresses'] = ['0.0.0.0/0','0.0.0.0/0'];
+                  postgresql['md5_auth_cidr_addresses'] = ['0.0.0.0/0'];
+                  postgresql['max_replication_slots'] = 1;
+                  gitlab_rails['db_key_base'] = '4dd58204865eb41bca93bd38131d51cc';
+                OMNIBUS
+
+                primary.instance do
+                  Component::Gitlab.perform do |secondary|
+                    secondary.release = release
+                    secondary.name = 'gitlab-secondary'
+                    secondary.network = 'geo'
+                    secondary.omnibus_config = <<~OMNIBUS
+                      geo_secondary_role['enable'] = true;
+                      gitlab_rails['db_key_base'] = '4dd58204865eb41bca93bd38131d51cc';
+                    OMNIBUS
+
+                    secondary.act do
+                      # TODO, we do not wait for secondary to start because of
+                      # https://gitlab.com/gitlab-org/gitlab-ee/issues/3999
+                      #
+                      # rubocop:disable Style/Semicolon
+                      prepare; start; reconfigure
+
+                      # shellout to instance specs
+                      puts 'Running Geo primary / secondary specs!'
+
+                      Component::Specs.perform do |specs|
+                        specs.suite = 'QA::EE::Scenario::Test::Geo'
+                        specs.release = release
+                        specs.network = 'geo'
+                        specs.args = [
+                          '--primary-address', primary.address,
+                          '--primary-name', primary.name,
+                          '--secondary-address', secondary.address,
+                          '--secondary-name', secondary.name
+                        ]
+                      end
+
+                      teardown
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,7 +4,6 @@ module Gitlab
       module Test
         module Integration
           class Mattermost < Scenario::Template
-            # rubocop:disable Metrics/MethodLength
             def perform(release)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
@@ -12,17 +11,18 @@ module Gitlab
 
                 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.add_network_alias(mattermost_hostname)
+                gitlab.omnibus_config = <<~OMNIBUS
+                  mattermost_external_url '#{mattermost_external_url}'
+                OMNIBUS
 
                 gitlab.instance do
-                  Component::Specs.perform do |instance|
-                    instance.test(
-                      gitlab: gitlab,
-                      suite: 'Test::Integration::Mattermost',
-                      extra_args: [mattermost_external_url]
-                    )
+                  Component::Specs.perform do |specs|
+                    specs.suite = 'Test::Integration::Mattermost'
+                    specs.release = gitlab.release
+                    specs.network = gitlab.network
+                    specs.args = [gitlab.address, mattermost_external_url]
                   end
                 end
               end

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

@@ -11,8 +11,6 @@ module Gitlab
                         'logs' => '/var/log/gitlab',
                         'data' => '/var/opt/gitlab' }.freeze
 
-            # rubocop:disable Metrics/MethodLength
-            #
             def perform(next_release)
               next_release = Release.new(next_release)
 

data/lib/gitlab/qa/scenario/test/sanity/version.rb

@@ -0,0 +1,52 @@
+require 'json'
+require 'net/http'
+require 'cgi'
+
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Sanity
+          # This test checks that the sha_version of a GitLab was authored in
+          # the window defined by `HOURS_AGO`.  We perform a single API call,
+          # so `COMMITS` needs to be a large enough value that we expect all
+          # the commits in the time window will fit.
+          class Version < Scenario::Template
+            HOURS_AGO = 24
+            COMMITS = 10_000
+
+            # rubocop:disable Style/Semicolon
+            def perform(release)
+              version = Component::Gitlab.perform do |gitlab|
+                gitlab.release = release
+                gitlab.act { pull; sha_version }
+              end
+
+              project = "gitlab-org/#{Release.new(release).project_name}"
+              commit = recent_commits(project).find { |c| c['id'] == version }
+
+              if commit
+                puts "Found commit #{version} in recent history of #{project}"
+              else
+                puts "Did not find #{version} in recent history of #{project}"
+                exit 1
+              end
+            end
+
+            private
+
+            def recent_commits(project)
+              api = 'https://gitlab.com/api/v4'
+              url = "#{api}/projects/#{CGI.escape(project)}/repository/commits"
+              since = (Time.now - HOURS_AGO * 60 * 60).strftime('%FT%T')
+
+              uri = URI(url)
+              uri.query = URI.encode_www_form(since: since, per_page: COMMITS)
+              JSON.parse(Net::HTTP.get(uri))
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '12.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '12.2'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.1
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.1
+        version: '3.7'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: '0.51'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: '0.51'
 description: 
 email:
 - grzesiek.bizon@gmail.com
@@ -102,7 +102,7 @@ files:
 - bin/console
 - bin/qa
 - bin/setup
-- bin/slack
+- docs/architecture.md
 - exe/gitlab-qa
 - gitlab-qa.gemspec
 - lib/gitlab/qa.rb
@@ -117,9 +117,11 @@ files:
 - 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/geo.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/scenario/test/sanity/version.rb
 - lib/gitlab/qa/version.rb
 homepage: http://about.gitlab.com
 licenses:

data/bin/slack

@@ -1,13 +0,0 @@
-#!/bin/bash
-# Sends Slack notification ERROR_MSG to CHANNEL
-# An env. variable CI_SLACK_WEBHOOK_URL needs to be set.
-
-CHANNEL=$1
-ERROR_MSG=$2
-
-if [ -z "$CHANNEL" ] || [ -z "$ERROR_MSG" ] || [ -z "$CI_SLACK_WEBHOOK_URL" ]; then
-    echo "Missing argument(s) - Use: $0 channel message"
-    echo "and set CI_SLACK_WEBHOOK_URL environment variable."
-else
-    curl -X POST --data-urlencode 'payload={"channel": "'"$CHANNEL"'", "username": "GitLab-QA Builder", "text": "'"$ERROR_MSG"'"}' "$CI_SLACK_WEBHOOK_URL"
-fi