From d28086af95e6cf82f6af6dac82fb0e9a01203fef Mon Sep 17 00:00:00 2001
From: Thorsten Eckel <te@znuny.com>
Date: Sun, 20 Jan 2019 15:36:34 +0100
Subject: [PATCH] Refactoring: On premise CI infrastructure doesn't scale.

---
 .gitlab-ci.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 510c28235..7598542fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,6 +32,11 @@ variables:
   tags:
     - docker
 
+# Workaround for blocked port 25 access on cloud provider infrastructure
+.requires_mail_port_access_template: &requires_mail_port_access
+  tags:
+    - mail
+
 .base_env_template: &base_env
   <<: *docker_env
   <<: *artifacts_error
@@ -154,6 +159,7 @@ test:unit:postgresql:
 
 test:integration:email_helper_deliver:
   <<: *test_integration_definition
+  <<: *requires_mail_port_access
   script:
     - bundle exec rake zammad:db:unseeded
     - bundle exec ruby -I test/ test/integration/email_helper_test.rb
@@ -482,6 +488,7 @@ test:browser:core:ff_2_mysql:
 
 test:browser:core:ff_3_mysql:
   <<: *test_browser_core_mysql_definition
+  <<: *requires_mail_port_access
   variables:
     <<: *variables_browser_definition
     BROWSER: "firefox"
@@ -524,6 +531,7 @@ test:browser:core:ff_2_postgresql:
 
 test:browser:core:ff_3_postgresql:
   <<: *test_browser_core_postgresql_definition
+  <<: *requires_mail_port_access
   variables:
     <<: *variables_browser_definition
     BROWSER: "firefox"