Update to 8.5 and 8.1 based shippable

Dockerfile

@@ -1 +1 @@
-FROM       tas-tools-ext-01.ccr.xdmod.org/xdmod-centos7:open8.0.0-v2
+FROM       tas-tools-ext-01.ccr.xdmod.org/centos7_6-open8.1.0:latest

bin/xdmod-upgrade

@@ -26,7 +26,7 @@ ini_set('memory_limit', -1);
  * @var array
  */
 $supportedUpgrades = array(
-    '8.0.0' => '8.1.0',
+    '8.1.0' => '8.5.0',
 );
 
 /**

configuration/portal_settings.ini

@@ -6,7 +6,7 @@ contact_page_recipient = ""
 tech_support_recipient = ""
 
 ; The version number is updated during the upgrade process.
-version = "8.1.0"
+version = "8.5.0"
 
 debug_mode = "off"
 debug_recipient = ""

open_xdmod/modules/xdmod/automated_tests/test/specs/xdmod/reportGenerator.page.js

@@ -479,7 +479,8 @@ class ReportGenerator {
                 window: () => `//div[${classContains('x-window')} and .//span[text()="Save Report As"]]`,
                 fileNameInput: () => this.selectors.saveReportAs.window() + '//input[@name="report_name"]',
                 saveButton: () => this.selectors.saveReportAs.window() + '//button[text()="Save"]',
-                closeButton: () => this.selectors.saveReportAs.window() + '//button[text()="Close"]'
+                closeButton: () => this.selectors.saveReportAs.window() + '//button[text()="Close"]',
+                fileNameInputInvalid: () => this.selectors.saveReportAs.window() + `//input[@name="report_name" and ${classContains('x-form-invalid')}]`
             },
             reportBuilt: {
                 window: () => `//div[${classContains('x-window')} and .//span[text()="Report Built"]]`,
@@ -1111,7 +1112,13 @@ class ReportGenerator {
         browser.click(this.selectors.reportEditor.toolbar.saveAsButton());
         this.waitForSaveReportAsWindowVisible();
         if (reportName !== undefined) {
+            /*
+             * There is a "timing" issue when setting the value of the input box
+             * and then clicking on save to quickly, this forces it to wait for
+             * the invalid input to not be present
+             */
             browser.setValue(this.selectors.saveReportAs.fileNameInput(), reportName);
+            browser.waitUntilNotExist(this.selectors.saveReportAs.fileNameInputInvalid());
         }
     }
 

open_xdmod/modules/xdmod/build.json

@@ -1,6 +1,6 @@
 {
     "name": "xdmod",
-    "version": "8.1.0",
+    "version": "8.5.0",
     "release": "1.0",
     "files": {
         "include_paths": [

open_xdmod/modules/xdmod/integration_tests/email-subject-test.sh

@@ -5,6 +5,16 @@ curl "${host}controllers/mailer.php" --compressed -H 'X-Requested-With: XMLHttpR
 
 sed -i -- 's/subject_prefix = "SEND BEN MONEY"/subject_prefix = ""/' /etc/xdmod/portal_settings.ini
 
+# sometimes it takes a second to send the emails
+queueLength=`postqueue -p | tail -n1 | awk '{print $5}'`
+count=0
+while [[ "$queueLength" != ""  && $count < 5 ]]; do
+    echo "queue has not been emptied, waiting 1 second."
+    sleep 1
+    queueLength=`postqueue -p | tail -n1 | awk '{print $5}'`
+    ((count+=1))
+done
+
 emailsubjects=`grep 'SEND BEN MONEY' /var/mail/root -c`
 
 if [ $emailsubjects != 2 ]; then