gitlab-qa 7.25.0 → 7.25.1

data/.gitlab/ci/jobs/service_ping_disabled.gitlab-ci.yml

@@ -0,0 +1,19 @@
+ce:service_ping_disabled:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::ServicePingDisabled"
+
+ee:service_ping_disabled:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::ServicePingDisabled"

data/.gitlab/ci/jobs/smtp.gitlab-ci.yml

@@ -0,0 +1,19 @@
+ce:smtp:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::SMTP"
+
+ee:smtp:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+  variables:
+    QA_SCENARIO: "Test::Integration::SMTP"

data/.gitlab/ci/jobs/staging.gitlab-ci.yml

@@ -0,0 +1,10 @@
+staging:
+  script:
+    - unset EE_LICENSE
+    - 'echo "Running: bundle exec exe/gitlab-qa Test::Instance::Staging ${RELEASE:=$DEFAULT_RELEASE} -- $QA_TESTS $QA_RSPEC_TAGS"'
+    - bundle exec exe/gitlab-qa Test::Instance::Staging ${RELEASE:=$DEFAULT_RELEASE} -- $QA_TESTS $QA_RSPEC_TAGS
+  extends:
+    - .rules:only-qa-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+  allow_failure: true

data/.gitlab/ci/jobs/update.gitlab-ci.yml

@@ -0,0 +1,60 @@
+ce:update-parallel:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-specified
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+    - .update-scenario-script
+  parallel: 5
+
+ce:update:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .rspec-report-opts
+    - .update-scenario-script
+
+ce:update-quarantine:
+  extends:
+    - .rules:ce-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ce-variables
+    - .quarantine
+    - .rspec-report-opts
+    - .update-scenario-script
+  variables:
+    QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated"
+
+ee:update-parallel:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-specified
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+    - .update-scenario-script
+  parallel: 10
+
+ee:update:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change-and-never-when-qa-tests-not-specified
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .rspec-report-opts
+    - .update-scenario-script
+
+ee:update-quarantine:
+  extends:
+    - .rules:ee-never-when-triggered-by-feature-flag-definition-change
+    - .test
+    - .high-capacity
+    - .ee-variables
+    - .quarantine
+    - .rspec-report-opts
+  variables:
+    QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated"

data/.gitlab-ci.yml

@@ -49,7 +49,14 @@ prepare:
   stage: generate
   extends: .rules:never-on-version-change-or-tag
   script:
-    - 'export QA_IMAGE_TAG=${TOP_UPSTREAM_SOURCE_REF:=master} && echo "QA_IMAGE_TAG=$QA_IMAGE_TAG" >> prep_vars.env'
+    - |
+      if [[ $TOP_UPSTREAM_SOURCE_PROJECT == "gitlab-org/gitlab" && -n $TOP_UPSTREAM_SOURCE_REF ]]; then
+        # Replace '\' with '-' and convert to downcase
+        export QA_IMAGE_TAG=$(echo "${TOP_UPSTREAM_SOURCE_REF//\//-}" | tr '[:upper:]' '[:lower:]')
+      else
+        export QA_IMAGE_TAG=master
+      fi
+    - 'echo "QA_IMAGE_TAG=$QA_IMAGE_TAG" >> prep_vars.env'
     - 'echo $QA_IMAGE_TAG'
   artifacts:
     reports:
@@ -58,40 +65,6 @@ prepare:
       - prep_vars.env
 
 generate-jobs:
-  stage: generate
-  extends: .rules:never-on-version-change-or-tag
-  script:
-    # TOP_UPSTREAM_DEFAULT_BRANCH is the default branch name of the original project that triggered a pipeline in this project.
-    - 'export TOP_UPSTREAM_DEFAULT_BRANCH=${TOP_UPSTREAM_DEFAULT_BRANCH:=master} && echo "TOP_UPSTREAM_DEFAULT_BRANCH=$TOP_UPSTREAM_DEFAULT_BRANCH" >> variables.env'
-    - 'echo "RELEASE=$RELEASE" >> variables.env'
-    - 'echo "GITLAB_QA_OPTIONS=$GITLAB_QA_OPTIONS" >> variables.env'
-    - 'echo "QA_TESTS=$QA_TESTS" >> variables.env'
-    - 'echo "KNAPSACK_GENERATE_REPORT=$KNAPSACK_GENERATE_REPORT" >> variables.env'
-    - 'echo "TOP_UPSTREAM_SOURCE_JOB=$TOP_UPSTREAM_SOURCE_JOB" >> variables.env'
-    - 'echo "TOP_UPSTREAM_SOURCE_REF=$TOP_UPSTREAM_SOURCE_REF" >> variables.env'
-    - 'echo "DISABLE_RELATING_FAILURE_ISSUES=$DISABLE_RELATING_FAILURE_ISSUES" >> variables.env'
-    - 'echo "TOP_UPSTREAM_SOURCE_PROJECT=$TOP_UPSTREAM_SOURCE_PROJECT" >> variables.env'
-    - 'echo "TOP_UPSTREAM_SOURCE_SHA=$TOP_UPSTREAM_SOURCE_SHA" >> variables.env'
-    - 'echo "NOTIFY_CHANNEL=$NOTIFY_CHANNEL" >> variables.env'
-    - 'echo "QA_IMAGE=$QA_IMAGE" >> variables.env'
-    - 'echo "EE_LICENSE=$EE_LICENSE" >> variables.env'
-    - 'echo "TOP_UPSTREAM_MERGE_REQUEST_IID=$TOP_UPSTREAM_MERGE_REQUEST_IID" >> variables.env'
-    - 'echo "ALLURE_JOB_NAME=$ALLURE_JOB_NAME" >> variables.env'
-
-    - ./scripts/generate-qa-jobs.rb
-    - cat generated-qa-jobs.yml
-  artifacts:
-    reports:
-      dotenv: variables.env
-    paths:
-      - generated-qa-jobs.yml
-      - variables.env
-    expire_in: 2 days
-  needs:
-    - job: generate-count-example-files
-      artifacts: true
-
-generate-count-example-files:
   stage: generate
   extends: .rules:never-on-version-change-or-tag
   image:
@@ -104,8 +77,9 @@ generate-count-example-files:
   before_script:
     - cd /home/gitlab/qa
   script:
+    # Generate count example files
     - bundle exec bin/qa Test::Instance::All http://dummy.test --count-examples-only -- $QA_TESTS
-    - bundle exec bin/qa Test::Integration::Mattermost http://dummy.test http://mattermost.test --count-examples-only -- $QA_TESTS
+    - bundle exec bin/qa Test::Integration::Mattermost http://dummy.test --mattermost-address http://mattermost.test --count-examples-only -- $QA_TESTS
     - bundle exec bin/qa Test::Integration::ServicePingDisabled http://dummy.test --count-examples-only -- $QA_TESTS
     - bundle exec bin/qa QA::EE::Scenario::Test::Geo --count-examples-only --primary-address http://dummy1.test --primary-name gitlab-primary --secondary-address http://dummy2.test --secondary-name gitlab-secondary --without-setup
     - bundle exec bin/qa Test::Integration::LDAPNoTLS http://dummy.test --count-examples-only -- $QA_TESTS
@@ -127,12 +101,37 @@ generate-count-example-files:
     - bundle exec bin/qa Test::Instance::All http://dummy.test --count-examples-only -- $QA_TESTS --tag can_use_large_setup
     - bundle exec bin/qa Test::Instance::All http://dummy.test --count-examples-only -- $QA_TESTS --tag cloud_activation
     - bundle exec bin/qa Test::Instance::All http://dummy.test --count-examples-only -- $QA_TESTS --tag object_storage
-
     - cp -r no_of_examples $CI_PROJECT_DIR
+
+    # TOP_UPSTREAM_DEFAULT_BRANCH is the default branch name of the original project that triggered a pipeline in this project.
+    - 'export TOP_UPSTREAM_DEFAULT_BRANCH=${TOP_UPSTREAM_DEFAULT_BRANCH:=master} && echo "TOP_UPSTREAM_DEFAULT_BRANCH=$TOP_UPSTREAM_DEFAULT_BRANCH" >> variables.env'
+    - 'echo "RELEASE=$RELEASE" >> variables.env'
+    - 'echo "GITLAB_QA_OPTIONS=$GITLAB_QA_OPTIONS" >> variables.env'
+    - 'echo "QA_TESTS=$QA_TESTS" >> variables.env'
+    - 'echo "KNAPSACK_GENERATE_REPORT=$KNAPSACK_GENERATE_REPORT" >> variables.env'
+    - 'echo "TOP_UPSTREAM_SOURCE_JOB=$TOP_UPSTREAM_SOURCE_JOB" >> variables.env'
+    - 'echo "TOP_UPSTREAM_SOURCE_REF=$TOP_UPSTREAM_SOURCE_REF" >> variables.env'
+    - 'echo "DISABLE_RELATING_FAILURE_ISSUES=$DISABLE_RELATING_FAILURE_ISSUES" >> variables.env'
+    - 'echo "TOP_UPSTREAM_SOURCE_PROJECT=$TOP_UPSTREAM_SOURCE_PROJECT" >> variables.env'
+    - 'echo "TOP_UPSTREAM_SOURCE_SHA=$TOP_UPSTREAM_SOURCE_SHA" >> variables.env'
+    - 'echo "NOTIFY_CHANNEL=$NOTIFY_CHANNEL" >> variables.env'
+    - 'echo "QA_IMAGE=$QA_IMAGE" >> variables.env'
+    - 'echo "EE_LICENSE=$EE_LICENSE" >> variables.env'
+    - 'echo "TOP_UPSTREAM_MERGE_REQUEST_IID=$TOP_UPSTREAM_MERGE_REQUEST_IID" >> variables.env'
+    - 'echo "ALLURE_JOB_NAME=$ALLURE_JOB_NAME" >> variables.env'
+    - mv variables.env $CI_PROJECT_DIR
+
+    - cd $CI_PROJECT_DIR
+    - ./scripts/generate-qa-jobs.rb
+    - cat generated-qa-jobs.yml
   artifacts:
+    reports:
+      dotenv: variables.env
     paths:
+      - generated-qa-jobs.yml
+      - variables.env
       - no_of_examples
-  allow_failure: true
+    expire_in: 2 days
 
 trigger-generated-jobs:
   stage: triggers

data/bin/notify_upstream

@@ -0,0 +1,98 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'gitlab'
+
+# Default to "Multi-pipeline (from 'gitlab-org/gitlab-qa' 'notify_upstream:*' jobs)" from current project
+api_token = ENV.fetch('GITLAB_QA_PROJECT_ACCESS_TOKEN') do
+  puts "The $GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN variable is deprecated in favor of a dedicated project access token: $GITLAB_QA_PROJECT_ACCESS_TOKEN."
+  puts "See https://gitlab.com/groups/gitlab-org/quality/-/epics/17 for more details."
+  ENV['GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN']
+end
+
+# Configure credentials to be used with gitlab gem
+Gitlab.configure do |config|
+  config.endpoint = 'https://gitlab.com/api/v4'
+  config.private_token = api_token
+end
+
+class CommitComment
+  UPSTREAM_COMMENT = <<~COMMENT
+    - The [`gitlab-qa-mirror` downstream pipeline](%<pipeline_url>s) for https://gitlab.com/%<project_path>s/-/merge_requests/%<mr_iid>s/diffs?commit_id=%<commit_sha>s %<status_with_icon>s
+  COMMENT
+  IDENTIFIABLE_NOTE_TAG = 'gitlab-qa:upstream-notification-note'
+
+  def self.mr?
+    ENV.key?('TOP_UPSTREAM_SOURCE_PROJECT') &&
+      ENV.key?('TOP_UPSTREAM_MERGE_REQUEST_IID') &&
+      ENV.key?('TOP_UPSTREAM_SOURCE_SHA') &&
+      !ENV['TOP_UPSTREAM_SOURCE_PROJECT'].to_s.empty? &&
+      !ENV['TOP_UPSTREAM_MERGE_REQUEST_IID'].to_s.empty? &&
+      !ENV['TOP_UPSTREAM_SOURCE_SHA'].to_s.empty?
+  end
+
+  def self.post!(status)
+    unless mr?
+      puts "All the 'TOP_UPSTREAM_SOURCE_PROJECT', 'TOP_UPSTREAM_MERGE_REQUEST_IID', and 'TOP_UPSTREAM_SOURCE_SHA' environment variables need to be present. We cannot post a comment on the upstream merge request."
+      return
+    end
+
+    # Look for an existing note
+    upstream_notification_note = Gitlab.merge_request_notes(project_path, mr_iid).auto_paginate.find do |note|
+      note.body.include?(IDENTIFIABLE_NOTE_TAG)
+    end
+
+    if upstream_notification_note
+      Gitlab.edit_merge_request_note(project_path, mr_iid, upstream_notification_note.id, [upstream_notification_note.body, build_comment(status)].join("\n"))
+    else
+      Gitlab.create_merge_request_comment(project_path, mr_iid, "<!-- #{IDENTIFIABLE_NOTE_TAG} -->\n#{build_comment(status)}")
+    end
+  rescue Gitlab::Error::Error => error
+    puts "Ignoring the following error: #{error}"
+  end
+
+  def self.project_path
+    ENV['TOP_UPSTREAM_SOURCE_PROJECT']
+  end
+
+  def self.mr_iid
+    ENV['TOP_UPSTREAM_MERGE_REQUEST_IID']
+  end
+
+  def self.pipeline_url
+    ENV['CI_PIPELINE_URL']
+  end
+
+  def self.commit_sha
+    ENV['TOP_UPSTREAM_SOURCE_SHA']
+  end
+
+  def self.build_comment(status)
+    format(UPSTREAM_COMMENT,
+      project_path: project_path,
+      mr_iid: mr_iid,
+      pipeline_url: pipeline_url,
+      status_with_icon: status_with_icon(status),
+      commit_sha: commit_sha
+    )
+  end
+
+  def self.status_with_icon(status)
+    case status
+    when :success
+      "passed. :white_check_mark:"
+    when :failure
+      "failed! :boom:"
+    end
+  end
+
+  def self.post_to_mr(project_id, mr_iid, comment)
+    Gitlab.create_merge_request_comment(project_id, mr_iid, comment)
+  end
+end
+
+status = ARGV.shift.to_s.strip
+
+abort "Please provide a status!" if status == ''
+
+CommitComment.post!(status.to_sym)

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

@@ -124,7 +124,6 @@ module Gitlab
 
           return unless docker.running?(name)
 
-          docker.stop(name)
           docker.remove(name)
         end
 

data/lib/gitlab/qa/report/relate_failure_issue.rb

@@ -47,7 +47,7 @@ module Gitlab
           puts "  => Searching issues for test '#{test.name}'..."
 
           begin
-            issue = find_and_link_issue(test) || create_issue(test)
+            issue = test.quarantine? ? find_and_link_issue(test) : find_and_link_issue(test) || create_issue(test)
             return unless issue
 
             update_labels(issue, test)

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

@@ -217,7 +217,7 @@ module Gitlab
         end
 
         def elastic_version
-          env_var_value_if_defined('ELASTIC_VERSION') || '6.4.2'.freeze
+          env_var_value_if_defined('ELASTIC_VERSION') || '7.17.0'.freeze
         end
 
         def require_license!

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

@@ -22,7 +22,11 @@ module Gitlab
                     specs.suite = 'Test::Integration::Mattermost'
                     specs.release = gitlab.release
                     specs.network = gitlab.network
-                    specs.args = [gitlab.address, mattermost_external_url, *rspec_args]
+                    specs.args = [
+                      gitlab.address,
+                      "--mattermost-address", mattermost_external_url,
+                      *rspec_args
+                    ]
                   end
                 end
               end

data/lib/gitlab/qa/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module QA
-    VERSION = '7.25.0'
+    VERSION = '7.25.1'
   end
 end