Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Maintenance: Simplify handling of Redis and Memcached variables in GitLab CI configuration to remove redundancy.

Browse source
This commit is contained in:
Martin Gruner 2021-08-11 13:29:38 +02:00
parent f270b20b4f
commit 35135d78a5
2 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
.gitlab/ci/base.yml
View file

@ -13,6 +13,11 @@
ES_INDEX_RAND: "true" ES_INDEX_RAND: "true"
ES_URL: "http://elasticsearch:9200" ES_URL: "http://elasticsearch:9200"
.variables_redis_memcached: &variables_redis_memcached
variables:
REDIS_URL: "redis://redis:6379"
MEMCACHE_SERVERS: "memcached"
.variables_selenium_firefox: &variables_selenium_firefox .variables_selenium_firefox: &variables_selenium_firefox
variables: variables:
REMOTE_URL: "http://selenium-firefox:4444/wd/hub" REMOTE_URL: "http://selenium-firefox:4444/wd/hub"
@ -99,9 +104,8 @@
- <<: *docker_mysql - <<: *docker_mysql
.services_mysql_redis_memcached: &services_mysql_redis_memcached .services_mysql_redis_memcached: &services_mysql_redis_memcached
variables: extends:
REDIS_URL: "redis://redis:6379" - .variables_redis_memcached
MEMCACHE_SERVERS: "memcached"
services: services:
- <<: *docker_mysql - <<: *docker_mysql
- <<: *docker_redis - <<: *docker_redis
@ -112,9 +116,8 @@
- <<: *docker_postgresql - <<: *docker_postgresql
.services_postgresql_redis_memcached: &services_postgresql_redis_memcached .services_postgresql_redis_memcached: &services_postgresql_redis_memcached
variables: extends:
REDIS_URL: "redis://redis:6379" - .variables_redis_memcached
MEMCACHE_SERVERS: "memcached"
services: services:
- <<: *docker_postgresql - <<: *docker_postgresql
- <<: *docker_redis - <<: *docker_redis
@ -126,9 +129,8 @@
- <<: *docker_postgresql - <<: *docker_postgresql
.services_mysql_postgresql_redis_memcached: &services_mysql_postgresql_redis_memcached .services_mysql_postgresql_redis_memcached: &services_mysql_postgresql_redis_memcached
variables: extends:
REDIS_URL: "redis://redis:6379" - .variables_redis_memcached
MEMCACHE_SERVERS: "memcached"
services: services:
- <<: *docker_mysql - <<: *docker_mysql
- <<: *docker_postgresql - <<: *docker_postgresql
@ -190,10 +192,9 @@
.services_mysql_postgresql_elasticsearch_selenium_chrome_imap_redis_memcached: &services_mysql_postgresql_elasticsearch_selenium_chrome_imap_redis_memcached .services_mysql_postgresql_elasticsearch_selenium_chrome_imap_redis_memcached: &services_mysql_postgresql_elasticsearch_selenium_chrome_imap_redis_memcached
extends: extends:
- .variables_selenium_chrome - .variables_selenium_chrome
- .variables_redis_memcached
variables: variables:
ELASTICSEARCH_TAG: 'stable' ELASTICSEARCH_TAG: 'stable'
REDIS_URL: "redis://redis:6379"
MEMCACHE_SERVERS: "memcached"
services: services:
- <<: *docker_mysql - <<: *docker_mysql
- <<: *docker_postgresql - <<: *docker_postgresql
@ -206,10 +207,9 @@
.services_mysql_postgresql_elasticsearch_selenium_firefox_imap_redis_memcached: &services_mysql_postgresql_elasticsearch_selenium_firefox_imap_redis_memcached .services_mysql_postgresql_elasticsearch_selenium_firefox_imap_redis_memcached: &services_mysql_postgresql_elasticsearch_selenium_firefox_imap_redis_memcached
extends: extends:
- .variables_selenium_firefox - .variables_selenium_firefox
- .variables_redis_memcached
variables: variables:
ELASTICSEARCH_TAG: 'stable' ELASTICSEARCH_TAG: 'stable'
REDIS_URL: "redis://redis:6379"
MEMCACHE_SERVERS: "memcached"
services: services:
- <<: *docker_mysql - <<: *docker_mysql
- <<: *docker_postgresql - <<: *docker_postgresql

1
.gitlab/ci/browser-core.yml
View file

@ -84,7 +84,6 @@ include:
- .variables_es - .variables_es
variables: variables:
RAILS_ENV: "test" RAILS_ENV: "test"
REDIS_URL: "redis://redis:6379"
script: script:
- bundle exec rake zammad:ci:test:prepare - bundle exec rake zammad:ci:test:prepare
- bundle exec rspec --fail-fast -t type:system -t ~integration - bundle exec rspec --fail-fast -t type:system -t ~integration