Merge pull request #29 from magento/build-improvements

Automatic NFS configuration and validation

Author: paliarush

.travis.yml

@@ -19,14 +19,7 @@ before_script:
   - sudo apt-get update && sudo apt-get install -y socat
   # TODO Install sudo apt install nfs-kernel-server
   - sudo apt install -y nfs-kernel-server
-  - sudo ./scripts/host/configure_nfs_exports.sh
-  - cp ./tests/include/configuration.sh.dist ./tests/include/configuration.sh
-  - sed -i "s|[email protected]:|https://github.com/|g" ./etc/config.yaml.dist
-  - sed -i "s|minikube start --cpus=2 --memory=4096|sudo minikube start --cpus=2 --memory=4096  --vm-driver=none --bootstrapper=kubeadm --kubernetes-version=v1.13.0|g" ./init_project.sh
-  - 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
-  - sed -i "s/enabled:\ true \# NFS Status/enabled:\ false \# NFS Status/g" ./etc/helm/values.yaml
+  - sudo bash ./scripts/host/configure_ubuntu_travis.sh
   - cat ./tests/include/configuration.sh
   - cat ./scripts/host/k_rebuild_environment.sh
   - cat ./init_project.sh
@@ -35,3 +28,12 @@ before_script:
 script:
   # Run DevBox tests
   - cd ./tests && sudo bash ./testsuite.sh && cd ..
+
+after_script:
+  - sudo kubectl describe pods
+  - sudo kubectl describe deployments
+  - sudo kubectl get pv,pvc
+  - 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

scripts/host/check_requirements.sh

@@ -7,11 +7,10 @@ source "${vagrant_dir}/scripts/functions.sh"
 status "Checking requirements"
 incrementNestingLevel
 
-# TODO: Fix NFS requirements check
-#nfs_exports_record="\"${vagrant_dir}\" -alldirs -mapall=$(id -u):$(id -g) -mask 255.0.0.0 -network 192.0.0.0"
-#if [[ -z "$(grep "${nfs_exports_record}" /etc/exports)" ]]; then
-#    warning "NFS exports configuration required on the host. Please execute 'bash ${vagrant_dir}/scripts/host/configure_nfs_exports.sh' first."
-#    exit 1
-#fi
+nfs_exports_record="$(bash "${vagrant_dir}/scripts/host/get_nfs_exports_record.sh")"
+if [[ -z "$(grep "${nfs_exports_record}" /etc/exports)" ]]; then
+    warning "NFS exports configuration required on the host. Please execute 'bash ${vagrant_dir}/scripts/host/configure_nfs_exports.sh' first."
+    exit 1
+fi
 
 decrementNestingLevel

scripts/host/configure_nfs_exports.sh

@@ -15,13 +15,10 @@ if [[ ${debug_vagrant_project} -eq 1 ]]; then
 fi
 
 host_os="$(bash "${vagrant_dir}/scripts/host/get_host_os.sh")"
-
-# TODO: Calculate network IP
+nfs_exports_record="$(bash "${vagrant_dir}/scripts/host/get_nfs_exports_record.sh")"
 if [[ ${host_os} == "OSX" ]]; then
-    # TODO: Detect network IP dynamically
-    nfs_exports_record="\"${vagrant_dir}\" -alldirs -mapall=$(id -u):$(id -g) -mask 255.0.0.0 -network 192.0.0.0"
     if [[ -z "$(grep "${nfs_exports_record}" /etc/exports)" ]]; then
-        status "Updating /etc/exports to enable codebase sharing with containers via NFS"
+        status "Updating /etc/exports to enable codebase sharing with containers via NFS (${nfs_exports_record})"
         echo "${nfs_exports_record}" | sudo tee -a "/etc/exports" 2> >(logError) > >(log)
         sudo nfsd restart
         # TODO: Implement NFS exports clean up on project removal to prevent NFS mounting errors
@@ -31,10 +28,8 @@ if [[ ${host_os} == "OSX" ]]; then
 fi
 
 if [[ ${host_os} == "Linux" ]]; then
-    # TODO: Detect network IP dynamically
-    nfs_exports_record="\"${vagrant_dir}\" 172.17.0.0/255.255.0.0(rw,no_subtree_check,all_squash,anonuid=$(id -u),anongid=$(id -g))"
     if [[ -z "$(grep "${nfs_exports_record}" /etc/exports)" ]]; then
-        status "Updating /etc/exports to enable codebase sharing with containers via NFS"
+        status "Updating /etc/exports to enable codebase sharing with containers via NFS (${nfs_exports_record})"
         echo "${nfs_exports_record}" | sudo tee -a "/etc/exports" 2> >(logError) > >(log)
         sudo service nfs-kernel-server restart
         # TODO: Implement NFS exports clean up on project removal to prevent NFS mounting errors

scripts/host/configure_ubuntu_travis.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")/../.." && vagrant_dir=$PWD
+
+cd "${vagrant_dir}"
+sudo ./scripts/host/configure_nfs_exports.sh
+cp ./tests/include/configuration.sh.dist ./tests/include/configuration.sh
+sed -i "s|[email protected]:|https://github.com/|g" ./etc/config.yaml.dist
+sed -i "s|minikube start --cpus=2 --memory=4096|sudo minikube start --cpus=2 --memory=4096  --vm-driver=none --bootstrapper=kubeadm --kubernetes-version=v1.13.0|g" ./init_project.sh
+sed -i "s|git clone|git clone --depth 1 |g" ./init_project.sh
+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/enabled:\ true \# NFS Status/enabled:\ false \# NFS Status/g" ./etc/helm/values.yaml
+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

scripts/host/get_nfs_exports_record.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")/../.." && vagrant_dir=$PWD
+
+source "${vagrant_dir}/scripts/functions.sh"
+incrementNestingLevel
+
+# TODO: Calculate network IP
+host_os="$(bash "${vagrant_dir}/scripts/host/get_host_os.sh")"
+if [[ ${host_os} == "OSX" ]]; then
+    nfs_exports_record="\"${vagrant_dir}\" -alldirs -mapall=$(id -u):$(id -g) -mask 255.0.0.0 -network 192.0.0.0"
+elif [[ ${host_os} == "Linux" ]]; then
+    nfs_exports_record="\"${vagrant_dir}\" 172.17.0.0/255.255.0.0(rw,no_subtree_check,all_squash,anonuid=$(id -u),anongid=$(id -g))"
+else
+    error "Host OS is not supported"
+    exit 1
+fi
+
+echo "${nfs_exports_record}"
+
+decrementNestingLevel

tests/include/assertions.sh

@@ -2,21 +2,24 @@
 
 ## Assertion groups
 
-function executeCommonAssertions()
+function executeBasicCommonAssertions()
 {
-    # TODO: Implement functionality and uncomment assertions
-#    assertPhpStormConfigured
-
     # Make sure Magento was installed and is accessible
     assertMagentoInstalledSuccessfully
     assertMagentoFrontendAccessible
     assertMagentoCliWorks
+}
+
+function executeExtendedCommonAssertions()
+{
+    # TODO: Implement functionality and uncomment assertions
+#    assertPhpStormConfigured
 
 #    # Make sure Magento is still accessible after restarting services
 #    assertMysqlRestartWorks
 #    assertApacheRestartWorks
 #    assertMagentoFrontendAccessible
-#
+
     # Make sure Magento reinstall script works
     assertMagentoReinstallWorks
     assertMagentoFrontendAccessible

tests/include/helpers.sh

@@ -95,6 +95,7 @@ function deployVagrantProject()
     echo "${grey}## deployVagrantProject${regular}"
     echo "## deployVagrantProject" >>${current_log_file_path}
     cd "${vagrant_dir}"
+    sudo bash "${vagrant_dir}/scripts/host/configure_nfs_exports.sh"
     bash init_project.sh -fcd 2> >(logAndEcho) | {
       while IFS= read -r line
       do

tests/testsuite.sh

@@ -46,13 +46,13 @@ See logs in ${logs_dir}"
 
 ## Tests
 
-function testNoCustomConfig()
+function testNoCustomConfigBasicTest()
 {
     current_config_name="no_custom_config"
     current_codebase="ce"
     installEnvironment
 #    assertVarnishDisabled
-    executeCommonAssertions
+    executeBasicCommonAssertions
     assertMagentoEditionIsCE
     assertCeSampleDataNotInstalled
     assertTestsConfigured