diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-08 03:12:23 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-08 03:12:23 +0300 |
| commit | fb97e39150dcaf7ec2b2a070ff4b39c0551f14a2 (patch) | |
| tree | 8a5ccc69e3b5d3200dcb9a0585508dbd6b3dec5b /.gitlab/ci/package-and-test/main.gitlab-ci.yml | |
| parent | 4cf8d931aa8511aa93b8504e940d2f5ddfee7b4c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci/package-and-test/main.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/package-and-test/main.gitlab-ci.yml | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/.gitlab/ci/package-and-test/main.gitlab-ci.yml b/.gitlab/ci/package-and-test/main.gitlab-ci.yml index 79f31a46d3e..21dd8f957d4 100644 --- a/.gitlab/ci/package-and-test/main.gitlab-ci.yml +++ b/.gitlab/ci/package-and-test/main.gitlab-ci.yml @@ -407,9 +407,7 @@ integrations: - !reference [.rules:test:manual, rules] ldap-no-server: - extends: - - .qa - - .failure-videos + extends: .qa variables: QA_SCENARIO: Test::Integration::LDAPNoServer rules: @@ -418,9 +416,7 @@ ldap-no-server: - !reference [.rules:test:manual, rules] ldap-tls: - extends: - - .qa - - .failure-videos + extends: .qa variables: QA_SCENARIO: Test::Integration::LDAPTLS rules: @@ -429,9 +425,7 @@ ldap-tls: - !reference [.rules:test:manual, rules] ldap-no-tls: - extends: - - .qa - - .failure-videos + extends: .qa variables: QA_SCENARIO: Test::Integration::LDAPNoTLS rules: |