Ver Fonte

Merged in FD3-347 (pull request #56)

FD3-347 Se quitó parámetro env(CLIENT)
Guillermo Espinoza há 7 anos atrás
pai
commit
53cb7404fa
2 ficheiros alterados com 6 adições e 7 exclusões
  1. 5 5
      .drone.yml
  2. 1 2
      app/config/parameters.yml.dist

+ 5 - 5
.drone.yml

@@ -19,13 +19,14 @@ pipeline:
       OAUTH_CLIENT_ID: ""
       OAUTH_CLIENT_ID: ""
       OAUTH_CLIENT_SECRET: ""
       OAUTH_CLIENT_SECRET: ""
       AMQP_KEY: ""
       AMQP_KEY: ""
+      CLIENT: fd3
     commands:
     commands:
       - command -v mysqladmin >/dev/null 2>&1 || { echo "I require mysqladmin but it's not installed.  Aborting." >&2; exit 1; }
       - command -v mysqladmin >/dev/null 2>&1 || { echo "I require mysqladmin but it's not installed.  Aborting." >&2; exit 1; }
       - while ! mysqladmin ping -h 127.0.0.1 --silent; do :; done
       - while ! mysqladmin ping -h 127.0.0.1 --silent; do :; done
 
 
       - yes | mysqladmin -h 127.0.0.1 create fd3_ftth
       - yes | mysqladmin -h 127.0.0.1 create fd3_ftth
       - yes | mysqladmin -h 127.0.0.1 create fd_session
       - yes | mysqladmin -h 127.0.0.1 create fd_session
-      
+
       - echo 'client = Flowdat3-FTTH-Drone-Test' | tee /etc/flowdat.conf
       - echo 'client = Flowdat3-FTTH-Drone-Test' | tee /etc/flowdat.conf
       - echo 'date.timezone="America/Argentina/Buenos_Aires"' >> /etc/php/7.0/cli/php.ini
       - echo 'date.timezone="America/Argentina/Buenos_Aires"' >> /etc/php/7.0/cli/php.ini
 
 
@@ -39,7 +40,7 @@ pipeline:
       - php bin/console doctrine:schema:update --force -vvv --env=test
       - php bin/console doctrine:schema:update --force -vvv --env=test
       - touch var/logs/test.log
       - touch var/logs/test.log
 
 
-      - tail -f var/logs/*.log & 
+      - tail -f var/logs/*.log &
       - bin/console server:run --help --end=prod
       - bin/console server:run --help --end=prod
       - vendor/phpunit/phpunit/phpunit -c phpunit.xml.dist
       - vendor/phpunit/phpunit/phpunit -c phpunit.xml.dist
 
 
@@ -48,7 +49,7 @@ pipeline:
    image: plugins/docker
    image: plugins/docker
    email: luciano@interlink.com.ar
    email: luciano@interlink.com.ar
    registry: docker.infra.flowdat.com
    registry: docker.infra.flowdat.com
-   tag: 
+   tag:
      - latest
      - latest
    when:
    when:
      event: [push]
      event: [push]
@@ -59,10 +60,9 @@ pipeline:
    image: plugins/docker
    image: plugins/docker
    email: luciano@interlink.com.ar
    email: luciano@interlink.com.ar
    registry: docker.infra.flowdat.com
    registry: docker.infra.flowdat.com
-   tag: 
+   tag:
      - "${DRONE_TAG:1:5}"
      - "${DRONE_TAG:1:5}"
      - "${DRONE_TAG:1:3}"
      - "${DRONE_TAG:1:3}"
    when:
    when:
      event: [tag]
      event: [tag]
      branch: [v*]
      branch: [v*]
-

+ 1 - 2
app/config/parameters.yml.dist

@@ -35,10 +35,9 @@ parameters:
     db_session_user: root
     db_session_user: root
     db_session_password: null
     db_session_password: null
 
 
-    # RabbitMQ routing key 
+    # RabbitMQ routing key
     env(AMQP_KEY) : ""
     env(AMQP_KEY) : ""
 
 
-    env(CLIENT): ''
     cookie_domain_client: '%env(CLIENT)%'
     cookie_domain_client: '%env(CLIENT)%'
     cookie_domain: '%cookie_domain_client%.fd3.flowdat.com'
     cookie_domain: '%cookie_domain_client%.fd3.flowdat.com'
     session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session, flowdat_radius_session, flowdat_cablemodem_session]
     session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session, flowdat_radius_session, flowdat_cablemodem_session]