Travis test for composer-based Magento installation scenario

Author: paliarush

.travis.yml

@@ -6,15 +6,15 @@ dist: xenial
 stages:
   - name: "Basic Tests"
   - name: "Extended Tests"
-    if: type = cron
+    if: branch = master
 jobs:
   include:
     - stage: "Basic Tests"
       script:
         - travis_wait 15 sudo bash ./tests/run-tests-on-travis.sh testNoCustomConfigBasicTest
     - stage: "Extended Tests"
       script: travis_wait 30 sudo bash ./tests/run-tests-on-travis.sh testCe23WithSampleDataMysqlSearchNoNfs
-    # - script: travis_wait 30 sudo bash ./tests/run-tests-on-travis.sh anotherTestGoesHere
+    - script: travis_wait 20 sudo bash ./tests/run-tests-on-travis.sh testCeFromComposerNoNfs
 
 env:
   global:
@@ -51,6 +51,7 @@ after_script:
   - sudo kubectl logs -l app=magento -c monolith-xdebug
   - sudo kubectl logs -l app=magento -c monolith
   - sudo kubectl logs -l app=magento -c nginx
-  - sudo cat /etc/exports
-  - sudo cat ./tests/logs/*
   - sudo cat ./logs/*
+  - sudo cat ./tests/tmp/test/current-test.log
+  - sudo cat ./tests/tmp/test/magento2-devbox/log/*
+  - sudo cat /etc/exports

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.com/magento/magento2-kubernetes-devbox.svg?branch=master)](https://travis-ci.com/magento/magento2-kubernetes-devbox)
 <!--[![MIT License](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE)-->
-[![Semver](http://img.shields.io/SemVer/2.0.0.png?color=blue)](http://semver.org/spec/v2.0.0.html)
+<!--[![Semver](http://img.shields.io/SemVer/2.0.0.png?color=blue)](http://semver.org/spec/v2.0.0.html)-->
 <!--[![Latest GitHub release](docs/images/release_badge.png)](https://github.com/paliarush/magento2-vagrant-for-developers/releases/latest)-->
 
  * [What You get](#what-you-get)
@@ -109,19 +109,18 @@ The software listed below should be available in [PATH](https://en.wikipedia.org
     cd magento2-devbox
     
     # NFS configuration is needed just once for each project, it will prompt for your password to make changes on the host
+    
     bash scripts/host/configure_nfs_exports.sh
     
     bash init_project.sh
     ```
+    <!--
     To initialize project with checkout container,
     clone sources to checkout directory and use -e parameter to init_project.sh call.
     ```
     bash init_project.sh -e
     ```
-    If you have issues with nfs. To use filesystem mount instead of nfs use -d parameter to init_project.sh call.
-    ```
-    bash init_project.sh -d
-    ```
+    -->
     
  1. Use the `magento2-devbox` directory as the project root in PHP Storm (not `magento2-devbox/magento`). This is important, because in this case PHP Storm will be configured automatically by [init_project.sh](init_project.sh).<!-- If NFS files sync is disabled in [config](etc/config.yaml.dist) and ![](docs/images/windows-icon.png)on Windows hosts [verify the deployment configuration in PHP Storm](docs/phpstorm-configuration-windows-hosts.md).-->
 
@@ -289,7 +288,7 @@ The following configuration files are used by default:
 - [Actually applied Dockerfile for monolith with xDebug and customizations](etc/docker/monolith-with-xdebug/Dockerfile)
 - [Kubernetes config for Monolith](etc/helm/templates/magento2-deployment.yaml)
 - [Kubernetes Helm variables](etc/helm/values.yaml)
-- [Configs for Checkout service](etc/helm/charts/checkout)
+<!--- [Configs for Checkout service](etc/helm/charts/checkout)-->
 <!--It is possible to view/modify majority of guest machine config files directly from IDE on the host. They will be accessible in [etc/guest](etc/guest) directory only when guest machine is running. The list of accessible configs includes: PHP, Apache, Mysql, Varnish, RabbitMQ.
 Do not edit any symlinks using PhpStorm because it may break your installation.
 
@@ -399,9 +398,13 @@ Note: See [Working with npm](https://www.npmjs.com/package/n#working-with-npm) i
 ### DevBox tests
 
 The tests are executed on every PR on Travis CI. It is possible to configure the same tests to run on the forked repository.
+In order to run composer-based Magento tests for the fork, repo.magento.com credentials must be set to `COMPOSER_AUTH` [environment variable](https://docs.travis-ci.com/user/environment-variables/#defining-variables-in-repository-settings) on Travis CI, the variable value should be:
+```
+'{"http-basic": {"repo.magento.com": {"username": "<public_key>","password": "<secret_key>"}}}'
+```
 
-An extended testsuite is executed nightly on the master branch. On every PR by default only basic smoke tests are executed.
-It is possible to execute an extended testsuite on every PR build by commenting out `if: type = cron` in the [.travis.yaml](./.travis.yml)
+An extended testsuite by default is executed against the master branch only.
+It is possible to execute an extended testsuite on every build by commenting out `if: branch = master` in the [.travis.yaml](./.travis.yml)
 
 The same tests can be run on local using the following command. :warning: only one devbox can be running on the same host at the same time. The tests will destroy existing devbox installation.
 

etc/.gitignore

@@ -1 +1,2 @@
 config.yaml
+composer/auth.json

etc/composer/auth.json.dist

@@ -1,10 +1,8 @@
 {
-  "github-oauth": {
-  },
   "http-basic": {
     "repo.magento.com": {
       "username": "your-magento-repo-public-key",
       "password": "your-magento-repo-secret-key"
     }
   }
-}
+}

init_project.sh

@@ -129,20 +129,20 @@ function composerCreateProject()
 {
     if [[ ! -d ${magento_ce_dir} ]]; then
         status "Downloading Magento codebase using 'composer create-project'"
-        bash "${devbox_dir}/scripts/host/composer.sh" create-project ${composer_project_name} "${magento_ce_dir}" --repository-url=${composer_project_url}
-
-        # TODO: Workaround for Magento 2.2+ until PHP is upgraded to 7.1 on the guest
-        cd "${magento_ce_dir}"
-        composer_dir="${devbox_dir}/scripts/host"
-        composer_phar="${composer_dir}/composer.phar"
-        php_executable="$(bash "${devbox_dir}/scripts/host/get_path_to_php.sh")"
-        project_version="$("${php_executable}" "${composer_phar}" show --self | grep version)"
-        matching_version_pattern='2.[23].[0-9]+'
-        if [[ ${project_version} =~ ${matching_version_pattern} ]]; then
-            status "Composer require zendframework/zend-code:~3.1.0 (needed for Magento 2.2+ only)"
-            cd "${magento_ce_dir}"
-            bash "${devbox_dir}/scripts/host/composer.sh" require "zendframework/zend-code:~3.1.0"
-        fi
+        bash "${devbox_dir}/scripts/host/m_composer.sh" create-project ${composer_project_name} "${magento_ce_dir}" --repository-url=${composer_project_url}
+
+#        # TODO: Workaround for Magento 2.2+ until PHP is upgraded to 7.1 on the guest
+#        cd "${magento_ce_dir}"
+#        composer_dir="${devbox_dir}/scripts/host"
+#        composer_phar="${composer_dir}/composer.phar"
+#        php_executable="$(bash "${devbox_dir}/scripts/host/get_path_to_php.sh")"
+#        project_version="$("${php_executable}" "${composer_phar}" show --self | grep version)"
+#        matching_version_pattern='2.[23].[0-9]+'
+#        if [[ ${project_version} =~ ${matching_version_pattern} ]]; then
+#            status "Composer require zendframework/zend-code:~3.1.0 (needed for Magento 2.2+ only)"
+#            cd "${magento_ce_dir}"
+#            bash "${devbox_dir}/scripts/host/m_composer.sh" require "zendframework/zend-code:~3.1.0"
+#        fi
     fi
 }
 
@@ -203,17 +203,6 @@ if [[ ${force_project_cleaning} -eq 1 ]]; then
     fi
 fi
 
-if [[ ! -d ${magento_ce_dir} ]]; then
-    if [[ "${checkout_source_from}" == "composer" ]]; then
-        composerCreateProject
-    elif [[ "${checkout_source_from}" == "git" ]]; then
-        checkoutSourceCodeFromGit
-    else
-        error "Value specified for 'checkout_source_from' is invalid. Supported options: composer OR git"
-        exit 1
-    fi
-fi
-
 status "Initializing dev box"
 cd "${devbox_dir}"
 
@@ -265,6 +254,17 @@ else
     bash "${devbox_dir}/scripts/host/k_rebuild_environment.sh"
 fi
 
+if [[ ! -d ${magento_ce_dir} ]]; then
+    if [[ "${checkout_source_from}" == "composer" ]]; then
+        composerCreateProject
+    elif [[ "${checkout_source_from}" == "git" ]]; then
+        checkoutSourceCodeFromGit
+    else
+        error "Value specified for 'checkout_source_from' is invalid. Supported options: composer OR git"
+        exit 1
+    fi
+fi
+
 monolith_ip="$(minikube service magento2-monolith --url | grep -oE '[0-9][^:]+' | head -1)"
 status "Saving Magento monolith container IP to etc/config.yaml (${monolith_ip})"
 sed -i.back "s|ip_address: \".*\"|ip_address: \"${monolith_ip}\"|g" "${config_path}"

scripts/guest/composer.sh

@@ -14,12 +14,15 @@ composer_auth_json="${devbox_dir}/etc/composer/auth.json"
 # commented out due to composer conflicts
 # ${php_executable} "${composer_phar}" global require "hirak/prestissimo:^0.3"
 
-cd "${DEVBOX_ROOT}/magento"
 if [[ -f ${composer_auth_json} ]]; then
     status "Exporting etc/auth.json to environment variable"
     export COMPOSER_AUTH="$(cat "${composer_auth_json}")"
 fi
 
+if [[ -d "${DEVBOX_ROOT}/magento" ]]; then
+    cd "${DEVBOX_ROOT}/magento"
+fi
+
 status "composer --no-interaction "$@""
 composer --no-interaction "$@" 2> >(log) > >(log)
 

scripts/host/configure_ubuntu_travis.sh

@@ -14,3 +14,4 @@ sed -i "s|minikube start --cpus=2 --memory=4096|sudo minikube start --cpus=2 --m
 sed -i "s|&& eval \$(minikube docker-env) ||g" ./scripts/host/k_rebuild_environment.sh
 sed -i "s/use_nfs:\ 1/use_nfs:\ 0/g" ./etc/config.yaml.dist
 sed -i "s/nfs_server_ip:\ \"0\.0\.0\.0\"/nfs_server_ip:\ \"$(ip -4 addr show docker0 | grep -Po 'inet \K[\d.]+')\"/g" ./etc/config.yaml.dist
+echo "${COMPOSER_AUTH}" > ./etc/composer/auth.json

scripts/host/m_reinstall.sh

@@ -6,10 +6,11 @@ source "${devbox_dir}/scripts/functions.sh"
 
 magento_app_code_dir="${devbox_dir}/magento/app/code/Magento"
 
-cd "${magento_app_code_dir}"
-
-status "Deleting TestModule directories"
-ls | grep "TestModule" | xargs rm -rf
+if [[ -d "${magento_app_code_dir}" ]]; then
+    cd "${magento_app_code_dir}"
+    status "Deleting TestModule directories"
+    ls | grep "TestModule" | xargs rm -rf
+fi
 
 cd "${devbox_dir}"
 

tests/_files/ce_from_composer_no_nfs_config.yaml

@@ -0,0 +1,70 @@
+# [To apply changes: init_project.sh -fc] Possible values: git, composer
+checkout_source_from: "composer"
+
+composer_project:
+  # Current section used only if 'checkout_source_from' is set to 'composer'
+
+  # [To apply changes: init_project.sh -fc]
+  # Custom version can be provided by using '={version}' appended to repo name. E.g. name: "magento/project-community-edition=2.2.0". Otherwise, default version is used
+  name: "magento/project-community-edition"
+  # Make sure to specify valid keys for this repository in etc/composer/auth.json
+  url: "https://repo.magento.com"
+
+repository_url:
+  # Current section used only if 'checkout_source_from' is set to 'git'
+
+  # [To apply changes: init_project.sh -fc]
+  # git@github.com:magento/magento2ce.git OR custom one. Use '::' to specify a specific branch, e.g: git@github.com:magento/magento2.git::2.1
+  ce: "git@github.com:magento/magento2.git"
+  # git@github.com:magento/magento2ee.git OR custom one
+  ee: ""
+  # can be replaced with custom repository. Use '::' to specify a specific branch, e.g: git@github.com:magento/magento2-sample-data.git::2.1-develop
+  ce_sample_data: "git@github.com:magento/magento2-sample-data.git"
+  # git@github.com:magento/magento2-sample-data-ee.git OR custom one
+  ee_sample_data: ""
+
+guest:
+  # [To apply changes: init_project.sh -f] NFS will be used for folder synchronization on *nix and OSX hosts by default.
+  use_nfs: 0
+  # [To apply changes: init_project.sh -f] The placeholder IP will be replaced with auto-detected value, unless modified manually before execution of "init_project.sh" script.
+  nfs_server_ip: "0.0.0.0"
+  # [To apply changes: devbox reload] Default is 2Gb, around 3Gb is necessary to run functional tests.
+  memory: 2048
+  # Recommended number of CPUs is 2
+  cpus: 1
+  ip_address: "192.168.10.2"
+  forwarded_ssh_port: 3000
+
+environment:
+  # [To apply changes: devbox reload] Valid versions: 5.6, 7.0, 7.1, 7.2
+  php_version: "7.0"
+  composer_prefer_source: 0
+  # [To apply changes: m-reinstall OR m-varnish enable/disable]
+  use_varnish: 0
+  # [To apply changes: m-reinstall] Possible values: mysql, elasticsearch
+  search_engine: "elasticsearch"
+
+magento:
+  # [To apply changes: m-switch-to-ce -f OR m-switch-to-ee -f]
+  install_sample_data: 0
+  # [To apply changes: m-switch-to-ce -f OR m-switch-to-ee -f] Generate customer (customer@example.com:123123qQ), category, simple product, configurable product after successful Magento installation
+  generate_basic_data: 1
+  # [To apply changes: init_project.sh -f]
+  host_name: "magento2.devbox2"
+  # [To apply changes: m-reinstall]
+  admin_frontname: "admin"
+  language: "en_US"
+  timezone: "America/Chicago"
+  currency: "USD"
+  admin_user: "admin"
+  admin_password: "123123q"
+  # [Changes applied on m-clear-cache] Available options: developer, production, default
+  mode: "developer"
+
+debug:
+  # [Changes applied on m-clear-cache] Enable template path and block name hints on storefront
+  magento_storefront: 0
+  # [Changes applied on m-clear-cache] Enable template path hints in the admin panel
+  magento_admin: 0
+  # [Changes applied immediately] Enable detailed output from all scripts provided by current devbox project
+  devbox_project: 0

tests/include/auth.json.dist

@@ -1,6 +1,4 @@
 {
-  "github-oauth": {
-  },
   "http-basic": {
     "repo.magento.com": {
       "username": "",