gitlab-qa 6.21.1 → 6.21.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f8a36d980bf03f5cc9921cf6f53417c3af1af1d9302d715c94ea018dcd38a0a
-  data.tar.gz: 07e3a718fde1037351f7e29cf6fabb9d35f757c50117f308881fb9474ede00eb
+  metadata.gz: c989cb7d8d8a3c9eb94835b3a7c274a4632827f3a32998b8f09a4c450a171917
+  data.tar.gz: 130448315ffff85c9be03face027934d3fbd35f1f2d7039c8188622bed464acc
 SHA512:
-  metadata.gz: 77847c2c836aedb6f8e84c7424d8b124b7387d3c23bc658cf87b1a588217d33b6f81bdee77cb3302cfc937f2768a426f4a39315a57f66330c5e221e8f225243e
-  data.tar.gz: 797673f38b45c0b209cd49388fddb04cad19d7fce1af3105ed173e72469ab39de04a98962de905de93653426cd67e1a65c858ada146366291ceb394b8e8be1ff
+  metadata.gz: 4d1471f8093cb11cb9a47ce450b46ea2bf358365a89e3bb4ec0831f10f489a4034b36eea079c6e8ea05876834e039c8ce429298340e2934974932eb5ee483b97
+  data.tar.gz: 06b4bd542227007156a4bd7f16dc5f263ae0054ad985348b256faa9e4412943995351a5ffb4dda78c0b650a9e30579b1b7efbc0cbcc5a36c1fe645daa7d0a091

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

@@ -26,8 +26,7 @@ module Gitlab
                       external_url '#{tunnel_gitlab.url}';
                       nginx['listen_port'] = 80;
                       nginx['listen_https'] = false;
-                      # documentation: https://docs.gitlab.com/omnibus/settings/database.html#seed-the-database-fresh-installs-only
-                      gitlab_rails['initial_root_password'] = '#{Runtime::Env.require_initial_password!}'
+                      gitlab_rails['initial_root_password'] = '#{Runtime::Env.require_initial_password!}';
 
                       registry_external_url '#{tunnel_registry.url}';
                       registry_nginx['listen_port'] = 80;

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

@@ -1,6 +1,7 @@
 require 'json'
 require 'net/http'
 require 'cgi'
+require 'time'
 
 module Gitlab
   module QA
@@ -8,14 +9,10 @@ module Gitlab
       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.
+          # the window defined by the `weekday_hours` method.
+          # We perform a single API call to get the commit
           class Version < Scenario::Template
-            HOURS_AGO = 24
-            COMMITS = 10_000
-
-            def perform(release)
+            def perform(release = 'ce')
               version = Component::Gitlab.perform do |gitlab|
                 gitlab.release = release
                 gitlab.act do
@@ -25,9 +22,9 @@ module Gitlab
               end
 
               project = "gitlab-org/#{QA::Release.new(release).api_project_name}"
-              commit = recent_commits(project).find { |c| c['id'] == version }
+              commit = api_commit_detail(project, version)
 
-              if commit
+              if commit_within_hours?(commit['created_at'], weekday_hours(commit['created_at']))
                 puts "Found commit #{version} in recent history of #{project}"
               else
                 puts "Did not find #{version} in recent history of #{project}"
@@ -37,14 +34,28 @@ module Gitlab
 
             private
 
-            def recent_commits(project)
+            def weekday_hours(date_string)
+              case Date.parse(date_string).wday
+                # Sunday
+              when 0
+                48
+                # Monday
+              when 1
+                72
+              else
+                24
+              end
+            end
+
+            def commit_within_hours?(commit_time_string, hours)
+              Time.at(Time.parse(commit_time_string).utc).to_datetime > Time.at((Time.now - hours * 60 * 60).utc).to_datetime
+            end
+
+            def api_commit_detail(project, commit_id)
               api = 'https://gitlab.com/api/v4'
-              url = "#{api}/projects/#{CGI.escape(project)}/repository/commits"
-              since = (Time.now - HOURS_AGO * 60 * 60).strftime('%FT%T')
+              url = "#{api}/projects/#{CGI.escape(project)}/repository/commits/#{commit_id}"
 
-              uri = URI(url)
-              uri.query = URI.encode_www_form(since: since, per_page: COMMITS)
-              JSON.parse(Net::HTTP.get(uri))
+              JSON.parse(Net::HTTP.get(URI(url)))
             end
           end
         end

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '6.21.1'.freeze
+    VERSION = '6.21.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 6.21.1
+  version: 6.21.2
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control