From 15b17de7c3db8b3714bf0a21e99eca41105f8c5c Mon Sep 17 00:00:00 2001
From: Martyn Gigg <martyn.gigg@stfc.ac.uk>
Date: Wed, 30 Oct 2019 08:34:44 +0000
Subject: [PATCH] Minor fix to macOS Jenkins node configuration info
We have been using DragNDrop packages on macOS for some time
and this just requires `cp` and not the use of `installer`.
---
dev-docs/source/JenkinsConfiguration.rst | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/dev-docs/source/JenkinsConfiguration.rst b/dev-docs/source/JenkinsConfiguration.rst
index 115c0924228..1f7423c31c3 100644
--- a/dev-docs/source/JenkinsConfiguration.rst
+++ b/dev-docs/source/JenkinsConfiguration.rst
@@ -116,24 +116,24 @@ Configure `automatic security updates <https://help.ubuntu.com/community/Automat
Install ``gdebi-core`` package to allow installing ``.deb`` files.
The ``builder`` account must be setup to be able to run ``gdebi`` non-interactively. Use ``visudo`` to add the following
-exception got ``builder``::
+exception for ``builder``::
# Allow no password for gdebi
builder ALL=(ALL)NOPASSWD:/usr/bin/gdebi, /usr/bin/dpkg
## Disable tty requirement for gdebi and dpkg command
- Defaults!/usr/bin/gdebi !requiretty
- Defaults!/usr/bin/dpkg !requiretty
+ Defaults!/usr/bin/gdebi !requiretty
+ Defaults!/usr/bin/dpkg !requiretty
Red Hat
^^^^^^^
The ``builder`` account must be setup to be able to run ``yum`` non-interactively. Use ``visudo`` to add the following
-exception got ``builder``::
+exception for ``builder``::
## Allow no password for yum
builder ALL = NOPASSWD: /usr/bin/yum,/bin/rpm
## Disable tty requirement for yum command
- Defaults!/bin/rpm !requiretty
+ Defaults!/bin/rpm !requiretty
Defaults!/usr/bin/yum !requiretty
Mac OS
@@ -142,16 +142,14 @@ Mac OS
Enable `SSH ("Remote Login") and VNC ("Remote Management") <https://apple.stackexchange.com/a/73919>`__. If you have
connection issues from a non-OS X client then try adjusting your color depth settings (True Color 32bpp works on Remmina).
-Install ``cppcheck`` from brew.
-
-The ``builder`` account must be setup to be able to run ``gdebi`` non-interactively. Use ``visudo`` to add the following
-exception got ``builder``::
+The ``builder`` account must be setup to be able to cp packages non-interactively. Use ``visudo`` to add the following
+exception for ``builder``::
- # Allow builder to install packages without a password
- builder ALL=(ALL)NOPASSWD:/usr/sbin/installer, /bin/rm
+ # Allow builder to copy packages without a password
+ builder ALL=(ALL)NOPASSWD:/bin/cp, /bin/rm
# Disable tty requirement
- Defaults!/usr/sbin/installer !requiretty
+ Defaults!/bin/cp !requiretty
Defaults!/bin/rm !requiretty
In order to run the MantidPlot tests, which require a connection to the windowing system, the user that is running the jenkins slave must
--
GitLab