Initial updates

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/integration_tests/email-subject-test.sh

@@ -5,6 +5,13 @@ 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}'`
+if [ "$queueLength" != ""  ]; then
+    echo "queue has not been emptied, waiting 1 second."
+    sleep 1
+fi
+
 emailsubjects=`grep 'SEND BEN MONEY' /var/mail/root -c`
 
 if [ $emailsubjects != 2 ]; then

open_xdmod/modules/xdmod/integration_tests/scripts/bootstrap.sh

@@ -39,7 +39,7 @@ then
     sudo -u xdmod xdmod-ingestor --aggregate=storage --last-modified-start-date "$last_modified_start_date"
     sudo -u xdmod xdmod-import-csv -t names -i $REF_DIR/names.csv
     sudo -u xdmod xdmod-ingestor
-    php /root/bin/createusers.php
+    php $BASEDIR/../../../../../tests/ci/scripts/create_xdmod_users.php
     # This will ensure that the users created in `/root/bin/createusers.php`
     # have their organizations set correctly.
     sudo -u xdmod php /usr/share/xdmod/tools/etl/etl_overseer.php -p xdmod.acls-import
@@ -50,17 +50,4 @@ then
     yum -y install ~/rpmbuild/RPMS/*/*.rpm
     ~/bin/services start
     expect $BASEDIR/xdmod-upgrade.tcl | col -b
-
-    # Add storage resources and data.  These resources and data should be added
-    # to the 8.1 Docker image and this script should then be removed.
-    expect $BASEDIR/xdmod-upgrade-add-storage-resources.tcl | col -b
-    for storage_dir in $REF_DIR/storage/*; do
-        sudo -u xdmod xdmod-shredder -f storage -r $(basename $storage_dir) -d $storage_dir
-    done
-    last_modified_start_date=$(date +'%F %T')
-    sudo -u xdmod xdmod-ingestor --datatype storage
-    sudo -u xdmod xdmod-ingestor --aggregate=storage --last-modified-start-date "$last_modified_start_date"
-
-    sudo -u xdmod xdmod-shredder -r openstack -d $REF_DIR/openstack -f openstack
-    sudo -u xdmod xdmod-ingestor
 fi

shippable.yml

@@ -3,14 +3,14 @@ env:
     - XDMOD_TEST_MODE=fresh_install
     - XDMOD_TEST_MODE=upgrade
 build:
-    cache: true
+    cache: false
     cache_dir_list:
         - /root/.composer
         - /root/.npm
     pre_ci:
-        - docker build -t pseudo_repo/xdmod-open-751:latest .
+        - docker build -t pseudo_repo/openxdmod:latest .
     pre_ci_boot:
-        image_name: pseudo_repo/xdmod-open-751
+        image_name: pseudo_repo/openxdmod
         image_tag: latest
         pull: false
         options: "--user root -e HOME=/root --shm-size 2g"