Because of the nature of writing inline shell commands to YAML, most of
the commentaries where inlined with the command not to hinder YAML
readability any further. Since we moved the logic to a standalone
script, we can now do whatever formatting & readability adjustments we
want.
Signed-off-by: Erik Skultety <eskultet@xxxxxxxxxx>
---
ci/integration.sh | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/ci/integration.sh b/ci/integration.sh
index 160aecf00d..cbf2b0f1b4 100644
--- a/ci/integration.sh
+++ b/ci/integration.sh
@@ -3,10 +3,15 @@
# Avocado >98.0 fails with the nwfilter TCK tests, so stick with 98.0 for now
sudo pip3 install --prefix=/usr avocado-framework==98.0
-sudo sh -c "echo DefaultLimitCORE=infinity >> /etc/systemd/system.conf" # Explicitly allow storing cores globally
-sudo systemctl daemon-reexec # need to reexec systemd after changing config
+# Explicitly allow storing cores globally
+sudo sh -c "echo DefaultLimitCORE=infinity >> /etc/systemd/system.conf"
+
+# Need to reexec systemd after changing config
+sudo systemctl daemon-reexec
+
+# Source the os-release file to query the vendor-provided variables
+source /etc/os-release
-source /etc/os-release # in order to query the vendor-provided variables
if test "$ID" = "centos" && test "$VERSION_ID" -eq 8
then
DAEMONS="libvirtd virtlockd virtlogd"
@@ -23,6 +28,7 @@ do
sudo systemctl restart ${daemon}.socket
done
+# Make sure the default network is started on all platforms
sudo virsh net-start default &>/dev/null || true
cd "$SCRATCH_DIR"
--
2.39.1
