Resolve merge conflicts

# Conflicts:
#   charts/gitlab/charts/gitlab-exporter/Chart.yaml
20 jobs for deps/69b928e-bb3e271 in 111 minutes and 47 seconds (queued for 39 minutes and 1 second)
Status Job ID Name Coverage
  Prepare
passed #541637395
check_docs_lint

00:01:30

passed #541637394
danger-review

00:00:43

 
  Review
manual #541637401
allowed to fail manual
review-docs-cleanup
manual #541637400
allowed to fail manual
review-docs-deploy
passed #541637397
review_eks

00:10:09

passed #541637396
review_gke

00:16:36

passed #541637399
manual
stop_review_eks

00:01:11

passed #541637398
manual
stop_review_gke

00:01:35

 
  Specs
passed #541637404
review_specs_eks

00:07:29

passed #541637402
review_specs_gke

00:07:52

passed #541637406
specs_without_cluster

00:06:26

 
  Qa
skipped #541637408
debug_review
failed #541725260
allowed to fail
qa_eks

00:53:10

failed #541728097
allowed to fail
qa_gke

01:00:00

passed #541637407
review_helm_test

00:00:29

failed #541637411
allowed to fail
qa_eks

00:56:08

failed #541637410
allowed to fail
qa_gke

01:00:00

 
  Package
passed #541637416
Validate 1.12.9

00:00:48

passed #541637417
Validate 1.16.0

00:00:49

passed #541637414
lint_package

00:00:50

 
Name Stage Failure
failed
qa_eks Qa

Randomized with seed 64197

Running after_script
Uploading artifacts for failed job
Uploading artifacts...
./gitlab-qa-run-*: found 19 matching files

Uploading artifacts to coordinator... ok
id=541725260 responseStatus=201 Created token=fpxAxF3s
ERROR: Job failed: exit code 1
failed
qa_gke Qa The script exceeded the maximum execution time set for the job
      
RSpec::Retry: 2nd try ./qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb:38
Running after_script
WARNING: Failed to inspect build container 1db04f1c050ea8d29529ca15e0a9beec5ac0a4a9e04351a8e7bede2172753441 context deadline exceeded (docker_command.go:77:0s)
Authenticating with credentials from job payload (GitLab Registry)
Pulling docker image registry.gitlab.com/gitlab-org/gitlab-omnibus-builder/ruby_docker ...
Uploading artifacts for failed job
Pulling docker image gitlab/gitlab-runner-helper:x86_64-6c8c540f ...
ERROR: Job failed: execution took longer than 1h0m0s seconds