Commit 648e4307 authored by Johan Helsing's avatar Johan Helsing

Add support for custom configs

parent c393e551
-opensource
-confirm-license
-developer-build
-no-xcb
-no-feature-vnc
-no-linuxfb
-no-eglfs
-nomake
examples
-nomake
tests
-feature-wayland-client
-feature-wayland-egl
-opensource
-confirm-license
-developer-build
-static
-no-xcb
-no-feature-vnc
-no-linuxfb
-no-eglfs
-nomake
examples
-nomake
tests
-feature-wayland-client
-feature-wayland-egl
......@@ -37,14 +37,15 @@ function saveTests() {
function startDockerTest(test, callback) {
test.title = test.title || test.containerName;
const { qtWaylandRev, qt5Rev, containerName, title } = test;
const { qtWaylandRev, qt5Rev, containerName, title, config } = test;
const environment = {
QT_DOCKERTEST_QTWAYLAND_REV: qtWaylandRev,
QT_DOCKERTEST_QT5_REV: qt5Rev
};
const envArgs = reduce(environment, (args, value, key) => args.concat(['-e', `${key}=${value}`]), []);
const ccacheArgs = ccacheVolume ? ['-v', 'ccache:/home/build/.ccache'] : [];
const args = [].concat(['run', '--name', containerName], ccacheArgs, envArgs, ['docker-qt-tests']);
const configArgs = config ? ['-v', `${__dirname}/configs/${config}.opt:/etc/qt/config.opt`] : [];
const args = [].concat(['run', '--name', containerName], configArgs, ccacheArgs, envArgs, ['docker-qt-tests']);
console.log('docker ' + args.join(' '));
const testProcess = spawn('docker', args);
test.status = 'running';
......@@ -196,10 +197,11 @@ function serveLogs() {
server.listen(8056);
}
function healthCheck(rev) {
const containerName = `gerrit-watcher-health-check-${rev}-${unixTimeStamp()}`
const title = `Health check ${rev} ${new Date().toISOString()}`;
startDockerTest({qtWaylandRev: rev, qt5Rev: rev, containerName, title });
function healthCheck(rev, config) {
config = config || 'standard';
const containerName = `gerrit-watcher-health-check-${rev}-${config}-${unixTimeStamp()}`
const title = `Health check (${config}) ${rev} ${new Date().toISOString()}`;
startDockerTest({qtWaylandRev: rev, qt5Rev: rev, containerName, title, config });
}
if (!fs.existsSync('logs')){
......@@ -220,5 +222,6 @@ scheduleJob({hour: 23, minute: 0}, () => {
// Run initial tests
//healthCheck('5.11');
//healthCheck('dev');
//healthCheck('dev', 'static');
serveLogs();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment