Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ dependencies:
pre:
- docker pull plotly/testbed:latest
post:
- eval $(node tasks/run_docker.js)
- npm run cibuild
- npm run pretest
- eval $(node tasks/setup_docker.js)

test:
override:
Expand Down
27 changes: 0 additions & 27 deletions tasks/pretest.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@ var fs = require('fs');

var constants = require('./util/constants');
var common = require('./util/common');
var containerCommands = require('./util/container_commands');
var isCI = process.env.CIRCLECI;

// main
makeCredentialsFile();
makeSetPlotConfigFile();
makeTestImageFolders();
if(isCI) runAndSetupImageTestContainer();

// Create a credentials json file,
// to be required in jasmine test suites and test dashboard
Expand Down Expand Up @@ -55,30 +52,6 @@ function makeTestImageFolders() {
makeOne(constants.pathToTestImagesDiff, 'test image diff folder');
}

// On CircleCI, run and setup image test container once an for all
function runAndSetupImageTestContainer() {

function run() {
var cmd = containerCommands.dockerRun;
common.execCmd(cmd, function() {
logger('run docker container');

setTimeout(setup, 500);
});
}

function setup() {
var cmd = containerCommands.getRunCmd(isCI, [
containerCommands.setup
]);
common.execCmd(cmd, function() {
logger('setup docker container');
});
}

run();
}

function logger(task) {
console.log('ok ' + task);
}
18 changes: 18 additions & 0 deletions tasks/run_docker.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
var constants = require('./util/constants');
var common = require('./util/common');
var containerCommands = require('./util/container_commands');
var isCI = process.env.CIRCLECI;

var msg = 'Booting up ' + constants.testContainerName + ' docker container';
var cmd = containerCommands.dockerRun;

// Log command string on CircleCI,
// because node's `child_process.exec()` is having issues there

if(isCI) {
console.log(cmd);
}
else {
console.log(msg);
common.execCmd(cmd);
}
20 changes: 20 additions & 0 deletions tasks/setup_docker.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
var constants = require('./util/constants');
var common = require('./util/common');
var containerCommands = require('./util/container_commands');
var isCI = process.env.CIRCLECI;

var msg = 'Setting up ' + constants.testContainerName + ' docker container for testing';
var cmd = containerCommands.getRunCmd(process.env.CIRCLECI, [
containerCommands.setup
]);

// Log command string on CircleCI,
// because node's `child_process.exec()` is having issues there

if(isCI) {
console.log(cmd);
}
else {
console.log(msg);
common.execCmd(cmd);
}