From 2456b8d218e6daa4ba6f020ac0d21218fce0b525 Mon Sep 17 00:00:00 2001
From: Lucian Petrut <lpetrut@cloudbasesolutions.com>
Date: Wed, 17 Jul 2024 07:07:15 +0000
Subject: [PATCH] Update integration tests, failing early if no image is
 provided

We'll ensure that the integration tests fail early if the rock
images are not specified.
---
 tests/integration/conftest.py           |  4 +++
 tests/integration/test_multus_v3_8.py   | 11 +++-----
 tests/integration/test_multus_v4_0_2.py | 37 +++++++++++++++----------
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
index 13128c5..3250eee 100644
--- a/tests/integration/conftest.py
+++ b/tests/integration/conftest.py
@@ -1 +1,5 @@
+#
+# Copyright 2024 Canonical, Ltd.
+# See LICENSE file for licensing details
+#
 pytest_plugins = ["k8s_test_harness.conftest"]
diff --git a/tests/integration/test_multus_v3_8.py b/tests/integration/test_multus_v3_8.py
index b2f3e22..2210615 100644
--- a/tests/integration/test_multus_v3_8.py
+++ b/tests/integration/test_multus_v3_8.py
@@ -10,6 +10,10 @@
 
 
 def test_multus_deployment(tmp_path: pathlib.Path, module_instance: harness.Instance):
+    image_uri = os.getenv("ROCK_MULTUS_V3_8")
+    assert image_uri is not None, "ROCK_MULTUS_V3_8 is not set"
+    image_split = image_uri.split(":")
+
     clone_path = tmp_path / "multus"
     clone_path.mkdir()
 
@@ -34,13 +38,6 @@ def test_multus_deployment(tmp_path: pathlib.Path, module_instance: harness.Inst
         str(chart_path.absolute()),
         "--namespace",
         "kube-system",
-    ]
-
-    image_uri = os.getenv("ROCK_MULTUS_V3_8")
-    assert image_uri is not None, "ROCK_MULTUS_V3_8 is not set"
-    image_split = image_uri.split(":")
-
-    helm_command += [
         "--set",
         f"image.repository={image_split[0]}",
         "--set",
diff --git a/tests/integration/test_multus_v4_0_2.py b/tests/integration/test_multus_v4_0_2.py
index 4f0c9ee..39965ea 100644
--- a/tests/integration/test_multus_v4_0_2.py
+++ b/tests/integration/test_multus_v4_0_2.py
@@ -1,5 +1,6 @@
 #
 # Copyright 2024 Canonical, Ltd.
+# See LICENSE file for licensing details
 #
 import os
 
@@ -8,19 +9,21 @@
 
 
 def test_multus_deployment(module_instance: harness.Instance):
-    helm_command = [
-        "sudo", "k8s",
-        "helm", "install", "multus-cni",
-        "oci://registry-1.docker.io/bitnamicharts/multus-cni",
-        "--version", "2.1.7",
-        "--namespace", "kube-system",
-    ]
-
     image_uri = os.getenv("ROCK_MULTUS_V4_0_2")
     assert image_uri is not None, "ROCK_MULTUS_V4_0_2 is not set"
     image_split = image_uri.split(":")
 
-    helm_command += [
+    helm_command = [
+        "sudo",
+        "k8s",
+        "helm",
+        "install",
+        "multus-cni",
+        "oci://registry-1.docker.io/bitnamicharts/multus-cni",
+        "--version",
+        "2.1.7",
+        "--namespace",
+        "kube-system",
         "--set",
         f"image.repository={image_split[0]}",
         "--set",
@@ -33,10 +36,16 @@ def test_multus_deployment(module_instance: harness.Instance):
 
     exec_util.stubbornly(retries=3, delay_s=1).on(module_instance).exec(
         [
-            "sudo", "k8s",
-            "kubectl", "rollout", "status",
-            "daemonset", "multus-cni",
-            "--namespace", "kube-system",
-            "--timeout", "180s",
+            "sudo",
+            "k8s",
+            "kubectl",
+            "rollout",
+            "status",
+            "daemonset",
+            "multus-cni",
+            "--namespace",
+            "kube-system",
+            "--timeout",
+            "180s",
         ]
     )