Commit b4d9e7e9 authored by Ben Cooksley's avatar Ben Cooksley

Switch Python to unbuffered mode to avoid issues with STDOUT/STDERR

parent 6f018518
......@@ -61,26 +61,26 @@ node( currentPlatform ) {
// Now we can determine what our dependencies are
// Then update to the latest version of the dependencies available from the master server
// Finally extract all of those dependencies in turn into the given 'installTo' directory
sh "python3 ci-tooling/helpers/prepare-dependencies.py --project ${projectName} --branchGroup ${branchGroup} --environment production --platform XenialQt5.7 --installTo '$HOME/install-prefix/'"
sh "python3 ci-tooling/helpers/prepare-dependencies.py -u --project ${projectName} --branchGroup ${branchGroup} --environment production --platform XenialQt5.7 --installTo '$HOME/install-prefix/'"
}
// Now we can configure our build
stage('Configuring Build') {
// This is delegated through a helper script to handle minor special cases like inSourceBuilds, non-CMake build systems, etc
sh "python3 ci-tooling/helpers/configure-build.py --project ${projectName} --branchGroup ${branchGroup} --platform XenialQt5.7 --installTo '$HOME/install-prefix/'"
sh "python3 ci-tooling/helpers/configure-build.py -u --project ${projectName} --branchGroup ${branchGroup} --platform XenialQt5.7 --installTo '$HOME/install-prefix/'"
}
// Finally we can build it! (Once again, through a helper)
stage('Compiling') {
// We use a helper here so we can determine the appropriate number of CPUs (-j) to build with
sh "python3 ci-tooling/helpers/compile-build.py --project ${projectName} --branchGroup ${branchGroup} --platform XenialQt5.7 --usingInstall '$HOME/install-prefix/'"
sh "python3 ci-tooling/helpers/compile-build.py -u --project ${projectName} --branchGroup ${branchGroup} --platform XenialQt5.7 --usingInstall '$HOME/install-prefix/'"
}
// Now ensure that it installs....
stage('Installing') {
// The helper ensures that DESTDIR and INSTALL_ROOT are set to 'divertTo'
// This allows us to capture the install at the next stage for later reuse in the Setup Dependencies step
sh "python3 ci-tooling/helpers/install-build.py --project ${projectName} --branchGroup ${branchGroup} --platform XenialQt5.7 --installTo '$HOME/install-prefix/' --divertTo '$WORKSPACE/install-divert/'"
sh "python3 ci-tooling/helpers/install-build.py -u --project ${projectName} --branchGroup ${branchGroup} --platform XenialQt5.7 --installTo '$HOME/install-prefix/' --divertTo '$WORKSPACE/install-divert/'"
}
// Looks like it built okay - let's capture this for later use
......@@ -89,18 +89,18 @@ node( currentPlatform ) {
// First we create a tar archive of the installation which was diverted
// Then we upload a copy of that to the master server and have it publish the new archive
// Finally to save bandwidth our copy of the tar archive is moved to our local cache for reuse on later builds on this node
sh "python3 ci-tooling/helpers/capture-install.py --project ${projectName} --branchGroup ${branchGroup} --environment production --platform XenialQt5.7 --divertedTo '$WORKSPACE/install-divert/' --installedTo '$HOME/install-prefix/'"
sh "python3 ci-tooling/helpers/capture-install.py -u --project ${projectName} --branchGroup ${branchGroup} --environment production --platform XenialQt5.7 --divertedTo '$WORKSPACE/install-divert/' --installedTo '$HOME/install-prefix/'"
// Now we extract the CMake metadata and upload that to the appropriate hosts
//sh "python3 ci-tooling/helpers/extract-cmake-dependency-metadata.py --project ${projectName} --branchGroup ${branchGroup} --usingInstall '$HOME/install-prefix/'"
//sh "python3 ci-tooling/helpers/generate-dependency-diagram-data.py --project ${projectName} --branchGroup ${branchGroup} --usingInstall '$HOME/install-prefix/'"
//sh "python3 ci-tooling/helpers/extract-cmake-dependency-metadata.py -u --project ${projectName} --branchGroup ${branchGroup} --usingInstall '$HOME/install-prefix/'"
//sh "python3 ci-tooling/helpers/generate-dependency-diagram-data.py -u --project ${projectName} --branchGroup ${branchGroup} --usingInstall '$HOME/install-prefix/'"
}
// Now we can run our tests
stage('Running Tests') {
// Run the unit tests for this project
// Tests are run in a basic environment (X, DBus)
sh "python3 ci-tooling/helpers/run-tests.py --project ${projectName} --branchGroup ${branchGroup} --platform XenialQt5.7 --usingInstall '$HOME/install-prefix/'"
sh "python3 ci-tooling/helpers/run-tests.py -u --project ${projectName} --branchGroup ${branchGroup} --platform XenialQt5.7 --usingInstall '$HOME/install-prefix/'"
// Collect our results
junit allowEmptyResults: true, testResults: 'JUnitTestResults.xml'
......
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