- Increased virtual box memory to 3GB to support tests

- Composer initialization and git installation moved to install_environment.sh

Author: Alexander Paliarush

Vagrantfile

@@ -15,7 +15,7 @@ Vagrant.configure(2) do |config|
     config.vm.box = "ubuntu/trusty64"
 
     config.vm.provider "virtualbox" do |vb|
-        vb.memory = 2048
+        vb.memory = 3072 # Around 3Gb is necessary to be able to run tests
     end
     config.vm.network :private_network, ip: '192.168.10.11'
     config.vm.hostname = "magento2.vagrant"

install_environment.sh

@@ -68,13 +68,28 @@ sed -i '/\[client\]/a \
 user = root \
 password =' /etc/mysql/my.cnf
 
+# Install git
+apt-get install -y git
+
 # Setup Composer
 if [ ! -f /usr/local/bin/composer ]; then
     cd /tmp
     curl -sS https://getcomposer.org/installer | php
     mv composer.phar /usr/local/bin/composer
 fi
 
+# Configure composer
+composer_auth_json="/vagrant/local.config/composer/auth.json"
+if [ -f ${composer_auth_json} ]; then
+    set +x
+    echo "Installing composer OAuth tokens from ${composer_auth_json}..."
+    set -x
+    if [ ! -d /home/vagrant/.composer ] ; then
+      sudo -H -u vagrant bash -c 'mkdir /home/vagrant/.composer'
+    fi
+    cp ${composer_auth_json} /home/vagrant/.composer/auth.json
+fi
+
 # Declare path to scripts supplied with vagrant and Magento
 magento_dir="/var/www/magento2ce"
 echo "export PATH=\$PATH:/vagrant/bin:${magento_dir}/bin" >> /etc/profile

install_magento.sh

@@ -39,24 +39,8 @@ for db_name in "${db_names[@]}"; do
     mysql -e "drop database if exists ${db_name}; create database ${db_name};"
 done
 
-# Install git
-apt-get install -y git
-
 # Install Magento application
 cd ${magento_dir}
-composer_auth_json="/vagrant/local.config/composer/auth.json"
-if [ -f ${composer_auth_json} ]; then
-    set +x
-    echo "Installing composer OAuth tokens from ${composer_auth_json}..."
-    set -x
-    if [ ! -d /home/vagrant/.composer ] ; then
-      sudo -H -u vagrant bash -c 'mkdir /home/vagrant/.composer'
-    fi
-    cp ${composer_auth_json} /home/vagrant/.composer/auth.json
-    sudo -H -u vagrant bash -c 'composer install'
-else
-    sudo -H -u vagrant bash -c 'composer install --prefer-source'
-fi
 
 admin_frontame="admin"
 install_cmd="./bin/magento setup:install \
@@ -77,7 +61,7 @@ install_cmd="./bin/magento setup:install \
     --use-rewrites=1"
 
 # Configure Rabbit MQ
-if [ -d "${magento_dir}/app/code/Magento/Amqp" ]; then
+if [ -f "${magento_dir}/app/code/Magento/Amqp/registration.php" ]; then
     install_cmd="${install_cmd} \
     --amqp-host=localhost \
     --amqp-port=5672 \