ci: jobs.sh: run_integration: Add/Rewrite/Reformat commentaries

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@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/ci/jobs.sh b/ci/jobs.sh
index 75ea638580a579db6f4dd47d32eb941f2bca9025..37bca452fa76b89a8fca220bca0f04ddf047d5b4 100644 (file)
--- a/ci/jobs.sh
+++ b/ci/jobs.sh
@@ -84,10 +84,14 @@ run_website_build() {
 run_integration() {
     sudo pip3 install --prefix=/usr avocado-framework
 
-    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"
 
-    source /etc/os-release  # in order to query the vendor-provided variables
+    # 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
     if test "$ID" = "centos" && test "$VERSION_ID" -eq 8
     then
         DAEMONS="libvirtd virtlockd virtlogd"
@@ -104,6 +108,11 @@ run_integration() {
         sudo systemctl restart ${daemon}.socket
     done
 
+    # Make sure the default network is started on all platforms
+    # The reason for the '|| true' here is solely that GitLab executes all
+    # Shell scripts with -e by default and virsh returns an error if one tries
+    # to start a machine/network that is already active which is both fine and
+    # should also be a non-fatal error
     sudo virsh --quiet net-start default &>/dev/null || true
 
     cd "$SCRATCH_DIR"