Merge branch 'master' of github.com:spryker/project into testing_envi…

…roment_travis
spryker · Nov 15, 2016 · bd93e30 · bd93e30
2 parents c04a5c9 + 7e2f177
commit bd93e30
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 40 deletions.
diff --git a/codeception.yml b/codeception.yml
@@ -30,7 +30,7 @@ coverage:
     enabled: true
     remote: true
     c3_url: 'http://zed.de.project.local'
-    whitelist: { include: ['src/*.php'] }
+    whitelist: { include: ['src/Pyz/*.php'] }
 
 extensions:
     enabled:

diff --git a/composer.lock b/composer.lock
diff --git a/config/Shared/ci/travis/travis-ci-apache-yves b/config/Shared/ci/travis/travis-ci-apache-yves
@@ -1,8 +1,8 @@
 <VirtualHost *:80>
 
   DocumentRoot %TRAVIS_BUILD_DIR%/public/Yves
-  ServerName www.de.spryker.test
-  SetEnv APPLICATION_ENV test
+  ServerName www.de.spryker.local
+  SetEnv APPLICATION_ENV devtest
 
   <Directory "%TRAVIS_BUILD_DIR%">
       Options Indexes FollowSymLinks MultiViews ExecCGI

diff --git a/config/Shared/ci/travis/travis-ci-apache-zed b/config/Shared/ci/travis/travis-ci-apache-zed
@@ -1,8 +1,8 @@
 <VirtualHost *:80>
 
   DocumentRoot %TRAVIS_BUILD_DIR%/public/Zed
-  ServerName zed.de.spryker.test
-  SetEnv APPLICATION_ENV test
+  ServerName zed.de.spryker.local
+  SetEnv APPLICATION_ENV devtest
 
   ErrorLog /tmp/zed-error.log
 

diff --git a/config/Shared/config_default-development_DE.php b/config/Shared/config_default-development_DE.php
@@ -38,7 +38,7 @@
 
 $config[ApplicationConstants::JENKINS_BASE_URL] = 'http://localhost:10007/';
 $config[MailConstants::MAILCATCHER_GUI] = 'http://' . $config[ApplicationConstants::HOST_ZED_GUI] . ':1080';
-$config[ApplicationConstants::YVES_TRUSTED_HOSTS] = [$yvesHost, $zedHost];
+$config[ApplicationConstants::YVES_TRUSTED_HOSTS] = [];
 
 /* Elasticsearch */
 $config[ApplicationConstants::ELASTICA_PARAMETER__INDEX_NAME] = 'de_search';

diff --git a/config/Shared/config_default-development_US.php b/config/Shared/config_default-development_US.php
@@ -18,7 +18,7 @@
     = $config[ApplicationConstants::HOST_SSL_ZED_API]
     = 'https://' . $zedHost;
 
-$config[ApplicationConstants::YVES_TRUSTED_HOSTS] = [$yvesHost, $zedHost];
+$config[ApplicationConstants::YVES_TRUSTED_HOSTS] = [];
 
 $config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTP] = 'http://static.project.local';
 $config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTPS] = 'https://static.project.local';

diff --git a/config/Shared/config_default-devtest_DE.php b/config/Shared/config_default-devtest_DE.php
@@ -15,13 +15,13 @@
 $yvesHost = 'www-test.de.project.local';
 
 $config[PropelConstants::ZED_DB_ENGINE] = $config[PropelConstants::ZED_DB_ENGINE_PGSQL];
-$config[PropelConstants::ZED_DB_USERNAME] = 'development';
+$config[PropelConstants::ZED_DB_USERNAME] = 'devtest';
 $config[PropelConstants::ZED_DB_PASSWORD] = 'mate20mg';
-$config[PropelConstants::ZED_DB_DATABASE] = 'DE_test_zed';
+$config[PropelConstants::ZED_DB_DATABASE] = 'DE_devtest_zed';
 $config[PropelConstants::ZED_DB_HOST] = '127.0.0.1';
 $config[PropelConstants::ZED_DB_PORT] = 5432;
 
-$config[ApplicationConstants::ELASTICA_PARAMETER__INDEX_NAME] = 'de_search_test';
+$config[ApplicationConstants::ELASTICA_PARAMETER__INDEX_NAME] = 'de_search_devtest';
 
 $config[SearchConstants::SEARCH_INDEX_NAME_SUFFIX] = '_test';
 
@@ -81,6 +81,3 @@
 $config[ApplicationConstants::HOST_SSL_YVES] = 'https://' . $yvesHost;
 $config[ApplicationConstants::HOST_SSL_STATIC_ASSETS] = $config[ApplicationConstants::HOST_SSL_STATIC_MEDIA] = $yvesHost;
 $config[SessionConstants::ZED_SESSION_COOKIE_SECURE] = false;
-
-
-
diff --git a/config/Shared/config_default.php b/config/Shared/config_default.php
@@ -92,7 +92,7 @@
     = $config[ApplicationConstants::HOST_ZED_API]
     = $config[ApplicationConstants::HOST_SSL_ZED_GUI]
     = $config[ApplicationConstants::HOST_SSL_ZED_API]
-    = 'zed.de.spryker.dev';
+    = 'zed.de.project.local';
 
 $config[ApplicationConstants::YVES_TRUSTED_HOSTS] = [];
 

diff --git a/deploy/setup/params.sh b/deploy/setup/params.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SETUP='spryker'
-DATABASE_NAME='DE_test_zed'
+DATABASE_NAME='DE_development_zed'
 DATABASE_USER='development'
 DATABASE_PASSWORD='mate20mg'
 REDIS_PORT='10009'

diff --git a/setup_test b/setup_test
@@ -4,7 +4,9 @@ set -o pipefail
 
 .  deploy/setup/params.sh
 
-ELASTIC_SEARCH_INDEX='de_search_test'
+ELASTIC_SEARCH_INDEX='de_search_devtest'
+DATABASE_NAME='DE_devtest_zed'
+DATABASE_USER='devtest'
 
 export APPLICATION_ENV='devtest'