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 5cee536442..cbd55d4253 100644
--- a/ci/integration.sh
+++ b/ci/integration.sh
@@ -6,10 +6,15 @@ sudo su -
# Avocado >98.0 fails with the nwfilter TCK tests, so stick with 98.0 for now
pip3 install --prefix=/usr avocado-framework==98.0
-echo "DefaultLimitCORE=infinity" >> /etc/systemd/system.conf # Explicitly allow storing cores globally
-systemctl daemon-reexec # need to reexec systemd after changing config
+# Explicitly allow storing cores globally
+echo "DefaultLimitCORE=infinity" >> /etc/systemd/system.conf
+
+# Need to reexec systemd after changing config
+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"
@@ -26,6 +31,7 @@ do
systemctl restart ${daemon}.socket
done
+# Make sure the default network is started on all platforms
virsh net-start default &>/dev/null || true
# END AS ROOT
--
2.39.0
