test.diff

--- a/.ci/Jenkinsfile
+++ b/.ci/Jenkinsfile
@@@ -105,7 -95,11 +105,13 @@@ stage("Build") 
                          // Compatibility layer while the EE is not up to date with the new CI
                          sh "cp vendor/akeneo/pim-community-dev/Dockerfile ."
                          sh "cp -R vendor/akeneo/pim-community-dev/.ci ."
 -                        sh "mkdir -m 777 -p app/build/logs/behat app/build/logs/consumer "
  
++<<<<<<< HEAD
++=======
+                         sh "cp app/config/parameters.yml.dist app/config/parameters_test.yml"
+                         sh "sed -i \"s#database_host: .*#database_host: 127.0.0.1#g\" app/config/parameters_test.yml"
+                         sh "sed \"\$a    installer_data: 'PimEnterpriseInstallerBundle:minimal'\n\" app/config/parameters_test.yml"
++>>>>>>> origin/1.6
                          sh "gcloud container builds submit --tag eu.gcr.io/akeneo-ci/pim-community-dev:pull-request-${env.CHANGE_ID}-build-${env.BUILD_NUMBER}-ee ."
                      }
                  })
@@@ -181,11 -174,6 +187,14 @@@
                          sh "sed -i \"s@# mongodb_database: .*@mongodb_database: akeneo_pim@g\" app/config/pim_parameters.yml"
                          sh "sed -i \"s@# mongodb_server: .*@mongodb_server: 'mongodb://127.0.0.1:27017'@g\" app/config/pim_parameters.yml"
                          sh "printf \"    pim_catalog_product_storage_driver: doctrine/mongodb-odm\n\" >> app/config/parameters_test.yml"
++<<<<<<< HEAD
 +
 +                        // Compatibility layer while the EE is not up to date with the new CI
 +                        sh "cp vendor/akeneo/pim-community-dev/Dockerfile ."
 +                        sh "cp -R vendor/akeneo/pim-community-dev/.ci ."
 +
++=======
++>>>>>>> origin/1.6
                          sh "gcloud container builds submit --tag eu.gcr.io/akeneo-ci/pim-community-dev:pull-request-${env.CHANGE_ID}-build-${env.BUILD_NUMBER}-eeodm ."
                      }
                  })