Skip to content

Commit

Permalink
Update shippable to 8.1.2 (#929)
Browse files Browse the repository at this point in the history
* update docker to 8.1.2 build for shippable
  • Loading branch information
plessbd authored May 20, 2019
1 parent f369bab commit d5eeb65
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM tas-tools-ext-01.ccr.xdmod.org/centos7_6-open8.1.0:latest
FROM tas-tools-ext-01.ccr.xdmod.org/centos7_6-open8.1.2:latest
2 changes: 1 addition & 1 deletion tests/ci/scripts/create_xdmod_users.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Open XDMoD and 476 (TACC) for XSEDE XDMoD.

define('SERVICE_PROVIDER_ID', 1);
define('DEFAULT_SECRETS_FILE', '/root/assets/secrets.json');
define('DEFAULT_SECRETS_FILE', '/root/src/github.com/ubccr/xdmod/tests/ci/testing.json');
define('DEFAULT_XDMOD_PATH', '/usr/share/xdmod');

$scriptOptions = array(
Expand Down
2 changes: 1 addition & 1 deletion tests/component/runtests.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash

echo "Component tests beginging:" `date +"%a %b %d %H:%M:%S.%3N %Y"`
# Implode an array using the specified separator

function implode_array {
Expand Down
2 changes: 2 additions & 0 deletions tests/integration/runtests.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/bin/sh
set -e

echo "Integration tests beginging:" `date +"%a %b %d %H:%M:%S.%3N %Y"`

UATCU=""
UATXCU=""

Expand Down
2 changes: 1 addition & 1 deletion tests/regression/runtests.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash

echo "Regression tests beginging:" `date +"%a %b %d %H:%M:%S.%3N %Y"`
set -e

junit_output_dir=""
Expand Down
16 changes: 8 additions & 8 deletions tests/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
"license": "GPL-3.0",
"dependencies": {
"chai": "4.1.2",
"cheerio": "1.0.0-rc.2",
"chromedriver": "2.40.0",
"cheerio": "1.0.0-rc.3",
"chromedriver": "74.0.0",
"mocha": "5.2",
"require-dir": "1.0",
"selenium-standalone": "6.15.1",
"selenium-standalone": "6.16.0",
"wdio-chromedriver-service": "0.1.3",
"wdio-junit-reporter": "0.4.3",
"wdio-mocha-framework": "0.6.1",
"wdio-sauce-service": "0.4.8",
"wdio-selenium-standalone-service": "0.0.10",
"wdio-spec-reporter": "0.1.4",
"wdio-junit-reporter": "0.4.4",
"wdio-mocha-framework": "0.6.4",
"wdio-sauce-service": "0.4.14",
"wdio-selenium-standalone-service": "0.0.12",
"wdio-spec-reporter": "0.1.5",
"webdriverio": "4.13.0"
},
"repository": "https://github.com/ubccr/xdmod"
Expand Down
7 changes: 5 additions & 2 deletions tests/ui/runtests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ CACHEFILE='/tmp/browser-tests-node-modules.tar.gz'
set -e
set -o pipefail

echo "UI tests beginging:" `date +"%a %b %d %H:%M:%S.%3N %Y"`

if [ "$1" = "--headless" ];
then
WDIO_MODE=headless
Expand All @@ -27,11 +29,12 @@ then
fi

pushd `dirname $0`


if [[ ! -d 'node_modules' && -f $CACHEFILE ]];
then
echo "using cache file"
tar -moxf $CACHEFILE
else
echo "No cache file found."
fi
npm set progress=false
npm install --quiet
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/runtests.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh

echo "Unit tests beginging:" `date +"%a %b %d %H:%M:%S.%3N %Y"`
PHPUNITARGS=""
if [ "$1" = "coverage" ];
then
Expand Down

0 comments on commit d5eeb65

Please sign in to comment.