From f843f612b76e30e3b0e5114f95be6f7b96da7286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Wed, 19 Dec 2018 02:54:38 +0100 Subject: [PATCH] software/slapos-testing: add lmsensors in $PATH slapos.core test suite needs `sensors` command in $PATH https://lab.nexedi.com/nexedi/slapos.core/commit/7467ef4c18bff607312578b991c9b69c5572a7e8#note_71574 /reviewed-on https://lab.nexedi.com/nexedi/slapos/merge_requests/479 --- software/slapos-testing/buildout.hash.cfg | 2 +- software/slapos-testing/instance.cfg | 2 +- software/slapos-testing/software.cfg | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/software/slapos-testing/buildout.hash.cfg b/software/slapos-testing/buildout.hash.cfg index 89eea7ccf..776c1e820 100644 --- a/software/slapos-testing/buildout.hash.cfg +++ b/software/slapos-testing/buildout.hash.cfg @@ -15,5 +15,5 @@ [template] filename = instance.cfg -md5sum = 9c409e1eb2d45713579d65e350bc07e7 +md5sum = c7becd2a66b3305406f965b969907d52 diff --git a/software/slapos-testing/instance.cfg b/software/slapos-testing/instance.cfg index e0277b131..86e3dc376 100644 --- a/software/slapos-testing/instance.cfg +++ b/software/slapos-testing/instance.cfg @@ -84,7 +84,7 @@ command-line = # guarantee about free ports on IPV4 and IPV6 # * LOCAL_IPV4 is backward compatible, to be migrated, SLAPOS_TEST_IPV4 environment = - PATH=${coreutils:location}/bin:${curl:location}/bin:${openssl:location}/bin:${git:location}/bin:${libxslt:location}/bin:${socat:location}/bin:/usr/bin/:/bin/ + PATH=${coreutils:location}/bin:${curl:location}/bin:${openssl:location}/bin:${git:location}/bin:${libxslt:location}/bin:${socat:location}/bin:${lmsensors:location}/bin:/usr/bin/:/bin/ LOCAL_IPV4=$${slap-configuration:ipv4-random} SLAPOS_TEST_IPV4=$${slap-configuration:ipv4-random} SLAPOS_TEST_IPV6=$${slap-configuration:ipv6-random} diff --git a/software/slapos-testing/software.cfg b/software/slapos-testing/software.cfg index a98ac097f..722d82db4 100644 --- a/software/slapos-testing/software.cfg +++ b/software/slapos-testing/software.cfg @@ -11,6 +11,7 @@ extends = ../../component/pycurl/buildout.cfg ../../component/coreutils/buildout.cfg ../../component/socat/buildout.cfg + ../../component/lmsensors/buildout.cfg ../../stack/slapos.cfg ./buildout.hash.cfg -- 2.30.9