gitlab-qa 4.2.2 → 4.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b28724b26e74b052e4d47355d5b3c1436caafc8ede501d897435f2775df3a3e
-  data.tar.gz: e3309b6a55190d743cb35577345987802d5b239bdede3e2fc17b2bb9f5685465
+  metadata.gz: 046b62bccb952e70582f416d33a6d8e91812cecd62b6b824fe32502dfb6fa98b
+  data.tar.gz: af1b0fd85c07dfca53d920a7e3ee1da9d28a06ed7c5401ba1e0f94c6b753d8be
 SHA512:
-  metadata.gz: 270b33c36d00ddc23b14abd5a3b9f0f58b00782bcfd0f39afb530194a52a37335cd98eb1756d358a2fdd4420abd25fc423a98f2e57c5fe9e39e24e3b9c40c5da
-  data.tar.gz: 5723399e6aeb0980f050d05ce640616224f4e66b5f4c50311e21440e5430dff840751aba88ecf2276cfd60b5276c6029f0079182a0e7db37ca4d776ff8097dcb
+  metadata.gz: 6e1a3cbb30e225c1f9bd98be82eecf5a26c1c00a363f09b2934df98857803936f3a71afac09d8a1eba202ddcc64684a97f0c61d53ac4ce34dbfa5c2a87e99fb1
+  data.tar.gz: e16f0d7166c8cb3c5af3a8af06269f256f4f3f95b2e96631b4d6a794fd99559e496d66873d38aa424466625b1ff33ee9f134baaaf8e5c8d6e0a90e4a19f99ee6

data/.gitlab-ci.yml

@@ -359,6 +359,21 @@ ee:ldap_tls-quarantine:
   <<: *ee-qa
   <<: *quarantine
 
+ee:ldap_no_server:
+  script:
+    - exe/gitlab-qa Test::Integration::LDAPNoServer ${RELEASE:=EE}
+  <<: *test
+  <<: *high-capacity
+  <<: *ee-qa
+
+ee:ldap_no_server-quarantine:
+  script:
+    - exe/gitlab-qa Test::Integration::LDAPNoServer ${RELEASE:=EE} -- --tag quarantine
+  <<: *test
+  <<: *high-capacity
+  <<: *ee-qa
+  <<: *quarantine
+
 ce:instance_saml:
   script:
   - exe/gitlab-qa Test::Integration::InstanceSAML ${RELEASE:=CE}

data/docs/what_tests_can_be_run.md

@@ -253,6 +253,38 @@ $ gitlab-qa Test::Integration::LDAPTLS EE
 [test-integration-ldap-tls]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/qa/qa/scenario/test/integration/ldap_tls.rb
 [test-integration-ldap-tls-certs]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/tls_certificates/gitlab
 
+### `Test::Integration::LDAPNoServer EE|<full image address>`
+
+This configures a GitLab instance for use with LDAP but does not
+spin up an LDAP server in a docker container.
+
+The LDAP server is created at runtime by the spec so that 
+the test can provide the fixture data for the LDAP server
+as needed.
+
+To run tests against the GitLab containers, a GitLab QA (`gitlab/gitlab-qa`)
+container is spun up and tests are run from it by running the
+`Test::Integration::LDAPNoServer` scenario (located under
+[`gitlab-org/gitlab@qa/qa/scenario/test/integration/ldap_no_server.rb`](https://gitlab.com/gitlab-org/gitlab/blob/master/qa/qa/scenario/test/integration/ldap_no_server.rb)
+in the GitLab project).
+
+In GiLab project, both the GitLab standard and LDAP credentials are needed:
+
+1. The first is used to login as an Admin to enter in the GitLab license.
+2. The second is used to conduct LDAP-related tasks
+
+**Required environment variables:**
+
+- `EE_LICENSE`: A valid Enterprise license.
+
+Example:
+
+```
+$ export EE_LICENSE=$(cat /path/to/GitLab.gitlab_license)
+
+$ gitlab-qa Test::Integration::LDAPNoServer EE
+```     
+
 ### `Test::Integration::GroupSAML EE|<full image address>`
 
 This tests that Group SAML login works as expected with an external SAML identity provider (idp).

data/lib/gitlab/qa.rb

@@ -33,6 +33,7 @@ module Gitlab
           autoload :Geo, 'gitlab/qa/scenario/test/integration/geo'
           autoload :LDAP, 'gitlab/qa/scenario/test/integration/ldap'
           autoload :LDAPNoTLS, 'gitlab/qa/scenario/test/integration/ldap_no_tls'
+          autoload :LDAPNoServer, 'gitlab/qa/scenario/test/integration/ldap_no_server'
           autoload :LDAPTLS, 'gitlab/qa/scenario/test/integration/ldap_tls'
           autoload :SAML, 'gitlab/qa/scenario/test/integration/saml'
           autoload :GroupSAML, 'gitlab/qa/scenario/test/integration/group_saml'

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

@@ -20,18 +20,9 @@ module Gitlab
 
         LDAP_IMAGE = 'osixia/openldap'.freeze
         LDAP_IMAGE_TAG = 'latest'.freeze
-        LDAP_DOMAIN = 'example.org'.freeze
-        ADMIN_USER = 'admin'.freeze
-        ADMIN_PASSWORD = 'admin'.freeze
         LDAP_USER = 'tanuki'.freeze
         LDAP_PASSWORD = 'password'.freeze
-        LDAP_PORT = 389
-        LDAP_TLS_PORT = 636
-        BASE_DN = 'dc=example,dc=org'.freeze
-        BIND_DN = 'cn=admin,dc=example,dc=org'.freeze
         BOOTSTRAP_LDIF = '/container/service/slapd/assets/config/bootstrap/ldif/custom'.freeze
-        GROUP_BASE = 'ou=Global Groups,dc=example,dc=org'.freeze
-        ADMIN_GROUP = 'AdminGroup'.freeze
         FIXTURE_PATH = File.expand_path('../../../../fixtures/ldap'.freeze, __dir__)
 
         attr_reader :docker
@@ -59,10 +50,6 @@ module Gitlab
           end
         end
 
-        def tls?
-          @environment['LDAP_TLS'] != 'false'
-        end
-
         def username
           LDAP_USER
         end
@@ -140,37 +127,10 @@ module Gitlab
           @docker.pull(LDAP_IMAGE, LDAP_IMAGE_TAG)
         end
 
-        def to_config
-          config = YAML.safe_load <<~CFG
-            main:
-              label: LDAP
-              host: #{hostname}
-              port: #{tls? ? LDAP_TLS_PORT : LDAP_PORT}
-              uid: 'uid'
-              bind_dn: #{BIND_DN}
-              password: #{ADMIN_PASSWORD}
-              encryption: #{tls? ? 'simple_tls' : 'plain'}
-              verify_certificates: false
-              base: #{BASE_DN}
-              user_filter: ''
-              group_base: #{GROUP_BASE}
-              admin_group: #{ADMIN_GROUP}
-              external_groups: ''
-              sync_ssh_keys: false
-          CFG
-
-          # Quotes get eaten up when the string is set in the environment
-          config.to_s.gsub("\"", "\\\"")
-        end
-
         def set_gitlab_credentials
           ::Gitlab::QA::Runtime::Env.ldap_username = username
           ::Gitlab::QA::Runtime::Env.ldap_password = password
         end
-
-        def set_accept_insecure_certs
-          ::Gitlab::QA::Runtime::Env.accept_insecure_certs = 'true'
-        end
       end
     end
   end

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

@@ -8,10 +8,11 @@ module Gitlab
       # the `qa/` directory located in GitLab CE / EE repositories.
       #
       class Specs < Scenario::Template
-        attr_accessor :suite, :release, :network, :args
+        attr_accessor :suite, :release, :network, :args, :volumes
 
         def initialize
           @docker = Docker::Engine.new
+          @volumes = {}
         end
 
         def perform # rubocop:disable Metrics/AbcSize
@@ -29,7 +30,11 @@ module Gitlab
             end
 
             command.volume('/var/run/docker.sock', '/var/run/docker.sock')
-            command.volume(File.join(Runtime::Env.host_artifacts_dir, name), '/home/gitlab/qa/tmp')
+            command.volume(File.join(Runtime::Env.host_artifacts_dir, name), File.join(Docker::Volumes::QA_CONTAINER_WORKDIR, 'tmp'))
+
+            @volumes.to_h.each do |to, from|
+              command.volume(to, from)
+            end
 
             command.name(name)
           end

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

@@ -7,6 +7,8 @@ module Gitlab
         VOLUMES = { 'config' => '/etc/gitlab',
                     'data' => '/var/opt/gitlab' }.freeze
 
+        QA_CONTAINER_WORKDIR = '/home/gitlab/qa'.freeze
+
         def initialize(volumes = VOLUMES)
           @volumes = volumes
         end

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

@@ -6,44 +6,97 @@ module Gitlab
       module Test
         module Integration
           class LDAP < Scenario::Template
-            attr_reader :gitlab_name, :spec_suite, :tls
+            LDAP_PORT = 389
+            LDAP_TLS_PORT = 636
+            BASE_DN = 'dc=example,dc=org'.freeze
+            BIND_DN = 'cn=admin,dc=example,dc=org'.freeze
+            GROUP_BASE = 'ou=Global Groups,dc=example,dc=org'.freeze
+            ADMIN_GROUP = 'AdminGroup'.freeze
+            ADMIN_USER = 'admin'.freeze
+            ADMIN_PASSWORD = 'admin'.freeze
 
-            def configure(gitlab, ldap)
+            attr_reader :gitlab_name, :spec_suite, :tls, :ldap_name, :network, :orchestrate_ldap_server
+
+            def initialize
+              @ldap_name = 'ldap-server'
+              @network = 'test'
+            end
+
+            def configure_omnibus(gitlab)
               raise NotImplementedError
             end
 
-            # rubocop:disable Metrics/AbcSize
+            def ldap_servers_omnibus_config
+              config = YAML.safe_load <<~CFG
+                main:
+                  label: LDAP
+                  host: #{ldap_hostname}
+                  port: #{tls ? LDAP_TLS_PORT : LDAP_PORT}
+                  uid: 'uid'
+                  bind_dn: #{BIND_DN}
+                  password: #{ADMIN_PASSWORD}
+                  encryption: #{tls ? 'simple_tls' : 'plain'}
+                  verify_certificates: false
+                  base: #{BASE_DN}
+                  user_filter: ''
+                  group_base: #{GROUP_BASE}
+                  admin_group: #{ADMIN_GROUP}
+                  external_groups: ''
+                  sync_ssh_keys: false
+              CFG
+
+              # Quotes get eaten up when the string is set in the environment
+              config.to_s.gsub("\"", "\\\"")
+            end
+
+            def ldap_hostname
+              "#{ldap_name}.#{network}"
+            end
+
+            def run_specs(gitlab, volumes = {}, *rspec_args)
+              gitlab.instance do
+                puts "Running #{spec_suite} specs!"
+
+                Component::Specs.perform do |specs|
+                  specs.suite = spec_suite
+                  specs.release = gitlab.release
+                  specs.network = gitlab.network
+                  specs.args = [gitlab.address, *rspec_args]
+                  specs.volumes = volumes
+                end
+              end
+            end
+
+            def orchestrate_ldap
+              Component::LDAP.perform do |ldap|
+                ldap.name = 'ldap-server'
+                ldap.network = 'test'
+                ldap.set_gitlab_credentials
+                ldap.tls = tls
+
+                ldap.instance do
+                  yield
+                end
+              end
+            end
+
             def perform(release, *rspec_args)
               Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
                 gitlab.name = gitlab_name
                 gitlab.network = 'test'
                 gitlab.tls = tls
+                configure_omnibus(gitlab)
 
-                Component::LDAP.perform do |ldap|
-                  ldap.name = 'ldap-server'
-                  ldap.network = 'test'
-                  ldap.set_gitlab_credentials
-                  ldap.tls = tls
-
-                  configure(gitlab, ldap)
-
-                  ldap.instance do
-                    gitlab.instance do
-                      puts "Running #{spec_suite} specs!"
-
-                      Component::Specs.perform do |specs|
-                        specs.suite = spec_suite
-                        specs.release = gitlab.release
-                        specs.network = gitlab.network
-                        specs.args = [gitlab.address, *rspec_args]
-                      end
-                    end
-                  end
+                if orchestrate_ldap_server
+                  orchestrate_ldap { run_specs(gitlab, {}, *rspec_args) }
+                else
+                  volumes = { 'admin': File.join(Docker::Volumes::QA_CONTAINER_WORKDIR, 'qa/fixtures/ldap/admin'),
+                              'non_admin': File.join(Docker::Volumes::QA_CONTAINER_WORKDIR, 'qa/fixtures/ldap/non_admin') }
+                  run_specs(gitlab, volumes, *rspec_args)
                 end
               end
             end
-            # rubocop:enable Metrics/AbcSize
           end
         end
       end

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

@@ -0,0 +1,27 @@
+module Gitlab
+  module QA
+    module Scenario
+      module Test
+        module Integration
+          class LDAPNoServer < LDAP
+            def initialize
+              @spec_suite = 'Test::Integration::LDAPNoServer'
+              @orchestrate_ldap_server = false
+              @tls = false
+              super
+            end
+
+            def configure_omnibus(gitlab)
+              gitlab.omnibus_config = <<~OMNIBUS
+                    gitlab_rails['ldap_enabled'] = true;
+                    gitlab_rails['ldap_servers'] = #{ldap_servers_omnibus_config};
+                    gitlab_rails['ldap_sync_worker_cron'] = '* * * * *';
+                    gitlab_rails['ldap_group_sync_worker_cron'] = '* * * * *';
+              OMNIBUS
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -9,13 +9,15 @@ module Gitlab
             def initialize
               @gitlab_name = 'gitlab-ldap'
               @spec_suite = 'Test::Integration::LDAPNoTLS'
+              @orchestrate_ldap_server = true
               @tls = false
+              super
             end
 
-            def configure(gitlab, ldap)
+            def configure_omnibus(gitlab)
               gitlab.omnibus_config = <<~OMNIBUS
                     gitlab_rails['ldap_enabled'] = true;
-                    gitlab_rails['ldap_servers'] = #{ldap.to_config};
+                    gitlab_rails['ldap_servers'] = #{ldap_servers_omnibus_config};
                     gitlab_rails['ldap_sync_worker_cron'] = '* * * * *';
                     gitlab_rails['ldap_group_sync_worker_cron'] = '* * * * *';
               OMNIBUS

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

@@ -9,14 +9,20 @@ module Gitlab
             def initialize
               @gitlab_name = 'gitlab'
               @spec_suite = 'Test::Integration::LDAPTLS'
+              @orchestrate_ldap_server = true
               @tls = true
+              super
             end
 
-            def configure(gitlab, ldap)
-              ldap.set_accept_insecure_certs
+            def set_accept_insecure_certs
+              ::Gitlab::QA::Runtime::Env.accept_insecure_certs = 'true'
+            end
+
+            def configure_omnibus(gitlab)
+              set_accept_insecure_certs
               gitlab.omnibus_config = <<~OMNIBUS
                     gitlab_rails['ldap_enabled'] = true;
-                    gitlab_rails['ldap_servers'] = #{ldap.to_config};
+                    gitlab_rails['ldap_servers'] = #{ldap_servers_omnibus_config};
                     letsencrypt['enable'] = false;
                     external_url '#{gitlab.address}';
                     gitlab_rails['ldap_sync_worker_cron'] = '* * * * *';

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '4.2.2'.freeze
+    VERSION = '4.3.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.3.2
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -195,6 +195,7 @@ files:
 - lib/gitlab/qa/scenario/test/integration/instance_saml.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
 - lib/gitlab/qa/scenario/test/integration/ldap_no_tls.rb
 - lib/gitlab/qa/scenario/test/integration/ldap_tls.rb
 - lib/gitlab/qa/scenario/test/integration/mattermost.rb
@@ -227,8 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Integration tests for GitLab