Merge branch 'master' of github.com:sugarcrm/school into vitals-audit

Author: mmarum-sugarcrm

.travis.yml

@@ -30,7 +30,7 @@ jobs:
     services:
     - docker
     env:
-    - SUGAR_VERSION=8.3 SUGAR_EDITION=Ent
+    - SUGAR_VERSION=9.0 SUGAR_EDITION=Ent
     before_script:
     - cd package
     - composer install
@@ -47,24 +47,7 @@ jobs:
     services:
     - docker
     env:
-    - SUGAR_VERSION=8.3 SUGAR_EDITION=Pro
-    before_script:
-    - cd package
-    - composer install
-    - "./pack.php -v $(date +'%Y%m%d-%H.%M.%S')"
-    - cd ../scripts
-    - sudo service mysql stop
-    script:
-    - "./SetupEnvAndRunTests.sh $SUGARCRM_USERNAME $SUGARCRM_PASSWORD $SUGAR_VERSION
-      $SUGAR_EDITION $GITHUB_USERNAME $GITHUB_PASSWORD workspace/sugardocker"
-  - stage: Run Tests
-    sudo: required
-    language: php
-    php: '7.1'
-    services:
-    - docker
-    env:
-    - SUGAR_VERSION=8.3 SUGAR_EDITION=Ult
+    - SUGAR_VERSION=9.0 SUGAR_EDITION=Pro
     before_script:
     - cd package
     - composer install

scripts/CloneSugarUnitTestsFromGitRepo.sh

@@ -31,7 +31,7 @@ gitHubPassword=$3
 if [[ "$sugarVersion" == "9.0" ]]
 then branch="9_0_0"
 
-if [[ "$sugarVersion" == "8.3" ]]
+elif [[ "$sugarVersion" == "8.3" ]]
 then branch="8_3_0"
 
 elif [[ "$sugarVersion" == "8.2" ]]

scripts/GetCopyOfSugar.sh

@@ -246,7 +246,7 @@ then
     downloadUrl="$(authenticateToSugarStoreAndGetDownloadUrl "SugarPro-8.0.0.zip")"
     expectedChecksum="418c4b23f6fc6db969dd132722f665d7e5426ed4"
 
-if [[ "$sugarName" == "Sugar$sugarEdition_Ent-$sugarVersion_9_0" ]]
+elif [[ "$sugarName" == "Sugar$sugarEdition_Ent-$sugarVersion_9_0" ]]
 then
     downloadUrl="$(authenticateToSugarStoreAndGetDownloadUrl "SugarEnt-9.0.0.zip")"
     expectedChecksum="918b87f809e9afef54d9d2275cb3a0c7644be92c"
@@ -256,7 +256,6 @@ then
     downloadUrl="$(authenticateToSugarStoreAndGetDownloadUrl "SugarPro-9.0.0.zip")"
     expectedChecksum="4fa5ed11a579b054a3392d1e91d23d5546a90e02"
 
-
 elif [[ "$sugarName" == "Sugar$sugarEdition_Ent-$sugarVersion_8_2" ]]
 then
     authenticateToDevBuildsCommunity

scripts/RunPostmanTests.sh

@@ -42,7 +42,7 @@ sudo chmod -R 777 . &> /dev/null
 currentDockerContainer="$(cat /etc/hostname)"
 if [[ -n $currentDockerContainer && $currentDockerContainer != *"travis-job"* ]]
 then
-    if [[ "$sugarVersion" == "8.2" || "$sugarVersion" == "8.3" ]]
+    if [[ "$sugarVersion" == "8.2" || "$sugarVersion" == "8.3" || "$sugarVersion" == "9.0" ]]
     then
         network="sugar81_default"
     elif [[ "$sugarVersion" == "8.0" ]]

scripts/StopDockerStack.sh

@@ -31,7 +31,7 @@ dockerDirectory=$2
 
 if [[ "$sugarVersion" == "9.0" ]]
 then
-    ymlPath=$dockerDirectory/stacks/sugar81/php71.yml
+    ymlPath=$dockerDirectory/stacks/sugar83/php71.yml
 elif [[ "$sugarVersion" == "8.3" ]]
 then
     ymlPath=$dockerDirectory/stacks/sugar81/php71.yml