diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5bc9a9639..0e623a43c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,6 +33,12 @@ variables: MAILBOX_INIT: "zammad@mail.test.dc.zammad.com:zammad" MAIL_ADDRESS: "zammad@mail.test.dc.zammad.com" MAIL_PASS: "zammad" + # docker-imap-devel variables required for integration tests + MAIL_SERVER: "mail" + MAIL_SERVER_ACCOUNT: "zammad@mail.test.dc.zammad.com:zammad" + MAIL_SERVER_EMAIL: "zammad@mail.test.dc.zammad.com" + KEEP_ON_MAIL_SERVER: "mail" + KEEP_ON_MAIL_SERVER_ACCOUNT: "zammad@mail.test.dc.zammad.com:zammad" # Cache gems in between jobs and pipelines # ATTENTION: We use a combination of the Ruby major and minor version number diff --git a/.gitlab/ci/base.yml b/.gitlab/ci/base.yml index 50d1b377e..86c98b6f4 100644 --- a/.gitlab/ci/base.yml +++ b/.gitlab/ci/base.yml @@ -86,6 +86,12 @@ - <<: *docker_postgresql - <<: *docker_selenium +.services_mysql_postgresql_imap: &services_mysql_postgresql_imap + services: + - <<: *docker_mysql + - <<: *docker_postgresql + - <<: *docker_imap + .services_mysql_postgresql_elasticsearch: &services_mysql_postgresql_elasticsearch variables: ELASTICSEARCH_TAG: 'stable' diff --git a/.gitlab/ci/integration/email_helper_deliver.yml b/.gitlab/ci/integration/email_helper_deliver.yml index 148fd3572..523c944c0 100644 --- a/.gitlab/ci/integration/email_helper_deliver.yml +++ b/.gitlab/ci/integration/email_helper_deliver.yml @@ -2,9 +2,10 @@ email_helper_deliver: extends: - .template_integration - .tags_mail + - .services_mysql_postgresql_imap script: - bundle exec rake zammad:db:unseeded - bundle exec rails test test/integration/email_helper_test.rb - bundle exec rails test test/integration/email_deliver_test.rb - bundle exec rails test test/integration/email_keep_on_server_test.rb - - bundle exec rails test test/integration/email_postmaster_to_sender.rb \ No newline at end of file + - bundle exec rails test test/integration/email_postmaster_to_sender.rb