feat: pin k8s-test-harness

tests/integration/test_harbor_rocks_in_helm_chart.py

@@ -23,7 +23,7 @@
 INSTALL_NAME = "harbor"
 
 # This mapping indicates which fields of the upstream Harbor Helm chart
-# contain the 'image' fields which should be overriden with the ROCK
+# contain the 'image' fields which should be overridden with the ROCK
 # image URLs and version during testing.
 # https://github.com/goharbor/harbor-helm/blob/main/values.yaml
 IMAGE_NAMES_TO_CHART_VALUES_OVERRIDES_MAP = {

tests/requirements-dev.txt

@@ -3,3 +3,4 @@ codespell==2.2.4
 flake8==6.0.0
 isort==5.12.0
 licenseheaders==0.8.8
+k8s-test-harness @ git+https://github.com/canonical/k8s-test-harness@de46217

tests/requirements-test.txt

@@ -3,4 +3,4 @@ pytest==7.3.1
 PyYAML==6.0.1
 tenacity==8.2.3
 charmed-kubeflow-chisme>=0.4
-git+https://github.com/canonical/k8s-test-harness.git@main
+k8s-test-harness @ git+https://github.com/canonical/k8s-test-harness@de46217

tests/sanity/test_harbor_core.py

@@ -52,6 +52,5 @@ def test_compare_rock_files_to_original(image_version):
     rock_extra_files = rock_fileset - original_fileset
     if rock_extra_files:
         pytest.fail(
-            f"Rock has extra files not present in original image: "
-            f"{rock_extra_files}"
+            f"Rock has extra files not in the original image: " f"{rock_extra_files}"
         )

tests/sanity/test_harbor_exporter.py

@@ -52,6 +52,5 @@ def test_compare_rock_files_to_original(image_version):
     rock_extra_files = rock_fileset - original_fileset
     if rock_extra_files:
         pytest.fail(
-            f"Rock has extra files not present in original image: "
-            f"{rock_extra_files}"
+            f"Rock has extra files not in the original image: " f"{rock_extra_files}"
         )

tests/sanity/test_harbor_jobservice.py

@@ -52,6 +52,5 @@ def test_compare_rock_files_to_original(image_version):
     rock_extra_files = rock_fileset - original_fileset
     if rock_extra_files:
         pytest.fail(
-            f"Rock has extra files not present in original image: "
-            f"{rock_extra_files}"
+            f"Rock has extra files not in the original image: " f"{rock_extra_files}"
         )

tests/sanity/test_harbor_portal.py

@@ -84,8 +84,7 @@ def test_compare_rock_files_to_original(image_version):
     rock_extra_files = rock_fileset - original_fileset
     if rock_extra_files:
         pytest.fail(
-            f"Rock has extra files not present in original image: "
-            f"{rock_extra_files}"
+            f"Rock has extra files not in the original image: " f"{rock_extra_files}"
         )
 
     # Nginx-related dirs:

tests/sanity/test_harbor_registryctl.py

@@ -52,8 +52,7 @@ def test_compare_rock_files_to_original(image_version):
     rock_extra_files = rock_fileset - original_fileset
     if rock_extra_files:
         pytest.fail(
-            f"Rock has extra files not present in original image: "
-            f"{rock_extra_files}"
+            f"Rock has extra files not in the original image: " f"{rock_extra_files}"
         )
 
     # NOTE(aznashwan): the registryctl image also embeds a `registry` binary:

tests/sanity/test_registry_photon.py

@@ -52,8 +52,7 @@ def test_compare_rock_files_to_original(image_version):
     rock_extra_files = rock_fileset - original_fileset
     if rock_extra_files:
         pytest.fail(
-            f"Rock has extra files not present in original image: "
-            f"{rock_extra_files}"
+            f"Rock has extra files not in the original image: " f"{rock_extra_files}"
         )
 
     paths_to_check = [

tests/sanity/test_trivy_adapter_photon.py

@@ -52,8 +52,7 @@ def test_compare_rock_files_to_original(image_version):
     rock_extra_files = rock_fileset - original_fileset
     if rock_extra_files:
         pytest.fail(
-            f"Rock has extra files not present in original image: "
-            f"{rock_extra_files}"
+            f"Rock has extra files not in the original image: " f"{rock_extra_files}"
         )
 
     paths_to_check = [