system_tests.py: Correctly handle case where no valid lxc command can…

… be determined

Signed-off-by: Tobias Knöppler <[email protected]>

.github/workflows/build-lxd.yml

@@ -81,7 +81,8 @@ jobs:
         env:
           USE_INCUS: "${{ needs.determine-runner.outputs.lxc_cmd == 'incus' && 'yes' || 'no' }}"
         run: |
-          LXD_EXTRA_PROFILE="$LXD_EXTRA_PROFILE" BRANCH="${VERSION##refs/heads/}" CI="$CI" ./build/build-LXD.sh
+          export CI
+          LXD_EXTRA_PROFILE="$LXD_EXTRA_PROFILE" BRANCH="${VERSION##refs/heads/}" ./build/build-LXD.sh
       - name: Pack LXD image
         id: pack-lxd
         run: |
@@ -156,7 +157,8 @@ jobs:
 #        env:
 #          USE_INCUS: "${{ needs.determine-runner.outputs.lxc_cmd == 'incus' && 'yes' || 'no' }}"
 #        run: |
-#          LXD_EXTRA_PROFILE="$LXD_EXTRA_PROFILE" BRANCH="${VERSION##refs/heads/}" CI="$CI" ./build/build-LXD.sh
+#          export CI
+#          LXD_EXTRA_PROFILE="$LXD_EXTRA_PROFILE" BRANCH="${VERSION##refs/heads/}" ./build/build-LXD.sh
 #      - name: Pack LXD image
 #        id: pack-lxd
 #        run: |

tests/system_tests.py

@@ -301,14 +301,19 @@ def set_cohorte_id(cohorte_id: int) -> CompletedProcess:
         if lxc_test.returncode != 0:
             raise Exception(f"failed to execute {lxc_command} info")
     except:
-        lxc_test = run(['sudo'] + lxc_command + ['info'], stdout=PIPE, check='True')
-        lxc_command = ['sudo'] + lxc_command
+        try:
+            lxc_test = run(['sudo'] + lxc_command + ['info'], stdout=PIPE, check='True')
+            lxc_command = ['sudo'] + lxc_command
+        except:
+            lxc_command = None
+            lxc_running = False
 
     # detect if we are running this in a LXC instance
-    try:
-        lxc_running = run(lxc_command + ['info', 'ncp'], stdout=PIPE, check = True)
-    except:
-        lxc_running = False
+    if lxc_command is not None:
+        try:
+            lxc_running = run(lxc_command + ['info', 'ncp'], stdout=PIPE, check = True)
+        except:
+            lxc_running = False
 
     try:
         systemd_container_running = run(['machinectl', 'show', 'ncp'], stdout=PIPE, check = True)