Skip to content
Snippets Groups Projects
Unverified Commit f49e71bd authored by Martyn Gigg's avatar Martyn Gigg Committed by GitHub
Browse files

Merge pull request #24057 from DanNixon/buildserver_x11_xvfb

Use Xvfb on Linux build servers
parents c88339ce 74e183b8
No related branches found
No related tags found
No related merge requests found
......@@ -15,11 +15,17 @@ SCRIPT_DIR=$(dirname "$0")
# System discovery
###############################################################################
USE_CORE_DUMPS=true
X11_RUNNER="eval"
X11_RUNNER_ARGS=""
if [[ ${NODE_LABELS} == *rhel7* ]] || [[ ${NODE_LABELS} == *centos7* ]] || [[ ${NODE_LABELS} == *scilin7* ]]; then
ON_RHEL7=true
X11_RUNNER="xvfb-run"
X11_RUNNER_ARGS=--server-args="-screen 0 640x480x24"
fi
if [[ ${NODE_LABELS} == *ubuntu* ]]; then
ON_UBUNTU=true
X11_RUNNER="xvfb-run"
X11_RUNNER_ARGS=--server-args="-screen 0 640x480x24"
fi
if [[ ${NODE_LABELS} == *osx* ]]; then
ON_MACOS=true
......@@ -347,7 +353,7 @@ userprops_file=$userconfig_dir/Mantid.user.properties
echo MultiThreaded.MaxCores=2 > $userprops_file
if [[ ${DO_UNITTESTS} == true ]]; then
$CTEST_EXE -j${BUILD_THREADS:?} --schedule-random --output-on-failure
${X11_RUNNER} "${X11_RUNNER_ARGS}" $CTEST_EXE -j${BUILD_THREADS:?} --schedule-random --output-on-failure
fi
###############################################################################
......@@ -362,8 +368,8 @@ if [[ ${DO_DOCTESTS_USER} == true ]]; then
rm -fr $BUILD_DIR/docs/doctrees/*
fi
# Build HTML to verify that no referencing errors have crept in.
${CMAKE_EXE} --build . --target docs-html
${CMAKE_EXE} --build . --target docs-test
${X11_RUNNER} "${X11_RUNNER_ARGS}" ${CMAKE_EXE} --build . --target docs-html
${X11_RUNNER} "${X11_RUNNER_ARGS}" ${CMAKE_EXE} --build . --target docs-test
fi
###############################################################################
......
......@@ -101,14 +101,9 @@ Service" has completed you should
Linux
-----
Install an ssh server.
Install an ssh server, ``ccache``, ``curl`` and ``xvfb``.
Install ``ccache``. After installing run ``ccache --max-size=20G`` from the ``builder`` account.
Install a vnc server and from the ``builder`` account run ``vncpasswd`` to set a password on the VNC server. It
can be any password.
Ensure ``curl`` is installed
From the ``builder`` account run ``ccache --max-size=20G``.
Any machines acting as performance test servers will require ``mysqldb`` to be installed.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment