gitlab-qa 2.7.3 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0e668db418c2898f97674ac4d384fbb9dbf98ae00fa7b1fd8813a21c70119b1
-  data.tar.gz: ddee7d1abbb129b84ac39d8dd70e78865d694fc59cc2fa4cd56d23f8db93a94d
+  metadata.gz: 10cf0ac3fcf95c6576b31b1c1fb0947b6a2f9eb5bb1bfc78281e4375001ecdc4
+  data.tar.gz: 2ed071bfb04c06a6004c1669e981aeb3f3673b1512fde01bf31dadb94a794d0d
 SHA512:
-  metadata.gz: fac3397d2a8d66055f56f6241cb066fa38a9bf41e63cb9b7bcf904026aa525e3601b75a06810f8ee247991cd852a65996d79243d7c55715bc2ac153b73ef504d
-  data.tar.gz: c4e6f54cd40685dff86016fb1bfbbd75ce4125d09d9522eaad48e7fd18311b07bc0070e0861edf42a318b5516550ff3575cd164152bfe4e2f63ce0b6ce4897ac
+  metadata.gz: 597b819e4181911f326165fe5e6e26ded947992e55dbc994cd4568172ba4f9102011fdb7b238f74c4a1a92ee4189658a8d32ccfa98bb9ea944a9cddbc54a8757
+  data.tar.gz: a05d29929286348904d2c12c2d247bf19c2654cb0598512e4ce7b7ba8eb145d2a939fd1a055b63af79060f58f1c0b5ba901a202d65b7d650c8ea24baf59236c3

data/.gitlab-ci.yml

@@ -4,12 +4,14 @@ services:
 stages:
   - check
   - test
+  - notify
 
 variables:
   TEST_IMAGE: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa
   DOCKER_DRIVER: overlay
   DOCKER_HOST: tcp://docker:2375
   QA_ARTIFACTS_DIR: $CI_PROJECT_DIR
+  QA_CAN_TEST_GIT_PROTOCOL_V2: 'false'
 
 before_script:
   - bundle install
@@ -248,3 +250,25 @@ ee:object_storage:
   <<: *test
   <<: *high-capacity
   <<: *ee-qa
+
+.notify_upstream_commit: &notify_upstream_commit
+  stage: notify
+  image: $TEST_IMAGE
+  before_script:
+    - gem install gitlab --no-document
+  only:
+    variables:
+      - $TOP_UPSTREAM_SOURCE_PROJECT
+      - $TOP_UPSTREAM_SOURCE_SHA
+
+notify_upstream_commit:success:
+  <<: *notify_upstream_commit
+  script:
+    - bin/notify_upstream_commit success
+  when: on_success
+
+notify_upstream_commit:failure:
+  <<: *notify_upstream_commit
+  script:
+    - bin/notify_upstream_commit failure
+  when: on_failure

data/bin/notify_upstream_commit

@@ -0,0 +1,50 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'gitlab'
+
+# Configure credentials to be used with gitlab gem
+Gitlab.configure do |config|
+  config.endpoint = 'https://gitlab.com/api/v4'
+  config.private_token = ENV['GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN']
+end
+
+class CommitComment
+  def self.post!(status)
+    unless ENV['TOP_UPSTREAM_SOURCE_SHA']
+      puts "The 'TOP_UPSTREAM_SOURCE_SHA' environment variable is missing, cannot post a comment on a missing upstream commit."
+      return
+    end
+
+    top_upstream_source_sha = ENV['TOP_UPSTREAM_SOURCE_SHA']
+
+    unless ENV['TOP_UPSTREAM_SOURCE_PROJECT']
+      puts "The 'TOP_UPSTREAM_SOURCE_PROJECT' environment variable is missing, cannot post a comment on the upstream #{top_upstream_source_sha} commit."
+      return
+    end
+
+    top_upstream_source_project = ENV['TOP_UPSTREAM_SOURCE_PROJECT']
+
+    status_with_icon =
+      case status
+      when :success
+        "passed. :white_check_mark:"
+      when :failure
+        "failed! :boom:"
+      end
+
+    Gitlab.create_commit_comment(
+      top_upstream_source_project,
+      top_upstream_source_sha,
+      "The [`gitlab-qa` downstream pipeline](#{ENV['CI_PIPELINE_URL']}) #{status_with_icon}")
+  rescue Gitlab::Error::Error => error
+    puts "Ignoring the following error: #{error}"
+  end
+end
+
+status = ARGV[0].to_s.strip
+if status != ''
+  CommitComment.post!(status.to_sym)
+else
+  puts "Please provide a status!"
+end

data/fixtures/ldap/1_add_nodes.ldif

@@ -0,0 +1,7 @@
+dn: ou=Global Groups,dc=example,dc=org
+objectClass: organizationalUnit
+ou: Global Groups
+
+dn: ou=People,ou=Global Groups,dc=example,dc=org
+objectClass: organizationalUnit
+ou: People

data/fixtures/ldap/2_add_users.ldif

@@ -0,0 +1,237 @@
+
+# 1. Human Resources
+
+dn: uid=hruser1,ou=People,ou=Global Groups,dc=example,dc=org
+cn: HR User 1
+givenName: HR
+sn: User1
+uid: hruser1
+uidNumber: 5000
+gidNumber: 10000
+homeDirectory: /home/hruser1
+mail: hruser1@example.org
+objectClass: top
+objectClass: posixAccount
+objectClass: shadowAccount
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+loginShell: /bin/bash
+# hashed value for 'password'
+userPassword: {SSHA}ICMhr6Jxt5bk2awD7HL7GxRTM3BZ1pFI
+
+dn: uid=hruser2,ou=People,ou=Global Groups,dc=example,dc=org
+cn: HR User 2
+givenName: HR
+sn: User2
+uid: hruser2
+uidNumber: 5001
+gidNumber: 10001
+homeDirectory: /home/hruser2
+mail: hruser2@example.org
+objectClass: top
+objectClass: posixAccount
+objectClass: shadowAccount
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+loginShell: /bin/bash
+# hashed value for 'password'
+userPassword: {SSHA}ICMhr6Jxt5bk2awD7HL7GxRTM3BZ1pFI
+
+dn: uid=hruser3,ou=People,ou=Global Groups,dc=example,dc=org
+cn: HR User 3
+givenName: HR
+sn: User3
+uid: hruser3
+uidNumber: 5002
+gidNumber: 10002
+homeDirectory: /home/hruser3
+mail: hruser3@example.org
+objectClass: top
+objectClass: posixAccount
+objectClass: shadowAccount
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+loginShell: /bin/bash
+# hashed value for 'password'
+userPassword: {SSHA}ICMhr6Jxt5bk2awD7HL7GxRTM3BZ1pFI
+
+# 2. Engineering
+
+dn: uid=enguser1,ou=People,ou=Global Groups,dc=example,dc=org
+cn: ENG User 1
+givenName: ENG
+sn: User1
+uid: enguser1
+uidNumber: 5003
+gidNumber: 10003
+homeDirectory: /home/enguser1
+mail: enguser1@example.org
+objectClass: top
+objectClass: posixAccount
+objectClass: shadowAccount
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+loginShell: /bin/bash
+# hashed value for 'password'
+userPassword: {SSHA}ICMhr6Jxt5bk2awD7HL7GxRTM3BZ1pFI
+
+dn: uid=enguser2,ou=People,ou=Global Groups,dc=example,dc=org
+cn: ENG User 2
+givenName: ENG
+sn: User2
+uid: enguser2
+uidNumber: 5004
+gidNumber: 10004
+homeDirectory: /home/enguser2
+mail: enguser2@example.org
+objectClass: top
+objectClass: posixAccount
+objectClass: shadowAccount
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+loginShell: /bin/bash
+# hashed value for 'password'
+userPassword: {SSHA}ICMhr6Jxt5bk2awD7HL7GxRTM3BZ1pFI
+
+dn: uid=enguser3,ou=People,ou=Global Groups,dc=example,dc=org
+cn: ENG User 3
+givenName: ENG
+sn: User3
+uid: enguser3
+uidNumber: 5005
+gidNumber: 10005
+homeDirectory: /home/enguser3
+mail: enguser3@example.org
+objectClass: top
+objectClass: posixAccount
+objectClass: shadowAccount
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+loginShell: /bin/bash
+# hashed value for 'password'
+userPassword: {SSHA}ICMhr6Jxt5bk2awD7HL7GxRTM3BZ1pFI
+
+
+# 3. Security
+
+dn: uid=securityuser1,ou=People,ou=Global Groups,dc=example,dc=org
+cn: Security User 1
+givenName: Security
+sn: User1
+uid: securityuser1
+uidNumber: 5006
+gidNumber: 10006
+homeDirectory: /home/securityuser1
+mail: securityuser1@example.org
+objectClass: top
+objectClass: posixAccount
+objectClass: shadowAccount
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+loginShell: /bin/bash
+# hashed value for 'password'
+userPassword: {SSHA}ICMhr6Jxt5bk2awD7HL7GxRTM3BZ1pFI
+
+dn: uid=securityuser2,ou=People,ou=Global Groups,dc=example,dc=org
+cn: Security User 2
+givenName: Security
+sn: User2
+uid: securityuser2
+uidNumber: 5007
+gidNumber: 10007
+homeDirectory: /home/securityuser2
+mail: securityuser1@example.org
+objectClass: top
+objectClass: posixAccount
+objectClass: shadowAccount
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+loginShell: /bin/bash
+# hashed value for 'password'
+userPassword: {SSHA}ICMhr6Jxt5bk2awD7HL7GxRTM3BZ1pFI
+
+dn: uid=securityuser3,ou=People,ou=Global Groups,dc=example,dc=org
+cn: Security User 3
+givenName: Security
+sn: User3
+uid: securityuser3
+uidNumber: 5008
+gidNumber: 10008
+homeDirectory: /home/securityuser3
+mail: securityuser3@example.org
+objectClass: top
+objectClass: posixAccount
+objectClass: shadowAccount
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+loginShell: /bin/bash
+# hashed value for 'password'
+userPassword: {SSHA}ICMhr6Jxt5bk2awD7HL7GxRTM3BZ1pFI
+
+# 3. Admin
+
+dn: uid=adminuser1,ou=People,ou=Global Groups,dc=example,dc=org
+cn: Admin User 1
+givenName: Admin
+sn: User1
+uid: adminuser1
+uidNumber: 5009
+gidNumber: 10009
+homeDirectory: /home/adminuser1
+mail: adminuser1@example.org
+objectClass: top
+objectClass: posixAccount
+objectClass: shadowAccount
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+loginShell: /bin/bash
+# hashed value for 'password'
+userPassword: {SSHA}ICMhr6Jxt5bk2awD7HL7GxRTM3BZ1pFI
+
+dn: uid=adminuser2,ou=People,ou=Global Groups,dc=example,dc=org
+cn: Admin User 2
+givenName: Admin
+sn: User1
+uid: adminuser2
+uidNumber: 5010
+gidNumber: 10010
+homeDirectory: /home/adminuser2
+mail: adminuser2@example.org
+objectClass: top
+objectClass: posixAccount
+objectClass: shadowAccount
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+loginShell: /bin/bash
+# hashed value for 'password'
+userPassword: {SSHA}ICMhr6Jxt5bk2awD7HL7GxRTM3BZ1pFI
+
+dn: uid=adminuser3,ou=People,ou=Global Groups,dc=example,dc=org
+cn: Admin User 3
+givenName: Admin
+sn: User1
+uid: adminuser3
+uidNumber: 5011
+gidNumber: 10011
+homeDirectory: /home/adminuser3
+mail: adminuser3@example.org
+objectClass: top
+objectClass: posixAccount
+objectClass: shadowAccount
+objectClass: inetOrgPerson
+objectClass: organizationalPerson
+objectClass: person
+loginShell: /bin/bash
+# hashed value for 'password'
+userPassword: {SSHA}ICMhr6Jxt5bk2awD7HL7GxRTM3BZ1pFI

data/fixtures/ldap/3_add_groups.ldif

@@ -0,0 +1,39 @@
+# 1. Human Resources
+
+dn: cn=Human Resources,ou=Global Groups,dc=example,dc=org
+objectClass: groupofnames
+cn: Human Resources
+description: Human Resources
+member: uid=hruser1,ou=People,ou=Global Groups,dc=example,dc=org
+member: uid=hruser2,ou=People,ou=Global Groups,dc=example,dc=org
+member: uid=hruser3,ou=People,ou=Global Groups,dc=example,dc=org
+
+# 2. Engineering
+
+dn: cn=Engineering,ou=Global Groups,dc=example,dc=org
+objectClass: groupofnames
+cn: Engineering
+description: Engineering
+member: uid=enguser1,ou=People,ou=Global Groups,dc=example,dc=org
+member: uid=enguser2,ou=People,ou=Global Groups,dc=example,dc=org
+member: uid=enguser3,ou=People,ou=Global Groups,dc=example,dc=org
+
+# 3. Security
+
+dn: cn=Security,ou=Global Groups,dc=example,dc=org
+objectClass: groupofnames
+cn: Security
+description: Security
+member: uid=securityuser1,ou=People,ou=Global Groups,dc=example,dc=org
+member: uid=securityuser2,ou=People,ou=Global Groups,dc=example,dc=org
+member: uid=securityuser3,ou=People,ou=Global Groups,dc=example,dc=org
+
+# 4. Admin
+
+dn: cn=AdminGroup,ou=Global Groups,dc=example,dc=org
+objectClass: groupofnames
+cn: AdminGroup
+description: Human Resources
+member: uid=adminuser1,ou=People,ou=Global Groups,dc=example,dc=org
+member: uid=adminuser2,ou=People,ou=Global Groups,dc=example,dc=org
+member: uid=adminuser3,ou=People,ou=Global Groups,dc=example,dc=org

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

@@ -30,8 +30,8 @@ module Gitlab
         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=groups,dc=example,dc=org'.freeze
-        ADMIN_GROUP = 'admin'.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
@@ -149,7 +149,7 @@ module Gitlab
               uid: 'uid'
               bind_dn: #{BIND_DN}
               password: #{ADMIN_PASSWORD}
-              method: #{tls? ? 'simple_tls' : 'plain'}
+              encryption: #{tls? ? 'simple_tls' : 'plain'}
               verify_certificates: false
               base: #{BASE_DN}
               user_filter: ''

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

@@ -16,6 +16,8 @@ module Gitlab
               gitlab.omnibus_config = <<~OMNIBUS
                     gitlab_rails['ldap_enabled'] = true;
                     gitlab_rails['ldap_servers'] = #{ldap.to_config};
+                    gitlab_rails['ldap_sync_worker_cron'] = '* * * * *';
+                    gitlab_rails['ldap_group_sync_worker_cron'] = '* * * * *';
               OMNIBUS
             end
           end

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

@@ -19,6 +19,8 @@ module Gitlab
                     gitlab_rails['ldap_servers'] = #{ldap.to_config};
                     letsencrypt['enable'] = false;
                     external_url '#{gitlab.address}';
+                    gitlab_rails['ldap_sync_worker_cron'] = '* * * * *';
+                    gitlab_rails['ldap_group_sync_worker_cron'] = '* * * * *';
               OMNIBUS
             end
           end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '2.7.3'.freeze
+    VERSION = '2.8.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 2.7.3
+  version: 2.8.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-02 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -130,6 +130,7 @@ files:
 - Rakefile
 - bin/console
 - bin/expect_exit_code_and_text
+- bin/notify_upstream_commit
 - bin/qa
 - bin/setup
 - docs/README.md
@@ -140,6 +141,9 @@ files:
 - docs/waits.md
 - docs/what_tests_can_be_run.md
 - exe/gitlab-qa
+- fixtures/ldap/1_add_nodes.ldif
+- fixtures/ldap/2_add_users.ldif
+- fixtures/ldap/3_add_groups.ldif
 - fixtures/ldap/tanuki.ldif
 - gitlab-qa.gemspec
 - lib/gitlab/qa.rb