gitlab-qa 5.10.1 → 5.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 297cdac7b635387a3149a943bf48838c7bbde039d5b1981c4298380c40a5f651
-  data.tar.gz: 111bb1d4c02c51ef3865f6f2591b3e64b0deafe010ab8cf135c74bc0d54bf501
+  metadata.gz: ca0c9bc180dabbb9cba4984c2f19381d16ae57631e7ca308e38a3649d8d72dbf
+  data.tar.gz: '018c552b3d04932d581872c7ddb3d3199545a868884530e58d57ff0842528134'
 SHA512:
-  metadata.gz: c890e876be1104ea0c068114a547767a2f408dd54c34a5cf82261a3c2bb8db2346909c15def2a5f162cd20bfdbb37f73b0db6b0036d753640ec8556b987c9192
-  data.tar.gz: 8fcb78a7def6c94a94887ee0cb9ada4e478f7adaa46a1cf533d81244435e4fc61955fce033d8d9c294323b8b34077ff45a6428b92e4cf7afa76cb03f692b4594
+  metadata.gz: 2c1be4f5eab6dbefb4685dc03f7f12140cc442766f4ec86006a927aa95ae787be6065f762f0ff1b3d6f79ea3158464e9a5e33ac5c7790b75bc31ac3ed005ac19
+  data.tar.gz: abbff15cf25737e634429c22e3a704ec3f933656546243a92b408c6c55baa8056439a2f3a0c0ca1901a2e54f3e166ff16df307d61d6db109e35ed566c914b4dd

data/.gitlab-ci.yml

@@ -848,6 +848,44 @@ ee:smtp:
   variables:
     QA_SCENARIO: "Test::Integration::SMTP"
 
+ce:jira:
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::Jira"
+
+ce:jira-quarantine:
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .quarantine
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::Jira"
+
+ee:jira:
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::Jira"
+
+ee:jira-quarantine:
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::Jira"
+
 # This job requires the `GITLAB_QA_ACCESS_TOKEN` and `GITLAB_QA_DEV_ACCESS_TOKEN`
 # variable to be passed when triggered.
 staging:

data/docs/what_tests_can_be_run.md

@@ -80,6 +80,8 @@ For more details on the internals, please read the
 * `CI_SERVER_PERSONAL_ACCESS_TOKEN` - Personal access token of the server that is running the CI pipeline. This is used for pulling CI_RUNNER information in certain tests.
 * `GEO_MAX_FILE_REPLICATION_TIME` - maximum time that a test will wait for a replicated file to appear on a Geo secondary node (default 120 seconds)
 * `GEO_MAX_DB_REPLICATION_TIME` - maximum time that a test will wait for database data to appear on a Geo secondary node (default 120 seconds)
+* `JIRA_ADMIN_USERNAME` - Username for authenticating with Jira server as admin.
+* `JIRA_ADMIN_PASSWORD` - Password for authenticating with Jira server as admin.
 
 ## [Supported Remote Grid environment variables](./running_against_remote_grid.md)
 
@@ -470,6 +472,35 @@ Example:
 $ gitlab-qa Test::Integration::SMTP CE
 ```
 
+### `Test::Integration::Jira CE|EE|<full image address>`
+
+This tests that a GitLab instance works as expected with an external
+Jira server.
+It starts up a Docker container for Jira Server and another container
+for GitLab.
+
+To run tests against the GitLab container, a GitLab QA (`gitlab/gitlab-qa`)
+container is spun up and tests are run from it by running the
+`Test::Integration::Jira` scenario.
+
+**Required environment variables:**
+
+- [For EE only] `EE_LICENSE`: A valid EE license.
+- `JIRA_ADMIN_USERNAME`: Username for authenticating with Jira server as admin.
+- `JIRA_ADMIN_PASSWORD`: Password for authenticating with Jira server as admin.
+
+Example:
+
+```
+$ export JIRA_ADMIN_USERNAME=<jira_admin_username>
+$ export JIRA_ADMIN_PASSWORD=<jira_admin_password>
+
+# For EE
+$ export EE_LICENSE=$(cat /path/to/GitLab.gitlab_license)
+
+$ gitlab-qa Test::Integration::Jira EE
+```
+
 ### `Test::Instance::Any CE|EE|<full image address>:nightly|latest|any_tag http://your.instance.gitlab`
 
 This tests that a live GitLab instance works as expected by running tests

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

@@ -0,0 +1,73 @@
+module Gitlab
+  module QA
+    module Component
+      class Jira
+        include Scenario::Actable
+
+        JIRA_IMAGE = 'registry.gitlab.com/gitlab-org/gitlab-qa/jira-gitlab'.freeze
+        JIRA_IMAGE_TAG = '8.8-project-and-issue'.freeze
+
+        attr_reader :docker
+        attr_accessor :environment, :network
+        attr_writer :name
+
+        def initialize
+          @docker = Docker::Engine.new
+          @environment = {}
+        end
+
+        def name
+          @name ||= "jira"
+        end
+
+        def hostname
+          "#{name}.#{network}"
+        end
+
+        def instance
+          raise 'Please provide a block!' unless block_given?
+
+          prepare
+          start
+
+          yield self
+        ensure
+          teardown
+        end
+
+        def prepare
+          @docker.pull(JIRA_IMAGE, JIRA_IMAGE_TAG)
+
+          return if @docker.network_exists?(network)
+
+          @docker.network_create(network)
+        end
+
+        def start
+          docker.run(JIRA_IMAGE, JIRA_IMAGE_TAG) do |command|
+            command << '-d '
+            command << "--name #{name}"
+            command << "--net #{network}"
+            command << "--hostname #{hostname}"
+            command << "--publish 8080:8080"
+          end
+        end
+
+        def restart
+          @docker.restart(name)
+        end
+
+        def teardown
+          raise 'Invalid instance name!' unless name
+
+          @docker.stop(name)
+          @docker.remove(name)
+        end
+
+        def set_jira_hostname
+          ::Gitlab::QA::Runtime::Env.jira_hostname = hostname
+        end
+      end
+    end
+  end
+end

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

@@ -74,7 +74,10 @@ module Gitlab
           'SLACK_ICON_EMOJI' => :slack_icon_emoji,
           'GITLAB_QA_FORMLESS_LOGIN_TOKEN' => :gitlab_qa_formless_login_token,
           'GEO_MAX_FILE_REPLICATION_TIME' => :geo_max_file_replication_time,
-          'GEO_MAX_DB_REPLICATION_TIME' => :geo_max_db_replication_time
+          'GEO_MAX_DB_REPLICATION_TIME' => :geo_max_db_replication_time,
+          'JIRA_HOSTNAME' => :jira_hostname,
+          'JIRA_ADMIN_USERNAME' => :jira_admin_username,
+          'JIRA_ADMIN_PASSWORD' => :jira_admin_password
         }.freeze
 
         ENV_VARIABLES.each_value do |accessor|

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

@@ -0,0 +1,40 @@
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Integration
+          class Jira < Scenario::Template
+            def perform(release, *rspec_args)
+              Component::Gitlab.perform do |gitlab|
+                gitlab.release = Release.new(release)
+                gitlab.network = 'test'
+                gitlab.name = 'gitlab-jira'
+
+                Component::Jira.perform do |jira|
+                  jira.network = gitlab.network
+                  jira.set_jira_hostname
+
+                  jira.instance do
+                    gitlab.instance do
+                      puts 'Running Jira specs!'
+
+                      rspec_args << "--" unless rspec_args.include?('--')
+                      rspec_args << %w[--tag jira]
+
+                      Component::Specs.perform do |specs|
+                        specs.suite = 'Test::Instance::All'
+                        specs.release = gitlab.release
+                        specs.network = gitlab.network
+                        specs.args = [gitlab.address, *rspec_args]
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '5.10.1'.freeze
+    VERSION = '5.12.0'.freeze
   end
 end

data/lib/gitlab/qa.rb

@@ -52,6 +52,7 @@ module Gitlab
           autoload :Elasticsearch, 'gitlab/qa/scenario/test/integration/elasticsearch'
           autoload :SMTP, 'gitlab/qa/scenario/test/integration/smtp'
           autoload :GitalyHA, 'gitlab/qa/scenario/test/integration/gitaly_ha'
+          autoload :Jira, 'gitlab/qa/scenario/test/integration/jira'
         end
 
         module Sanity
@@ -72,6 +73,7 @@ module Gitlab
       autoload :Preprod, 'gitlab/qa/component/preprod'
       autoload :Elasticsearch, 'gitlab/qa/component/elasticsearch'
       autoload :MailHog, 'gitlab/qa/component/mail_hog'
+      autoload :Jira, 'gitlab/qa/component/jira'
       autoload :PostgreSQL, 'gitlab/qa/component/postgresql'
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 5.10.1
+  version: 5.12.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-12 00:00:00.000000000 Z
+date: 2020-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -240,6 +240,7 @@ files:
 - lib/gitlab/qa/component/elasticsearch.rb
 - lib/gitlab/qa/component/gitlab.rb
 - lib/gitlab/qa/component/internet_tunnel.rb
+- lib/gitlab/qa/component/jira.rb
 - lib/gitlab/qa/component/ldap.rb
 - lib/gitlab/qa/component/mail_hog.rb
 - lib/gitlab/qa/component/minio.rb
@@ -281,6 +282,7 @@ files:
 - lib/gitlab/qa/scenario/test/integration/gitaly_ha.rb
 - lib/gitlab/qa/scenario/test/integration/group_saml.rb
 - lib/gitlab/qa/scenario/test/integration/instance_saml.rb
+- lib/gitlab/qa/scenario/test/integration/jira.rb
 - lib/gitlab/qa/scenario/test/integration/kubernetes.rb
 - lib/gitlab/qa/scenario/test/integration/ldap.rb
 - lib/gitlab/qa/scenario/test/integration/ldap_no_server.rb