gitlab-qa 15.10.0 → 15.10.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.gitlab-ci.yml +0 -1
- data/Gemfile.lock +2 -2
- data/docs/configuring_omnibus.md +5 -5
- data/docs/what_tests_can_be_run.md +4 -31
- data/lib/gitlab/qa/version.rb +1 -1
- data/support/setup/gitlab_duo_setup.rb +3 -10
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e921902d91ded31ce0003274106b20236f6b71231508fe4236ae926cbae8db26
|
|
4
|
+
data.tar.gz: 23e8702dd725cd0f8cbd3d2105da4b5f6799f9eac1a19093f3d0c277cd957385
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c599a048d4937a6f01c0b5a469f59c2377ead8e85cf301f8d2332efafdbc076779fd245afa74bd6b073fb8e9bd2a87e59c37c0a579e68d6461a509b4bffd6813
|
|
7
|
+
data.tar.gz: 55c98ba9302e97e8c2d1b4f269fe81d0de926be93840cb9b0b0c04389c8d3f8e632c3001eecb2de57060d41ad3e447c5fc81f53aeb75303cb9ec3739ae72255b
|
data/.gitlab-ci.yml
CHANGED
data/Gemfile.lock
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: .
|
|
3
3
|
specs:
|
|
4
|
-
gitlab-qa (15.10.
|
|
4
|
+
gitlab-qa (15.10.1)
|
|
5
5
|
activesupport (>= 6.1, < 8)
|
|
6
6
|
ffi (~> 1.17)
|
|
7
7
|
gitlab (~> 4.19)
|
|
@@ -42,7 +42,7 @@ GEM
|
|
|
42
42
|
climate_control (1.0.1)
|
|
43
43
|
coderay (1.1.3)
|
|
44
44
|
colored2 (3.1.2)
|
|
45
|
-
concurrent-ruby (1.3.
|
|
45
|
+
concurrent-ruby (1.3.8)
|
|
46
46
|
connection_pool (2.5.4)
|
|
47
47
|
cork (0.3.0)
|
|
48
48
|
colored2 (~> 3.1)
|
data/docs/configuring_omnibus.md
CHANGED
|
@@ -137,9 +137,9 @@ Multiple Configurators may be specified and the order will be preserved in which
|
|
|
137
137
|
E.g., given the arguments:
|
|
138
138
|
|
|
139
139
|
```ruby
|
|
140
|
-
exe/gitlab-qa Test::Instance::Image EE --omnibus-config
|
|
140
|
+
exe/gitlab-qa Test::Instance::Image EE --omnibus-config github_oauth,registry_object_storage
|
|
141
141
|
# or
|
|
142
|
-
exe/gitlab-qa Test::Instance::Image EE --omnibus-config
|
|
142
|
+
exe/gitlab-qa Test::Instance::Image EE --omnibus-config github_oauth --omnibus-config registry_object_storage
|
|
143
143
|
```
|
|
144
144
|
|
|
145
145
|
Omnibus will be configured in the order they appear.
|
|
@@ -147,11 +147,11 @@ Omnibus will be configured in the order they appear.
|
|
|
147
147
|
```ruby
|
|
148
148
|
# /etc/gitlab/gitlab.rb
|
|
149
149
|
#=> Runtime::OmnibusConfiguration::Default#configuration
|
|
150
|
-
#=> Runtime::OmnibusConfiguration::
|
|
151
|
-
#=> Runtime::OmnibusConfiguration::
|
|
150
|
+
#=> Runtime::OmnibusConfiguration::GithubOauth#configuration
|
|
151
|
+
#=> Runtime::OmnibusConfiguration::RegistryObjectStorage#configuration
|
|
152
152
|
```
|
|
153
153
|
|
|
154
|
-
The order is also preserved for Sidecar containers. If the `
|
|
154
|
+
The order is also preserved for Sidecar containers. If the `GithubOauth` and `RegistryObjectStorage` Configurators each prepare a sidecar container, they will be spun up in order from first to last.
|
|
155
155
|
|
|
156
156
|
### Adding one-off configurations
|
|
157
157
|
|
|
@@ -636,41 +636,14 @@ $ export QA_1P_PASSWORD=1password_password
|
|
|
636
636
|
$ export QA_1P_SECRET=1password_secret
|
|
637
637
|
$ export QA_1P_GITHUB_UUID=1password_gitlab-qa-github_item_uuid
|
|
638
638
|
|
|
639
|
-
$ gitlab-qa Test::
|
|
639
|
+
$ gitlab-qa Test::Instance::Image CE --omnibus-config github_oauth
|
|
640
640
|
|
|
641
641
|
# For EE
|
|
642
642
|
$ export EE_LICENSE=$(cat /path/to/gitlab_license)
|
|
643
643
|
|
|
644
|
-
$ gitlab-qa Test::
|
|
644
|
+
$ gitlab-qa Test::Instance::Image EE --omnibus-config github_oauth
|
|
645
645
|
```
|
|
646
646
|
|
|
647
|
-
### `Test::Integration::Packages CE|EE|<full image address>`
|
|
648
|
-
|
|
649
|
-
**Note: This Scenario no longer exists. See https://gitlab.com/gitlab-org/gitlab-qa/-/merge_requests/662**
|
|
650
|
-
|
|
651
|
-
To run Packages tests, you may [configure Omnibus](configuring_omnibus.md) to use the [Packages](https://gitlab.com/gitlab-org/gitlab-qa/-/blob/master/lib/gitlab/qa/runtime/omnibus_configurations/packages.rb) configurator.
|
|
652
|
-
|
|
653
|
-
Example:
|
|
654
|
-
|
|
655
|
-
```shell
|
|
656
|
-
$ export EE_LICENSE=$(cat /path/to/Geo.gitlab_license)
|
|
657
|
-
|
|
658
|
-
$ gitlab-qa Test::Instance::Image EE --omnibus-config packages
|
|
659
|
-
```
|
|
660
|
-
|
|
661
|
-
This tests the GitLab Package Registry feature by setting
|
|
662
|
-
`gitlab_rails['packages_enabled'] = true` in the Omnibus configuration
|
|
663
|
-
before starting the GitLab container.
|
|
664
|
-
|
|
665
|
-
To run tests against the GitLab container, a GitLab QA (`gitlab/gitlab-qa`)
|
|
666
|
-
container is spun up and tests are run from it by running the
|
|
667
|
-
`Test::Instance::All` scenario with the `--tag packages` RSpec parameter,
|
|
668
|
-
which runs only the tests with `:packages` metadata.
|
|
669
|
-
|
|
670
|
-
**Required environment variables:**
|
|
671
|
-
|
|
672
|
-
- `EE_LICENSE`: A valid EE license.
|
|
673
|
-
|
|
674
647
|
### `Test::Integration::Praefect CE|EE|<full image address>`
|
|
675
648
|
|
|
676
649
|
This tests [Praefect](https://docs.gitlab.com/ee/administration/gitaly/praefect.html),
|
|
@@ -1046,7 +1019,7 @@ $ gitlab-qa Test::Instance::Airgapped EE -- --tag smoke
|
|
|
1046
1019
|
|
|
1047
1020
|
### `Test::Instance::Image CE|EE|<full image address> --omnibus-config object_storage`
|
|
1048
1021
|
|
|
1049
|
-
This orchestrated scenario runs tests from the test suite against a GitLab instance which has object storage configured instead of using local storage. The omnibus configuration `object_storage` ([configurator](configuring_omnibus.md)), uses [Silo](https://github.com/pgsty/silo) (a MinIO fork) and `object_storage_aws` uses an AWS S3 account with credentials configured in the pipeline as CI Variables. To use Google Cloud Storage pass `--omnibus-config
|
|
1022
|
+
This orchestrated scenario runs tests from the test suite against a GitLab instance which has object storage configured instead of using local storage. The omnibus configuration `object_storage` ([configurator](configuring_omnibus.md)), uses [Silo](https://github.com/pgsty/silo) (a MinIO fork) and `object_storage_aws` uses an AWS S3 account with credentials configured in the pipeline as CI Variables. To use Google Cloud Storage pass `--omnibus-config object_storage_gcs`. According to the storage selected it requires:
|
|
1050
1023
|
|
|
1051
1024
|
| Scenario | Variable | Description |
|
|
1052
1025
|
|-----------------------|---------------------|--------------------------------------|
|
|
@@ -1054,7 +1027,7 @@ This orchestrated scenario runs tests from the test suite against a GitLab insta
|
|
|
1054
1027
|
| AWS S3 Object Storage | AWS_S3_KEY_ID | AWS credentials |
|
|
1055
1028
|
| AWS S3 Object Storage | AWS_S3_ACCESS_KEY | AWS credentials |
|
|
1056
1029
|
| AWS S3 Object Storage | AWS_S3_BUCKET_NAME | Name of the bucket set in AWS |
|
|
1057
|
-
| GCP Object Storage | GCS_BUCKET_NAME | Name of the bucket set in
|
|
1030
|
+
| GCP Object Storage | GCS_BUCKET_NAME | Name of the bucket set in GCP |
|
|
1058
1031
|
| GCP Object Storage | GOOGLE_JSON_KEY | JSON key credential |
|
|
1059
1032
|
| GCP Object Storage | GOOGLE_CLIENT_EMAIL | Email address of the service account |
|
|
1060
1033
|
| GCP Object Storage | GOOGLE_PROJECT | GCP project name |
|
data/lib/gitlab/qa/version.rb
CHANGED
|
@@ -83,20 +83,13 @@ class GitlabDuoSetup
|
|
|
83
83
|
ENV.fetch(key, default) == 'true'
|
|
84
84
|
end
|
|
85
85
|
|
|
86
|
-
|
|
87
|
-
GitlabSubscriptions::AddOnPurchase.find_by(add_on: add_on)
|
|
88
|
-
end
|
|
89
|
-
|
|
86
|
+
# AddOnPurchase#add_on is no longer an ActiveRecord association, so query through the model's scopes
|
|
90
87
|
def duo_pro_add_on
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
find_add_on_purchase(add_on: GitlabSubscriptions::AddOn.code_suggestions.last)
|
|
88
|
+
GitlabSubscriptions::AddOnPurchase.for_gitlab_duo_pro.last
|
|
94
89
|
end
|
|
95
90
|
|
|
96
91
|
def duo_enterprise_add_on
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
find_add_on_purchase(add_on: GitlabSubscriptions::AddOn.duo_enterprise.last)
|
|
92
|
+
GitlabSubscriptions::AddOnPurchase.for_duo_enterprise.last
|
|
100
93
|
end
|
|
101
94
|
|
|
102
95
|
def admin
|
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: 15.10.
|
|
4
|
+
version: 15.10.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: 2026-10-
|
|
11
|
+
date: 2026-10-27 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: climate_control
|