From 8eb588a370acc6610d942891728b62c119336c5d Mon Sep 17 00:00:00 2001 From: Martin Gruner Date: Tue, 15 Mar 2022 10:08:22 +0100 Subject: [PATCH] Maintenance: Improved CI configuration to run certain jobs only in low concurrency environments. --- .gitlab/ci/base.yml | 5 +++++ .gitlab/ci/browser-core.yml | 4 ++++ .gitlab/ci/browser-integration.yml | 3 +++ 3 files changed, 12 insertions(+) diff --git a/.gitlab/ci/base.yml b/.gitlab/ci/base.yml index 1339ce02b..2de88924d 100644 --- a/.gitlab/ci/base.yml +++ b/.gitlab/ci/base.yml @@ -62,6 +62,11 @@ tags: - docker +.tags_docker_low_concurrency: &tags_docker_low_concurrency + tags: + - docker + - low_concurrency + # Workaround for blocked port 25 access on cloud provider infrastructure .tags_mail: &tags_mail tags: diff --git a/.gitlab/ci/browser-core.yml b/.gitlab/ci/browser-core.yml index e1cfbaadd..1e2d5db17 100644 --- a/.gitlab/ci/browser-core.yml +++ b/.gitlab/ci/browser-core.yml @@ -19,6 +19,7 @@ include: - .env_base - .variables_es - .variables_app_restart_cmd + - .tags_docker_low_concurrency variables: RAILS_ENV: "production" script: @@ -46,6 +47,7 @@ include: extends: - .env_base - .variables_app_restart_cmd + - .tags_docker_low_concurrency variables: RAILS_ENV: "production" AUTO_WIZARD_FILE: "contrib/auto_wizard_example.json" @@ -76,6 +78,7 @@ include: - .env_base - .variables_app_restart_cmd - .services_mysql_postgresql_redis_memcached + - .tags_docker_low_concurrency variables: RAILS_ENV: "production" @@ -87,6 +90,7 @@ include: - .env_base - .variables_es - .variables_rspec_slicing + - .tags_docker_low_concurrency variables: RAILS_ENV: "test" script: diff --git a/.gitlab/ci/browser-integration.yml b/.gitlab/ci/browser-integration.yml index 74ab63c54..2599a44b1 100644 --- a/.gitlab/ci/browser-integration.yml +++ b/.gitlab/ci/browser-integration.yml @@ -14,6 +14,7 @@ include: - .env_base - .variables_app_restart_cmd - .variables_es + - .tags_docker_low_concurrency variables: RAILS_ENV: "test" script: @@ -40,6 +41,7 @@ include: - .env_base - .variables_app_restart_cmd - .services_postgresql_selenium_chrome + - .tags_docker_low_concurrency variables: RAILS_ENV: "production" AUTO_WIZARD_FILE: "contrib/auto_wizard_test.json" @@ -58,6 +60,7 @@ include: extends: - .env_base - .services_postgresql_selenium_chrome + - .tags_docker_low_concurrency variables: RAILS_ENV: "production" RAILS_SERVE_STATIC_FILES: "true"