diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-12-03 11:34:26 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-03 14:11:26 +0100 |
| commit | 0adc21fcff02d7172587c540a0d091e46dd399ca (patch) | |
| tree | c94ab74040efdf1b6ad0fc8af1bd132c2447b8c6 /distro-configs | |
| parent | f3905c9d6df67377fa0ddcd7468e52fb5066d898 (diff) | |
Enabling Developer Toolset 7 for Jenkins' lo_tb_master_linux
...aka "Tinderbox on Master for Linux-DbgUtil",
<https://ci.libreoffice.org/job/lo_tb_master_linux_dbg/>. This is similar to
ab8454eb26f72f2d4081d90cb7e60e53e4a5590d "Enabling Developer Toolset 7 for
Jenkins' lo_tb_master_linux_dbg". However, unlike lo_tb_master_linux_dbg, which
is restricted to CentOS-based tb75-lilith, lo_tb_master_linux is restricted to
label TB_Rel, which is currently matched to CentOS-based tb75-lilith,
tb76-maggie, and tb76-pollux, plus non-CentOS based gandalf. The latter thus
doesn't have Developer Toolset 7, so setting CC/CXX this way won't work for
gandalf. I'm thus removing gandalf from
<https://ci.libreoffice.org/label/TB_Rel/>.
Change-Id: Ied305476347d107db4087f710c05300c84ae7e85
Reviewed-on: https://gerrit.libreoffice.org/64444
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'distro-configs')
| -rw-r--r-- | distro-configs/Jenkins/Linux_rel_master.conf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/distro-configs/Jenkins/Linux_rel_master.conf b/distro-configs/Jenkins/Linux_rel_master.conf index 8494945080de..2ce88b800f0f 100644 --- a/distro-configs/Jenkins/Linux_rel_master.conf +++ b/distro-configs/Jenkins/Linux_rel_master.conf @@ -1 +1,3 @@ --enable-kde4 +CC=/opt/rh/devtoolset-7/root/usr/bin/gcc +CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ |