From: Kienan Stewart Date: Tue, 23 May 2023 18:49:04 +0000 (-0400) Subject: lava: Set default shell for submitted jobs X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=9bc7deb861049b1805f0a8494cffe53044a7b988;p=lttng-ci.git lava: Set default shell for submitted jobs With the older lava-server installation on lava-master-02, the default shell was changed by setting `lava_test_sh_cmd` in the base device type template file `/etc/lava-server/dispatcher-config/device-types/base.jinja2`. Rather than setting the value for all devices by default in global configuration, I think it is best to make the expected shell explicit in our submitted job configuration. The SHELL environment variable is read and used by the `lava_dispatcher/lava_test_shell/lava-test-shell` script to set the interpreter for the tests. Note: It doesn't seem possible to update the SHELL or `lava_test_sh_cmd` on a per-test basis. Change-Id: I7a02f1e76cfc50dfea7925d27609533e831bd221 --- diff --git a/scripts/system-tests/template_lava_job.jinja2 b/scripts/system-tests/template_lava_job.jinja2 index 59fc91f..5aaece8 100644 --- a/scripts/system-tests/template_lava_job.jinja2 +++ b/scripts/system-tests/template_lava_job.jinja2 @@ -16,6 +16,9 @@ context: extra_kernel_args: cpuidle.off=1 extra_nfsroot_args: ",nfsvers=3 nfsrootdebug" +environment: + SHELL: "/bin/bash" + {% if device_type == DeviceType.kvm %} tags: - qemu