From a1144064fbb859798c617c6e64c4d42dc1d36bd0 Mon Sep 17 00:00:00 2001 From: Jennifer Louie Date: Thu, 11 Mar 2021 04:52:26 +0000 Subject: [PATCH] Re-enable ee:geo jobs and add high-capacity tag back --- .gitlab-ci.yml | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b27354b4..68b87db1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -461,23 +461,24 @@ ee:mattermost-quarantine: variables: QA_SCENARIO: "Test::Integration::Mattermost" -# Disabling geo jobs temporarily due to https://gitlab.com/gitlab-org/gitlab/-/issues/273063 -# ee:geo: -# extends: -# - .test -# - .ee-qa -# - .rspec-report-opts -# variables: -# QA_SCENARIO: "Test::Integration::Geo" - -# ee:geo-quarantine: -# extends: -# - .test -# - .ee-qa -# - .quarantine -# - .rspec-report-opts -# variables: -# QA_SCENARIO: "Test::Integration::Geo" +ee:geo: + extends: + - .test + - .high-capacity + - .ee-qa + - .rspec-report-opts + variables: + QA_SCENARIO: "Test::Integration::Geo" + +ee:geo-quarantine: + extends: + - .test + - .high-capacity + - .ee-qa + - .quarantine + - .rspec-report-opts + variables: + QA_SCENARIO: "Test::Integration::Geo" ce:ldap_no_tls: extends: -- GitLab