gitlab-qa 8.12.0 → 8.13.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bee7c1ce41e9ceeeb14546a8983a5c3f90b3da4f6a3f32505bc77c08f0e484a9
4
- data.tar.gz: dd74a1afa61040fc2110c0f3f63a381f8b1da4f07fb82b4629cdc979378ec67d
3
+ metadata.gz: eff4fd2e6e9b9ab05a26c87b04de43cc2724ff6bbfcdfa55309f6ea4dd6ca22f
4
+ data.tar.gz: f7c23ec439a8d5bbbcffac5942f9af3bd11761df457d6bd5316dcc2accb14d2e
5
5
  SHA512:
6
- metadata.gz: d22ff4d7fa0452bac353fcd80a68f8c2bd1598f0515483c4f0a749c6ab3f225bd4d763cf17ce21f7c1a446530d254ace11a2a5c5d6a581e985572c58ce07da80
7
- data.tar.gz: b0fe8a3cfbefcd39f971eab382171df61691d920303f8f89ab4b3a04bcb5b7ac4ff4586bb08196dbe7f1ba2f0e98ea8ce1deca4822407d22b80891e6dc306eaf
6
+ metadata.gz: a796e6144671878b4940c6cd529abe4bff1f2b38fe06914c069c4291932d27c2b7527603a625d5a6631f42131e87d48bd63773b7abc62a55628f006863f3acab
7
+ data.tar.gz: eab90710e729b81e2ba9716462327bf770289c17c197f7743b79fb88023c6711e84751f1bb02fd62414f2ff1ec327b0e318eac060fba28f3ebaade42ee0b5847
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- gitlab-qa (8.12.0)
4
+ gitlab-qa (8.13.1)
5
5
  activesupport (~> 6.1)
6
6
  gitlab (~> 4.18.0)
7
7
  http (~> 5.0)
@@ -37,7 +37,7 @@ GEM
37
37
  colored2 (~> 3.1)
38
38
  crack (0.4.5)
39
39
  rexml
40
- danger (9.0.0)
40
+ danger (9.1.0)
41
41
  claide (~> 1.0)
42
42
  claide-plugins (>= 0.9.2)
43
43
  colored2 (~> 3.1)
@@ -148,11 +148,11 @@ GEM
148
148
  method_source (~> 1.0)
149
149
  public_suffix (5.0.0)
150
150
  racc (1.6.0)
151
- rack (3.0.0)
151
+ rack (3.0.1)
152
152
  rainbow (3.1.1)
153
153
  rake (13.0.6)
154
154
  rchardet (1.8.0)
155
- regexp_parser (2.6.0)
155
+ regexp_parser (2.6.1)
156
156
  reverse_markdown (2.1.1)
157
157
  nokogiri
158
158
  rexml (3.2.5)
@@ -230,7 +230,7 @@ GEM
230
230
  webrick (1.7.0)
231
231
  yard (0.9.28)
232
232
  webrick (~> 1.7.0)
233
- zeitwerk (2.6.1)
233
+ zeitwerk (2.6.6)
234
234
 
235
235
  PLATFORMS
236
236
  ruby
@@ -247,4 +247,4 @@ DEPENDENCIES
247
247
  webmock (= 3.7.0)
248
248
 
249
249
  BUNDLED WITH
250
- 2.3.9
250
+ 2.3.24
@@ -79,9 +79,9 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
79
79
  | `QA_SLOW_CONNECTION_THROUGHPUT_KBPS` | `32` | The maximum throughput (in kbps) of the simulated slow connection. | No|
80
80
  | `QA_SKIP_PULL` | `false` | Set to `true` to skip pulling docker images (e.g., to use one you built locally). | No|
81
81
  | `QA_GENERATE_ALLURE_REPORT` | `false` | When running on CI, set to `true` to generate allure reports | No|
82
- | `QA_EXPORT_TEST_METRICS` | `true` | When running on CI, set to `true` to export test metrics to influxdb | No|
83
- | `QA_INFLUXDB_URL` |- | Influxdb url for test metrics reporting | No|
84
- | `QA_INFLUXDB_TOKEN` |- | Influxdb token for test metrics reporting | No|
82
+ | `QA_EXPORT_TEST_METRICS` | `true` | When running on CI, set to `true` to export test metrics to InfluxDB | No|
83
+ | `QA_INFLUXDB_URL` |- | InfluxDB URL for test metrics reporting | No|
84
+ | `QA_INFLUXDB_TOKEN` |- | InfluxDB token for test metrics reporting | No|
85
85
  | `QA_RUN_TYPE` |- | QA run type like `staging-full`, `canary`, `production` etc. Used in test metrics reporting | No|
86
86
  | `QA_VALIDATE_RESOURCE_REUSE` | `false` | Set to `true` to [validate resource reuse](https://docs.gitlab.com/ee/development/testing_guide/end_to_end/resources.html#reusable-resources) after a test suite | No |
87
87
  | `QA_USE_PUBLIC_IP_API` | `false` | When performing Instance tests against a remote/pre-existing instance, use an API to detect the public API for requests coming from gitlab-qa. Used by tests that exercise IP-address restrictions and similar
@@ -100,26 +100,31 @@ All environment variables used by GitLab QA should be defined in [`lib/gitlab/qa
100
100
  | `GITLAB_INITIAL_ROOT_PASSWORD` | `5iveL!fe` | Initial root password for Omnibus installations | No|
101
101
  | `COLORIZED_LOGS` | `false` | Colors GitLab QA and test logs to improve readability | No|
102
102
  | `QA_DOCKER_ADD_HOSTS` |- | Comma separated list of hosts to add to /etc/hosts in docker container | No|
103
+ | `FIPS` |- | Set to `1` or `true` to indicate that the test is running under FIPS mode | No|
103
104
 
104
105
  ## [Supported Remote Grid environment variables](./running_against_remote_grid.md)
105
106
 
106
107
  ## Running tests with a feature flag enabled
107
108
 
108
109
  It is possible to enable or disable a feature flag before running tests.
109
- To test a Gitlab image with a feature flag enabled, run this command:
110
- ```
110
+ To test a GitLab image with a feature flag enabled, run this command:
111
+
112
+ ```shell
111
113
  $ gitlab-qa Test::Instance::Image gitlab/gitlab-ee:12.4.0-ee.0 --enable-feature feature_flag_name
112
114
  ```
113
115
 
114
116
  To run a test with feature flag disabled, run this command:
115
- ```
117
+
118
+ ```shell
116
119
  $ gitlab-qa Test::Instance::Image gitlab/gitlab-ee:12.4.0-ee.0 --disable-feature feature_flag_name
117
120
  ```
118
121
 
119
- You an also test a GitLab image multiple times with different feature flag settings:
120
- ```
122
+ You can also test a GitLab image multiple times with different feature flag settings:
123
+
124
+ ```shell
121
125
  $ gitlab-qa Test::Instance::Image gitlab/gitlab-ee:12.4.0-ee.0 --disable-feature feature_flag_name --enable-feature feature_flag_name
122
126
  ```
127
+
123
128
  This will first disable `feature_flag_name` flag and run the tests and then enable it and run the tests again.
124
129
 
125
130
  You can pass any number of feature flag settings. The tests will run once for each setting.
@@ -149,13 +154,13 @@ by providing the full image name, or an abbreviation followed by the image tag.
149
154
  For example, to test GitLab version `12.4.0-ee`, the image tag is [`12.4.0-ee.0`](https://hub.docker.com/layers/gitlab/gitlab-ee/12.4.0-ee.0/images/sha256-65df19d8abbb0debdccb64bfe96871563806098cd84da0b818ae8cfdd928b9aa)
150
155
  and so you could run the tests with the command:
151
156
 
152
- ```
157
+ ```shell
153
158
  $ gitlab-qa Test::Instance::Image gitlab/gitlab-ee:12.4.0-ee.0
154
159
  ```
155
160
 
156
161
  Or with the command:
157
162
 
158
- ```
163
+ ```shell
159
164
  $ gitlab-qa Test::Instance::Image EE:12.4.0-ee.0
160
165
  ```
161
166
 
@@ -163,7 +168,7 @@ If you only provide the abbreviation, it will run the tests against the latest n
163
168
 
164
169
  For example, the following command would use the image named `gitlab/gitlab-ee:nightly`
165
170
 
166
- ```
171
+ ```shell
167
172
  $ gitlab-qa Test::Instance::Image EE
168
173
  ```
169
174
 
@@ -176,7 +181,7 @@ To run EE tests, the `EE_LICENSE` environment variable needs to be set:
176
181
  By default, `gitlab-qa` infers the QA image to use based on the GitLab image.
177
182
  For instance, if you run the following:
178
183
 
179
- ```
184
+ ```shell
180
185
  $ gitlab-qa Test::Instance::Image gitlab/gitlab-ee:12.4.0-ee.0
181
186
  ```
182
187
 
@@ -188,19 +193,19 @@ In some cases, you'll want to use a specific QA image instead of letting
188
193
  when you're doing local debugging/testing and you want to control the QA image
189
194
  name, or in the CI where the QA image might be built by a project (e.g.
190
195
  `gitlab-org/gitlab`, and the GitLab image might be built by another project
191
- (e.g. `gitlab-org/omnibus-gitlab-mirror`).
196
+ (e.g. `gitlab-org/omnibus-gitlab-mirror`)).
192
197
 
193
198
  To specify the QA image to use, pass the `--qa-image QA_IMAGE` option,
194
199
  as follows:
195
200
 
196
- ```
201
+ ```shell
197
202
  $ gitlab-qa Test::Instance::Image --qa-image registry.gitlab.com/gitlab-org/gitlab/gitlab-ee-qa:branch-name EE
198
203
  ```
199
204
 
200
205
  Additionally, setting the `$QA_IMAGE` environment variable achieve the same result,
201
206
  without needing to pass the `--qa-image` option:
202
207
 
203
- ```
208
+ ```shell
204
209
  $ export QA_IMAGE="registry.gitlab.com/gitlab-org/gitlab/gitlab-ee-qa:branch-name"
205
210
  $ gitlab-qa Test::Instance::Image EE
206
211
  ```
@@ -259,7 +264,7 @@ GitLab project).
259
264
 
260
265
  Example:
261
266
 
262
- ```
267
+ ```shell
263
268
  $ gitlab-qa Test::Instance::Image CE
264
269
  ```
265
270
 
@@ -275,7 +280,7 @@ This spins up a GitLab Docker container based on the given edition or image:
275
280
 
276
281
  Example:
277
282
 
278
- ```
283
+ ```shell
279
284
  $ gitlab-qa Test::Omnibus::Image CE
280
285
  ```
281
286
 
@@ -291,7 +296,7 @@ This tests that:
291
296
 
292
297
  Example:
293
298
 
294
- ```
299
+ ```shell
295
300
  # Update from gitlab/gitlab-ce:latest to gitlab/gitlab-ce:nightly
296
301
  $ gitlab-qa Test::Omnibus::Update CE
297
302
 
@@ -314,14 +319,35 @@ This tests that:
314
319
 
315
320
  Example:
316
321
 
317
- ```
318
- # Ugrade from gitlab/gitlab-ce:nightly to gitlab/gitlab-ee:nightly
322
+ ```shell
323
+ # Upgrade from gitlab/gitlab-ce:nightly to gitlab/gitlab-ee:nightly
319
324
  $ gitlab-qa Test::Omnibus::Upgrade CE
320
325
 
321
- # Ugrade from gitlab/gitlab-ce:my-custom-tag to gitlab/gitlab-ee:my-custom-tag
326
+ # Upgrade from gitlab/gitlab-ce:my-custom-tag to gitlab/gitlab-ee:my-custom-tag
322
327
  $ gitlab-qa Test::Omnibus::Upgrade gitlab/gitlab-ce:my-custom-tag
323
328
  ```
324
329
 
330
+ ### `Test::Omnibus::UpdateFromPrevious <full image address> <current_version> <major|minor>`
331
+
332
+ Scenario verifies upgrade from previous (major|minor) version to current release.
333
+
334
+ - Deploys previous (major|minor) version and runs Smoke test suite
335
+ to populate data in database before upgrade
336
+ - Generates upgrade path following current GitLab recommendations
337
+ from ['gitlab-com/support/toolbox/upgrade-path'](https://gitlab.com/gitlab-com/support/toolbox/upgrade-path/-/raw/main/upgrade-path.yml) project
338
+ - Gradually upgrades GitLab instances to `<current_version>`
339
+ associated with provided `<full image address>` and runs tests against it
340
+
341
+ Example:
342
+
343
+ ```shell
344
+ # Minor upgrade - will perform upgrade 15.5.x -> gitlab-ee:dev-tag
345
+ $ gitlab-qa Test::Omnibus::UpdateFromPrevious gitlab-ee:dev-tag 15.6.0-pre minor
346
+
347
+ # Major upgrade - will perform upgrades 14.10.x -> 15.0.x -> 15.4.x -> gitlab-ee:dev-tag (15.6.0-pre)
348
+ $ gitlab-qa Test::Omnibus::UpdateFromPrevious gitlab-ee:dev-tag 15.6.0-pre major
349
+ ```
350
+
325
351
  ### `Test::Integration::Geo EE|<full image address>`
326
352
 
327
353
  This tests that two GitLab Geo instances work as expected.
@@ -342,7 +368,7 @@ EE project).
342
368
 
343
369
  Example:
344
370
 
345
- ```
371
+ ```shell
346
372
  $ export EE_LICENSE=$(cat /path/to/Geo.gitlab_license)
347
373
  $ gitlab-qa Test::Integration::Geo EE
348
374
  ```
@@ -364,7 +390,7 @@ container is spun up and tests are run from it by running the
364
390
 
365
391
  Example:
366
392
 
367
- ```
393
+ ```shell
368
394
  $ gitlab-qa Test::Integration::GitalyCluster EE
369
395
  ```
370
396
 
@@ -372,7 +398,7 @@ $ gitlab-qa Test::Integration::GitalyCluster EE
372
398
 
373
399
  This tests that a GitLab Instance works as expected with [GitLab Pages](https://docs.gitlab.com/ee/user/project/pages/) enabled.
374
400
 
375
- The scenario configures the instance by setting up these instructions [here](https://gitlab.com/gitlab-org/gitlab-development-kit/blob/main/doc/howto/pages.md) through enabling `gitlab_pages['enable'] = true;`, setting up an external url and the adding of the GitLab Pages hostname and GitLab Instance IP into the `etc/hostfile` on the container that runs the specs so it can access the page on the GitLab container.
401
+ The scenario configures the instance by setting up these instructions [here](https://gitlab.com/gitlab-org/gitlab-development-kit/blob/main/doc/howto/pages.md) through enabling `gitlab_pages['enable'] = true;`, setting up an external URL and the adding of the GitLab Pages hostname and GitLab Instance IP into the `etc/hostfile` on the container that runs the specs, so it can access the page on the GitLab container.
376
402
 
377
403
  To run tests against the GitLab container, a GitLab QA (`gitlab/gitlab-qa`)
378
404
  container is spun up and tests are run from it by running the
@@ -380,7 +406,7 @@ container is spun up and tests are run from it by running the
380
406
 
381
407
  Example:
382
408
 
383
- ```
409
+ ```shell
384
410
  $ gitlab-qa Test::Integration::GitlabPages EE
385
411
  ```
386
412
 
@@ -409,7 +435,7 @@ In EE, both the GitLab standard and LDAP credentials are needed:
409
435
 
410
436
  Example:
411
437
 
412
- ```
438
+ ```shell
413
439
  $ gitlab-qa Test::Integration::LDAPNoTLS CE
414
440
 
415
441
  # For EE
@@ -423,10 +449,11 @@ $ gitlab-qa Test::Integration::LDAPNoTLS EE
423
449
  ### `Test::Integration::LDAPTLS CE|EE|<full image address>`
424
450
 
425
451
  This tests that a TLS enabled GitLab instance works as expected with an external TLS enabled LDAP server.
426
- The self signed TLS certificate used for the Gitlab instance and the private key is located at: [`gitlab-org/gitlab-qa@tls_certificates/gitlab`][test-integration-ldap-tls-certs]
452
+ The self-signed TLS certificate used for the GitLab instance and the private key is located at: [`gitlab-org/gitlab-qa@tls_certificates/gitlab`][test-integration-ldap-tls-certs]
427
453
 
428
- The certificate was generated with openssl using this command:
429
- ```
454
+ The certificate was generated with OpenSSL using this command:
455
+
456
+ ```shell
430
457
  openssl req -x509 -newkey rsa:4096 -keyout gitlab.test.key -out gitlab.test.crt -days 3650 -nodes -subj "/C=US/ST=CA/L=San Francisco/O=GitLab/OU=Org/CN=gitlab.test"
431
458
  ```
432
459
 
@@ -450,7 +477,7 @@ In EE, both the GitLab standard and LDAP credentials are needed:
450
477
 
451
478
  Example:
452
479
 
453
- ```
480
+ ```shell
454
481
  $ gitlab-qa Test::Integration::LDAPTLS CE
455
482
 
456
483
  # For EE
@@ -477,7 +504,7 @@ container is spun up and tests are run from it by running the
477
504
  [`gitlab-org/gitlab@qa/qa/scenario/test/integration/ldap_no_server.rb`](https://gitlab.com/gitlab-org/gitlab/blob/master/qa/qa/scenario/test/integration/ldap_no_server.rb)
478
505
  in the GitLab project).
479
506
 
480
- In GiLab project, both the GitLab standard and LDAP credentials are needed:
507
+ In GitLab project, both the GitLab standard and LDAP credentials are needed:
481
508
 
482
509
  1. The first is used to login as an Admin to enter in the GitLab license.
483
510
  2. The second is used to conduct LDAP-related tasks
@@ -488,7 +515,7 @@ In GiLab project, both the GitLab standard and LDAP credentials are needed:
488
515
 
489
516
  Example:
490
517
 
491
- ```
518
+ ```shell
492
519
  $ export EE_LICENSE=$(cat /path/to/GitLab.gitlab_license)
493
520
 
494
521
  $ gitlab-qa Test::Integration::LDAPNoServer EE
@@ -513,7 +540,7 @@ container is spun up and tests are run from it by running the
513
540
 
514
541
  Example:
515
542
 
516
- ```
543
+ ```shell
517
544
  $ export EE_LICENSE=$(cat /path/to/Geo.gitlab_license)
518
545
 
519
546
  $ gitlab-qa Test::Integration::GroupSAML EE
@@ -539,7 +566,7 @@ container is spun up and tests are run from it by running the
539
566
 
540
567
  Example:
541
568
 
542
- ```
569
+ ```shell
543
570
  $ gitlab-qa Test::Integration::InstanceSAML CE
544
571
 
545
572
  # For EE
@@ -565,7 +592,7 @@ in the GitLab project).
565
592
 
566
593
  Example:
567
594
 
568
- ```
595
+ ```shell
569
596
  $ gitlab-qa Test::Integration::Mattermost CE
570
597
 
571
598
  # For EE
@@ -584,7 +611,7 @@ To run Packages tests, you may [configure Omnibus](configuring_omnibus.md) to us
584
611
 
585
612
  Example:
586
613
 
587
- ```
614
+ ```shell
588
615
  $ export EE_LICENSE=$(cat /path/to/Geo.gitlab_license)
589
616
 
590
617
  $ gitlab-qa Test::Instance::Image EE --omnibus-config packages
@@ -616,7 +643,7 @@ container is spun up and tests are run from it by running the
616
643
 
617
644
  Example:
618
645
 
619
- ```
646
+ ```shell
620
647
  $ gitlab-qa Test::Integration::Praefect EE
621
648
  ```
622
649
 
@@ -635,7 +662,7 @@ container is spun up and tests are run from it by running the
635
662
 
636
663
  Example:
637
664
 
638
- ```
665
+ ```shell
639
666
  $ gitlab-qa Test::Integration::SMTP CE
640
667
  ```
641
668
 
@@ -660,7 +687,7 @@ These values can be found in the shared GitLab QA 1Password vault.
660
687
 
661
688
  Example:
662
689
 
663
- ```
690
+ ```shell
664
691
  $ export JIRA_ADMIN_USERNAME=<jira_admin_username>
665
692
  $ export JIRA_ADMIN_PASSWORD=<jira_admin_password>
666
693
 
@@ -680,7 +707,7 @@ container is spun up and tests are run from it by running the
680
707
 
681
708
  Example:
682
709
 
683
- ```
710
+ ```shell
684
711
  $ gitlab-qa Test::Integration::Integrations EE
685
712
  ```
686
713
 
@@ -693,11 +720,11 @@ To run tests against the GitLab instance, a GitLab QA (`gitlab/gitlab-qa`)
693
720
  container is spun up and tests are run from it by running the
694
721
  `Test::Instance` scenario (located under
695
722
  [`gitlab-org/gitlab/qa/qa/scenario/test/instance.rb`][test-instance] in the
696
- in the GitLab project).
723
+ GitLab project).
697
724
 
698
725
  Example:
699
726
 
700
- ```
727
+ ```shell
701
728
  $ export GITLAB_USERNAME=your_username
702
729
  $ export GITLAB_PASSWORD=your_password
703
730
 
@@ -720,7 +747,7 @@ To run tests against the GitLab instance, a GitLab QA (`gitlab/gitlab-qa`)
720
747
  container is spun up and tests are run from it by running the
721
748
  `Test::Instance` scenario (located under
722
749
  [`gitlab-org/gitlab/qa/qa/scenario/test/instance.rb`][test-instance] in the
723
- in the GitLab project).
750
+ GitLab project).
724
751
 
725
752
  **Required environment variables:**
726
753
 
@@ -760,7 +787,7 @@ in the GitLab project).
760
787
 
761
788
  An example of how to run the smoke tests:
762
789
 
763
- ```
790
+ ```shell
764
791
  $ export GITLAB_QA_USER_AGENT="<value from 1Password>"
765
792
  $ export GITLAB_QA_ACCESS_TOKEN="<value from 1Password>"
766
793
  $ export GITLAB_QA_DEV_ACCESS_TOKEN="<value from 1Password>"
@@ -784,7 +811,7 @@ To run tests against the GitLab instance, a GitLab QA (`gitlab/gitlab-qa`)
784
811
  container is spun up and tests are run from it by running the
785
812
  `Test::Instance` scenario (located under
786
813
  [`gitlab-org/gitlab/qa/qa/scenario/test/instance.rb`][test-instance] in the
787
- in the GitLab project).
814
+ GitLab project).
788
815
 
789
816
  **Required environment variables:**
790
817
 
@@ -802,7 +829,7 @@ in the GitLab project).
802
829
 
803
830
  Example:
804
831
 
805
- ```
832
+ ```shell
806
833
  $ export GITLAB_QA_ACCESS_TOKEN=your_api_access_token
807
834
  $ export GITLAB_QA_DEV_ACCESS_TOKEN=your_dev_registry_access_token
808
835
  $ export GITLAB_USERNAME="gitlab-qa"
@@ -837,7 +864,7 @@ This scenario tests that the Geo staging deployment (with [`staging.gitlab.com`]
837
864
 
838
865
  Example:
839
866
 
840
- ```
867
+ ```shell
841
868
  $ export GITLAB_QA_ACCESS_TOKEN=your_api_access_token
842
869
  $ export GITLAB_QA_DEV_ACCESS_TOKEN=your_dev_registry_access_token
843
870
  $ export GITLAB_USERNAME="gitlab-qa"
@@ -852,7 +879,7 @@ This scenario tests that the Geo staging deployment (with [`staging-ref.gitlab.c
852
879
 
853
880
  Scenario requirements are the same as [`Test::Instance::StagingGeo`](#testinstancestaginggeo) described above.
854
881
 
855
- ```
882
+ ```shell
856
883
  $ export GITLAB_QA_ACCESS_TOKEN=your_api_access_token
857
884
  $ export GITLAB_QA_DEV_ACCESS_TOKEN=your_dev_registry_access_token
858
885
  $ export GITLAB_USERNAME="gitlab-qa"
@@ -902,7 +929,7 @@ to the canary fleet.
902
929
 
903
930
  An example of how to run the smoke tests:
904
931
 
905
- ```
932
+ ```shell
906
933
  $ export GITLAB_QA_USER_AGENT="<value from 1Password>"
907
934
  $ export GITLAB_QA_ACCESS_TOKEN="<value from 1Password>"
908
935
  $ export GITLAB_QA_DEV_ACCESS_TOKEN="<value from 1Password>"
@@ -939,11 +966,11 @@ To run tests against the GitLab instance, a GitLab QA (`gitlab/gitlab-qa`)
939
966
  container is spun up and tests are run from it by running the
940
967
  `Test::Instance::Smoke` scenario (located under
941
968
  [`gitlab-org/gitlab/qa/qa/scenario/test/smoke.rb`][smoke-instance] in the
942
- in the GitLab project).
969
+ GitLab project).
943
970
 
944
971
  Example:
945
972
 
946
- ```
973
+ ```shell
947
974
  $ gitlab-qa Test::Instance::Smoke ee:<tag> https://staging.gitlab.com
948
975
  ```
949
976
 
@@ -959,7 +986,7 @@ These tests verify features related to multiple repository storages.
959
986
 
960
987
  Example:
961
988
 
962
- ```
989
+ ```shell
963
990
  $ export QA_ADDITIONAL_REPOSITORY_STORAGE=secondary
964
991
 
965
992
  $ gitlab-qa Test::Instance::RepositoryStorage
@@ -973,7 +1000,7 @@ in a shared internal network.
973
1000
 
974
1001
  Example:
975
1002
 
976
- ```
1003
+ ```shell
977
1004
  # For EE
978
1005
  $ export EE_LICENSE=$(cat /path/to/gitlab_license)
979
1006
 
@@ -1000,7 +1027,8 @@ These variables are available at 1Password QA Vault.
1000
1027
  ### `Test::Integration::RegistryTLS EE`
1001
1028
 
1002
1029
  It requires GitLab's TLS certificate found on the [`tls_certificates`](https://gitlab.com/gitlab-org/gitlab-qa/-/blob/master/tls_certificates/gitlab/gitlab.test.crt) folder
1003
- ```
1030
+
1031
+ ```shell
1004
1032
  $ export GITLAB_TLS_CERTIFICATE=$(cat /path/to/certificate.crt)
1005
1033
  ```
1006
1034
 
@@ -1010,27 +1038,27 @@ To run a scenario with an insecure registry enabled use `Test::Integration::Regi
1010
1038
 
1011
1039
  This scenario is a composition of two orchestrated scenarios. It tests the container registry (TLS-enabled) integrated with an object storage backend.
1012
1040
 
1013
- An example would be to pass the option `--omnibus-config object_storage_aws` and the registry will be pulling and pushing images using AWS Cloud Storage as a storage backend.
1041
+ An example would be to pass the option `--omnibus-config object_storage_aws` and the registry will be pulling and pushing images using AWS Cloud Storage as a storage backend.
1014
1042
 
1015
- ```
1016
- GITLAB_TLS_CERTIFICATE=$(cat /path/to/certificate.crt) gitlab-qa Test::Integration::RegistryTLS EE --omnibus-config object_storage_aws
1017
- ```
1043
+ ```shell
1044
+ GITLAB_TLS_CERTIFICATE=$(cat /path/to/certificate.crt) gitlab-qa Test::Integration::RegistryTLS EE --omnibus-config object_storage_aws
1045
+ ```
1018
1046
 
1019
1047
  ### Test::Instance::Image EE --omnibus-config decomposition_single_db
1020
1048
 
1021
1049
  This scenario is to run tests against a GitLab instance with a [decomposed database](https://gitlab.com/groups/gitlab-org/-/epics/6160) using a single database:
1022
1050
 
1023
- ```ruby
1051
+ ```ruby
1024
1052
  gitlab-qa Test::Instance::Image EE --omnibus-config decomposition_single_db
1025
- ```
1053
+ ```
1026
1054
 
1027
1055
  ### Test::Instance::Image EE --omnibus-config decomposition_multiple_db
1028
1056
 
1029
1057
  This scenario is to run tests against a GitLab instance with a [decomposed database](https://gitlab.com/groups/gitlab-org/-/epics/6160) using multiple databases:
1030
1058
 
1031
- ```ruby
1059
+ ```ruby
1032
1060
  gitlab-qa Test::Instance::Image EE --omnibus-config decomposition_multiple_db
1033
- ```
1061
+ ```
1034
1062
 
1035
1063
  ### `Test::Instance::Geo EE|<full image address>:nightly|latest|any_tag http://geo-primary.gitlab http://geo-secondary.gitlab`
1036
1064
 
@@ -1039,13 +1067,13 @@ container and running the `QA::EE::Scenario::Test::Geo` scenario. Note that the
1039
1067
 
1040
1068
  **Required user properties:**
1041
1069
 
1042
- - The user must provide OAuth authorization on the secondary site before running Geo tests. This can be done via the authorization modal that appears after signing into the secondary node for the first time.
1070
+ - The user must provide OAuth authorization on the secondary site before running Geo tests. This can be done via the authorization modal that appears after signing in to the secondary node for the first time.
1043
1071
 
1044
1072
  - Some Geo tests require the user to have Admin access level (for example, the Geo Nodes API tests)
1045
1073
 
1046
1074
  Example:
1047
1075
 
1048
- ```
1076
+ ```shell
1049
1077
  $ export GITLAB_USERNAME="gitlab-qa"
1050
1078
  $ export GITLAB_PASSWORD="$GITLAB_QA_PASSWORD"
1051
1079
 
@@ -1056,10 +1084,10 @@ $ gitlab-qa Test::Instance::Geo EE https://primary.gitlab.com https://secondary.
1056
1084
 
1057
1085
  This scenario will run a limited number of tests that are tagged with `:chaos`.
1058
1086
 
1059
- These tests are designed to verify that our systems can gracefully handle scenarios which may occur if
1060
- networking or connectivity type issues occur in various Gitlab components.
1061
- They make use of [toxiproxy(https://github.com/Shopify/toxiproxy)] to act as a proxy allowing us to introduce
1062
- connectivity issues, via the [toxiproxy ruby client](https://github.com/Shopify/toxiproxy-ruby) in an E2E spec.
1087
+ These tests are designed to verify that our systems can gracefully handle scenarios which may occur if
1088
+ networking or connectivity type issues occur in various Gitlab components.
1089
+ They make use of [toxiproxy](https://github.com/Shopify/toxiproxy) to act as a proxy allowing us to introduce
1090
+ connectivity issues, via the [toxiproxy ruby client](https://github.com/Shopify/toxiproxy-ruby) in an E2E spec.
1063
1091
 
1064
1092
  Sample Test:
1065
1093
 
@@ -1075,9 +1103,10 @@ Sample Test:
1075
1103
 
1076
1104
  Example:
1077
1105
 
1078
- ```
1106
+ ```ruby
1079
1107
  $ gitlab-qa Test::Instance::Chaos
1080
1108
  ```
1109
+
1081
1110
  ----
1082
1111
 
1083
1112
  [Back to README.md](../README.md)
@@ -56,7 +56,14 @@ module Gitlab
56
56
  end
57
57
 
58
58
  def tag
59
- official? ? "v#{version}" : revision
59
+ if official?
60
+ # Because RCs are considered to be pre-releases, that come before
61
+ # regular releases we can't check if version < 15.6.0, hence
62
+ # using this weird not-gonna-happen-patch-release hack.
63
+ Gem::Version.new(version) > Gem::Version.new('15.5.99') ? version : "v#{version}"
64
+ else
65
+ revision
66
+ end
60
67
  end
61
68
 
62
69
  private
@@ -137,7 +137,8 @@ module Gitlab
137
137
  'SMOKE_ONLY' => :smoke_only,
138
138
  'NO_ADMIN' => :no_admin,
139
139
  'CHROME_DISABLE_DEV_SHM' => :chrome_disable_dev_shm,
140
- 'COLORIZED_LOGS' => :colorized_logs
140
+ 'COLORIZED_LOGS' => :colorized_logs,
141
+ 'FIPS' => :fips
141
142
  }.freeze
142
143
 
143
144
  ENV_VARIABLES.each do |env_name, method_name|
@@ -191,7 +191,7 @@ module Gitlab
191
191
  'job_name' => 'praefect',
192
192
  'static_configs' => [
193
193
  'targets' => [
194
- '#{@praefect_addr}:#{@praefect_port}'
194
+ '#{@praefect_node_name}.#{@network}:9652'
195
195
  ]
196
196
  ]
197
197
  },
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Gitlab
4
4
  module QA
5
- VERSION = '8.12.0'
5
+ VERSION = '8.13.1'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gitlab-qa
3
3
  version: !ruby/object:Gem::Version
4
- version: 8.12.0
4
+ version: 8.13.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - GitLab Quality
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-11-17 00:00:00.000000000 Z
11
+ date: 2022-11-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: climate_control