gitlab-qa 4.16.0 → 4.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44176b72e05747e12a5771aee22efe598eb5e011084e1ba9c6321ce9b4e31223
-  data.tar.gz: e027918ad570725dcd3bea734e93ac3c2585ae26b43aa7ce27345ff127b46d6b
+  metadata.gz: 5672c0e755fe027bb4848cb20e9df5b67c43d9855411e46c72ffc4d0c8b960c2
+  data.tar.gz: c0994879e81941382496597036a79067f0e959f197a98ba2852162f6f98134a7
 SHA512:
-  metadata.gz: 3fff8c026a55a8a7021bda1d2b6af3a8b1b59ed604bdc1be7645a833ab6b80f5a2e88ed3d70d98ea0c1d8f9616f7e41b3c4ca8d51f693f0ad62c217d9c5a3b3a
-  data.tar.gz: 25c308f137ce4b048bf0ecc6c4defa078b7a4ceb3528a3a9cde54c68ab70e20c4d671ff8966551ed5f49b80b157ac38b6727192ae66961900b42d956d816440c
+  metadata.gz: 833284d43adec815bf2fe2c518d88c3d3786200f17fa4234d949a90ffc9602752846106c821532a1932dcccbbcc16cb5e1e42ae8e6c6b352356229683143cad2
+  data.tar.gz: 07a4d40365d3e56e9e0f5a8ecd49a5658274691d0fe2c8a64310be30075851a78d28941a31566016a32c41dc828cf5769e7475d7ebed2403c932c4e37a065ea8

data/.gitignore

@@ -8,6 +8,8 @@
 /spec/reports/
 /tmp/
 /.idea
+.ruby-version
+.ruby-gemset
 
 # ignore built gems
 *.gem

data/.gitlab-ci.yml

@@ -57,6 +57,8 @@ check:rspec:
     expire_in: 10d
     paths:
       - ./gitlab-qa-run-*
+    reports:
+      junit: gitlab-qa-run-*/**/rspec-*.xml
 
 .ce-qa:
   only:
@@ -92,6 +94,10 @@ check:rspec:
     FILE_SAFE_JOB_NAME: $(echo $CI_JOB_NAME | sed 's/[ /]/_/g')
     RSPEC_REPORT_OPTS: "--format RspecJunitFormatter --out \"tmp/rspec-${CI_JOB_ID}.xml\" --format html --out \"tmp/rspec-${FILE_SAFE_JOB_NAME}.htm\" --color --format documentation"
 
+.quarantine:
+  allow_failure: true
+  when: manual
+
 ce:sanity-framework:
   script:
     - ./bin/expect_exit_code_and_text "exe/gitlab-qa Test::Instance::Image ${RELEASE:=CE} -- --tag framework" 1 "2 examples, 1 failure"
@@ -108,6 +114,26 @@ ee:sanity-framework:
     - .high-capacity
     - .ee-qa
 
+ce:custom:
+  script:
+    - exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=CE} -- ${QA_TESTS} ${QA_RSPEC_TAGS} $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .rspec-report-opts
+  when: manual
+
+ee:custom:
+  script:
+    - exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=EE} -- ${QA_TESTS} ${QA_RSPEC_TAGS} $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .rspec-report-opts
+  when: manual
+
 ce:instance:
   script:
     - exe/gitlab-qa Test::Instance::Image ${RELEASE:=CE} -- $RSPEC_REPORT_OPTS
@@ -119,6 +145,16 @@ ce:instance:
     - .rspec-report-opts
   parallel: 5
 
+ce:instance-quarantine:
+  script:
+    - exe/gitlab-qa Test::Instance::Image ${RELEASE:=CE} -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ee:instance:
   script:
     - exe/gitlab-qa Test::Instance::Image ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
@@ -130,6 +166,16 @@ ee:instance:
     - .rspec-report-opts
   parallel: 5
 
+ee:instance-quarantine:
+  script:
+    - exe/gitlab-qa Test::Instance::Image ${RELEASE:=EE} -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ce:docker:
   script:
     - exe/gitlab-qa Test::Instance::Image ${RELEASE:=CE} -- --tag docker $RSPEC_REPORT_OPTS
@@ -159,6 +205,16 @@ ce:relative_url:
     - .rspec-report-opts
   parallel: 5
 
+ce:relative_url-quarantine:
+  script:
+    - exe/gitlab-qa Test::Instance::RelativeUrl ${RELEASE:=CE} -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ee:relative_url:
   script:
     - exe/gitlab-qa Test::Instance::RelativeUrl ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
@@ -170,6 +226,16 @@ ee:relative_url:
     - .rspec-report-opts
   parallel: 5
 
+ee:relative_url-quarantine:
+  script:
+    - exe/gitlab-qa Test::Instance::RelativeUrl ${RELEASE:=EE} -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ce:image:
   script:
     - exe/gitlab-qa Test::Omnibus::Image ${RELEASE:=CE}
@@ -195,6 +261,16 @@ ce:update:
     - .knapsack-variables
   parallel: 5
 
+ce:update-quarantine:
+  script:
+    - exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=CE} ${RELEASE:=CE} -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ee:update:
   script:
     - exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=EE} ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
@@ -206,6 +282,16 @@ ee:update:
     - .knapsack-variables
   parallel: 5
 
+ee:update-quarantine:
+  script:
+    - exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=EE} ${RELEASE:=EE} -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ce:upgrade:
   script:
     - exe/gitlab-qa Test::Omnibus::Upgrade CE -- $RSPEC_REPORT_OPTS
@@ -217,6 +303,16 @@ ce:upgrade:
     - .knapsack-variables
   parallel: 5
 
+ce:upgrade-quarantine:
+  script:
+    - exe/gitlab-qa Test::Omnibus::Upgrade CE -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .only-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ee-previous-to-ce:update:
   script:
     - exe/gitlab-qa Test::Omnibus::Update EE CE -- $RSPEC_REPORT_OPTS
@@ -226,6 +322,16 @@ ee-previous-to-ce:update:
     - .only-qa
     - .rspec-report-opts
 
+ee-previous-to-ce:update-quarantine:
+  script:
+    - exe/gitlab-qa Test::Omnibus::Update EE CE -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .only-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ce:mattermost:
   script:
     - exe/gitlab-qa Test::Integration::Mattermost ${RELEASE:=CE} -- $RSPEC_REPORT_OPTS
@@ -235,6 +341,16 @@ ce:mattermost:
     - .ce-qa
     - .rspec-report-opts
 
+ce:mattermost-quarantine:
+  script:
+    - exe/gitlab-qa Test::Integration::Mattermost ${RELEASE:=CE} -- --tag quarantine $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ee:mattermost:
   script:
     - exe/gitlab-qa Test::Integration::Mattermost ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
@@ -244,6 +360,16 @@ ee:mattermost:
     - .ee-qa
     - .rspec-report-opts
 
+ee:mattermost-quarantine:
+  script:
+    - exe/gitlab-qa Test::Integration::Mattermost ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ee:geo:
   script:
     - exe/gitlab-qa Test::Integration::Geo ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
@@ -253,6 +379,16 @@ ee:geo:
     - .ee-qa
     - .rspec-report-opts
 
+ee:geo-quarantine:
+  script:
+    - exe/gitlab-qa Test::Integration::Geo ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ce:ldap_no_tls:
   script:
     - exe/gitlab-qa Test::Integration::LDAPNoTLS ${RELEASE:=CE} -- $RSPEC_REPORT_OPTS
@@ -262,6 +398,16 @@ ce:ldap_no_tls:
     - .ce-qa
     - .rspec-report-opts
 
+ce:ldap_no_tls-quarantine:
+  script:
+    - exe/gitlab-qa Test::Integration::LDAPNoTLS ${RELEASE:=CE} -- --tag quarantine $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ee:ldap_no_tls:
   script:
     - exe/gitlab-qa Test::Integration::LDAPNoTLS ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
@@ -271,6 +417,16 @@ ee:ldap_no_tls:
     - .ee-qa
     - .rspec-report-opts
 
+ee:ldap_no_tls-quarantine:
+  script:
+    - exe/gitlab-qa Test::Integration::LDAPNoTLS ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ce:ldap_tls:
   script:
     - exe/gitlab-qa Test::Integration::LDAPTLS ${RELEASE:=CE} -- $RSPEC_REPORT_OPTS
@@ -280,6 +436,16 @@ ce:ldap_tls:
     - .ce-qa
     - .rspec-report-opts
 
+ce:ldap_tls-quarantine:
+  script:
+    - exe/gitlab-qa Test::Integration::LDAPTLS ${RELEASE:=CE} -- --tag quarantine $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ee:ldap_tls:
   script:
     - exe/gitlab-qa Test::Integration::LDAPTLS ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
@@ -289,6 +455,16 @@ ee:ldap_tls:
     - .ee-qa
     - .rspec-report-opts
 
+ee:ldap_tls-quarantine:
+  script:
+    - exe/gitlab-qa Test::Integration::LDAPTLS ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ee:ldap_no_server:
   script:
     - exe/gitlab-qa Test::Integration::LDAPNoServer ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
@@ -298,6 +474,16 @@ ee:ldap_no_server:
     - .ee-qa
     - .rspec-report-opts
 
+ee:ldap_no_server-quarantine:
+  script:
+    - exe/gitlab-qa Test::Integration::LDAPNoServer ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ce:instance_saml:
   script:
     - exe/gitlab-qa Test::Integration::InstanceSAML ${RELEASE:=CE} -- $RSPEC_REPORT_OPTS
@@ -307,6 +493,16 @@ ce:instance_saml:
     - .ce-qa
     - .rspec-report-opts
 
+ce:instance_saml-quarantine:
+  script:
+    - exe/gitlab-qa Test::Integration::InstanceSAML ${RELEASE:=CE} -- --tag quarantine $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ee:instance_saml:
   script:
     - exe/gitlab-qa Test::Integration::InstanceSAML ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
@@ -316,6 +512,16 @@ ee:instance_saml:
     - .ee-qa
     - .rspec-report-opts
 
+ee:instance_saml-quarantine:
+  script:
+    - exe/gitlab-qa Test::Integration::InstanceSAML ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ee:group_saml:
   script:
     - exe/gitlab-qa Test::Integration::GroupSAML ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
@@ -325,6 +531,16 @@ ee:group_saml:
     - .ee-qa
     - .rspec-report-opts
 
+ee:group_saml-quarantine:
+  script:
+    - exe/gitlab-qa Test::Integration::GroupSAML ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ce:kubernetes:
   script:
     - exe/gitlab-qa Test::Integration::Kubernetes ${RELEASE:=CE} -- $RSPEC_REPORT_OPTS
@@ -334,6 +550,16 @@ ce:kubernetes:
     - .ce-qa
     - .rspec-report-opts
 
+ce:kubernetes-quarantine:
+  script:
+    - exe/gitlab-qa Test::Integration::Kubernetes ${RELEASE:=CE} -- --tag quarantine $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ee:kubernetes:
   script:
     - exe/gitlab-qa Test::Integration::Kubernetes ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
@@ -343,6 +569,16 @@ ee:kubernetes:
     - .ee-qa
     - .rspec-report-opts
 
+ee:kubernetes-quarantine:
+  script:
+    - exe/gitlab-qa Test::Integration::Kubernetes ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ce:object_storage:
   script:
     - exe/gitlab-qa Test::Integration::ObjectStorage ${RELEASE:=CE} -- $RSPEC_REPORT_OPTS
@@ -352,6 +588,16 @@ ce:object_storage:
     - .ce-qa
     - .rspec-report-opts
 
+ce:object_storage-quarantine:
+  script:
+    - exe/gitlab-qa Test::Integration::ObjectStorage ${RELEASE:=CE} -- --tag quarantine $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ee:object_storage:
   script:
     - exe/gitlab-qa Test::Integration::ObjectStorage ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
@@ -361,6 +607,16 @@ ee:object_storage:
     - .ee-qa
     - .rspec-report-opts
 
+ee:object_storage-quarantine:
+  script:
+    - exe/gitlab-qa Test::Integration::ObjectStorage ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ce:oauth:
   script:
     - exe/gitlab-qa Test::Integration::OAuth ${RELEASE:=CE} -- $RSPEC_REPORT_OPTS
@@ -370,6 +626,16 @@ ce:oauth:
     - .ce-qa
     - .rspec-report-opts
 
+ce:oauth-quarantine:
+  script:
+    - exe/gitlab-qa Test::Integration::OAuth ${RELEASE:=CE} -- --tag quarantine $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ce-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ee:oauth:
   script:
     - exe/gitlab-qa Test::Integration::OAuth ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
@@ -379,6 +645,16 @@ ee:oauth:
     - .ee-qa
     - .rspec-report-opts
 
+ee:oauth-quarantine:
+  script:
+    - exe/gitlab-qa Test::Integration::OAuth ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ee:packages:
   script:
     - exe/gitlab-qa Test::Integration::Packages ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
@@ -388,6 +664,16 @@ ee:packages:
     - .ee-qa
     - .rspec-report-opts
 
+ee:packages-quarantine:
+  script:
+    - exe/gitlab-qa Test::Integration::Packages ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ee:elasticsearch:
   script:
     - exe/gitlab-qa Test::Integration::Elasticsearch ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS
@@ -397,6 +683,16 @@ ee:elasticsearch:
     - .ee-qa
     - .rspec-report-opts
 
+ee:elasticsearch-quarantine:
+  script:
+    - exe/gitlab-qa Test::Integration::Elasticsearch ${RELEASE:=EE} -- --tag quarantine $RSPEC_REPORT_OPTS
+  extends:
+    - .test
+    - .high-capacity
+    - .ee-qa
+    - .quarantine
+    - .rspec-report-opts
+
 ce:praefect:
   script:
     - exe/gitlab-qa Test::Integration::Praefect ${RELEASE:=CE} -- $RSPEC_REPORT_OPTS
@@ -439,50 +735,27 @@ ee:smtp:
     - .ee-qa
     - .rspec-report-opts
 
-.report-base:
-  image: ruby:2.6-alpine
-  variables:
-    BASE_ARTIFACT_URL: "${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/file/"
-    COMBINED_REPORT: combined-report.html
-  artifacts:
-    when: always
-    paths:
-      - gitlab-qa-run-*
-      - combined-report.html
-    reports:
-      junit: gitlab-qa-run-*/**/rspec-*.xml
-  allow_failure: true
-  when: always
-  before_script:
-    - apk add --update build-base libxml2-dev libxslt-dev git && rm -rf /var/cache/apk/*
-    - gem install nokogiri gitlab --no-document
-    - cd gitlab-qa-run-*/gitlab-*
-    - ARTIFACT_DIRS=$(pwd |rev| awk -F / '{print $1,$2}' | rev | sed s_\ _/_)
-    - cd -
-    - '[[ -f $COMBINED_REPORT ]] || echo "{}" > ${COMBINED_REPORT}'
-    - bin/merge_html_reports ${COMBINED_REPORT} ${BASE_ARTIFACT_URL}${ARTIFACT_DIRS} gitlab-qa-run-*/**/rspec-*.htm
-
 .notify_upstream_commit:
   stage: notify
   except:
     variables:
       - $TOP_UPSTREAM_SOURCE_PROJECT == null
       - $TOP_UPSTREAM_SOURCE_SHA == null
+  before_script:
+    - gem install gitlab --no-document
 
 notify_upstream_commit:success:
   extends:
-    - .report-base
     - .notify_upstream_commit
   script:
-    - bin/notify_upstream_commit success ${COMBINED_REPORT}
+    - bin/notify_upstream_commit success
   when: on_success
 
 notify_upstream_commit:failure:
   extends:
-    - .report-base
     - .notify_upstream_commit
   script:
-    - bin/notify_upstream_commit failure ${COMBINED_REPORT}
+    - bin/notify_upstream_commit failure
   when: on_failure
 
 # This job requires the `GITLAB_QA_ACCESS_TOKEN` and `GITLAB_QA_DEV_ACCESS_TOKEN`
@@ -520,17 +793,19 @@ release:
   cache: {}
   before_script:
     - apk update && apk add git curl bash
-  only:
-    variables:
-      - $TOP_UPSTREAM_SOURCE_JOB && $NOTIFY_CHANNEL
 
 notify_slack:
   extends:
     - .notify_slack
+  only:
+    variables:
+      - $TOP_UPSTREAM_SOURCE_JOB && $NOTIFY_CHANNEL
+      - $TOP_UPSTREAM_SOURCE_JOB && $TOP_UPSTREAM_SOURCE_REF == 'master'
   script:
-    - echo "NOTIFY_CHANNEL is $NOTIFY_CHANNEL"
-    - echo "RELEASE is $RELEASE"
+    - export RELEASE=${TOP_UPSTREAM_SOURCE_REF:-$RELEASE}
+    - echo "NOTIFY_CHANNEL is ${NOTIFY_CHANNEL:=qa-$TOP_UPSTREAM_SOURCE_REF}"
+    - echo "RELEASE is ${RELEASE}"
     - echo "CI_PIPELINE_URL is $CI_PIPELINE_URL"
     - echo "TOP_UPSTREAM_SOURCE_JOB is $TOP_UPSTREAM_SOURCE_JOB"
-    - bin/slack $NOTIFY_CHANNEL "☠️ Pipeline against $RELEASE failed! ☠️ See $CI_PIPELINE_URL (triggered from $TOP_UPSTREAM_SOURCE_JOB)" ci_failing
+    - bin/slack $NOTIFY_CHANNEL "☠️ QA against $RELEASE failed! ☠️ See $CI_PIPELINE_URL (triggered from $TOP_UPSTREAM_SOURCE_JOB)" ci_failing
   when: on_failure

data/bin/notify_upstream_commit

@@ -10,7 +10,7 @@ Gitlab.configure do |config|
 end
 
 class CommitComment
-  def self.post!(status, report_file_name)
+  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
@@ -40,8 +40,6 @@ class CommitComment
       top_upstream_source_sha,
       <<~COMMENT
         The [`gitlab-qa` downstream pipeline](#{ENV['CI_PIPELINE_URL']}) #{status_with_icon}.
-
-        You can download a report of the test results: [`#{report_file_name}`](#{ENV['CI_JOB_URL']}/artifacts/raw/#{report_file_name})
       COMMENT
     )
   rescue Gitlab::Error::Error => error
@@ -50,9 +48,7 @@ class CommitComment
 end
 
 status = ARGV.shift.to_s.strip
-report_file_name = ARGV.shift.to_s.strip
 
 abort "Please provide a status!" if status == ''
-abort "Please provide a file name for the report!" if report_file_name == ''
 
-CommitComment.post!(status.to_sym, report_file_name)
+CommitComment.post!(status.to_sym)

data/docs/run_qa_against_gdk.md

@@ -34,6 +34,16 @@ make a few changes to your `gdk/gitlab/config/gitlab.yml` file.
   # Then in gitlab-qa:
   $ exe/gitlab-qa Test::Instance::Any gitlab/gitlab-ce:your-custom-tag http://192.168.0.12:3000 -- qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb
   ```
+  
+### Running EE tests
+
+When running EE tests you'll need to have a license available. GitLab engineers can [request a license](https://about.gitlab.com/handbook/developer-onboarding/#working-on-gitlab-ee).
+
+Once you have the license file you can export it as an environment variable and then `gitlab-qa` can use it. If you do so it will be installed automatically by the QA framework.
+
+```
+export EE_LICENSE=$(cat /path/to/gitlab_license)
+```
 
 ## Run Geo QA tests against your Geo GDK setup
 

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

@@ -12,7 +12,7 @@ module Gitlab
         include Scenario::Actable
 
         attr_reader :release, :docker
-        attr_accessor :volumes, :network, :environment, :tls
+        attr_accessor :volumes, :network, :environment, :tls, :disable_animations
         attr_writer :name, :relative_path, :exec_commands
 
         def_delegators :release, :tag, :image, :edition
@@ -25,6 +25,7 @@ module Gitlab
           @environment = {}
           @volumes = {}
           @network_aliases = []
+          @disable_animations = true
 
           @volumes[CERTIFICATES_PATH] = SSL_PATH
 
@@ -87,6 +88,8 @@ module Gitlab
         alias_method :launch_and_teardown_instance, :instance
 
         def prepare
+          setup_disable_animations if disable_animations
+
           @docker.pull(image, tag) unless Runtime::Env.skip_pull?
 
           return if @docker.network_exists?(network)
@@ -94,6 +97,10 @@ module Gitlab
           @docker.network_create(network)
         end
 
+        def setup_disable_animations
+          @environment['GITLAB_OMNIBUS_CONFIG'] = "gitlab_rails['gitlab_disable_animations'] = true; #{@environment['GITLAB_OMNIBUS_CONFIG'] || ''}"
+        end
+
         def start # rubocop:disable Metrics/AbcSize
           ensure_configured!
 

data/lib/gitlab/qa/release.rb

@@ -22,16 +22,16 @@ module Gitlab
       }xi
 
       # Official dev tag example:
-      #  12.5.4-ee
-      # |------|--|
-      #   |      |
-      #   |      |
-      #   |      |
-      #   |   edition
+      #  12.5.4(-rc42)-ee
+      # |-------------|--|
+      #   |             |
+      #   |             |
+      #   |             |
+      #   |          edition
       # version
       DEV_OFFICIAL_TAG_REGEX = /
         \A
-          (?<version>\d+\.\d+.\d+)-(?<edition>ce|ee)
+          (?<version>\d+\.\d+.\d+(?:-rc\d+)?)-(?<edition>ce|ee)
         \z
       /xi
 

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

@@ -101,7 +101,7 @@ module Gitlab
           vars = {}
 
           ENV_VARIABLES.each do |name, attribute|
-            # Variables that are overriden in the environment take precedence
+            # Variables that are overridden in the environment take precedence
             # over the defaults specified by the QA runtime.
             value = env_value_if_defined(name) || send(attribute) # rubocop:disable GitlabSecurity/PublicSend
             vars[name] = value if value

data/lib/gitlab/qa/scenario/test/instance/relative_url.rb

@@ -11,7 +11,7 @@ module Gitlab
                 gitlab.relative_path = '/relative'
 
                 gitlab.omnibus_config = <<~OMNIBUS
-                  external_url '#{gitlab.address}'
+                  external_url '#{gitlab.address}';
                 OMNIBUS
 
                 gitlab.instance do

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

@@ -14,7 +14,7 @@ module Gitlab
 
                 gitlab.add_network_alias(mattermost_hostname)
                 gitlab.omnibus_config = <<~OMNIBUS
-                  mattermost_external_url '#{mattermost_external_url}'
+                  mattermost_external_url '#{mattermost_external_url}';
                 OMNIBUS
 
                 gitlab.instance do

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

@@ -17,7 +17,7 @@ module Gitlab
               gitlab.omnibus_config = <<~OMNIBUS
                     gitlab_rails['smtp_enable'] = true;
                     gitlab_rails['smtp_address'] = '#{mail_hog.hostname}';
-                    gitlab_rails['smtp_port'] = 1025
+                    gitlab_rails['smtp_port'] = 1025;
               OMNIBUS
             end
 

data/lib/gitlab/qa/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module QA
-    VERSION = '4.16.0'.freeze
+    VERSION = '4.17.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-qa
 version: !ruby/object:Gem::Version
-  version: 4.16.0
+  version: 4.17.0
 platform: ruby
 authors:
 - Grzegorz Bizon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2020-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: climate_control
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Integration tests for GitLab