Merge pull request #1198 from element-hq/gaelg/ca-not-dependant-on-path

Fix some path should not be relative to the script directory

Author: gaelgatelement

DEVELOPERS.md

@@ -86,7 +86,7 @@ A test cluster can be constructed with `./scripts/setup_test_cluster.sh`. It wil
   that `http://anything.localhost` or `https://anything.localhost` both work.
 * Install `metrics-server` into the cluster
 * Install `cert-manager` into the cluster
-* Construct a self-signed CA and puts its cert and key in `./.ca`.
+* Construct a self-signed CA and puts its cert and key in `~/.config/ess-helm-ca`.
   This will be persisted over cluster recreation so you can trust it once and use it repeatedly.
 * Construct a set of application namespaces.
   * This defaults to `ess` but can be controlled with the `ESS_NAMESPACES` environment variable

newsfragments/1198.internal.1.md

@@ -0,0 +1 @@
+CI: Cache `pyhelm` pulled chart relatively to the runner directory, not to the script install path.

newsfragments/1198.internal.md

@@ -0,0 +1 @@
+Developers: Move `.ca` to `~/.config/ess-helm-ca`.

scripts/setup_test_cluster.sh

@@ -12,10 +12,6 @@ k3d_context_name="k3d-$k3d_cluster_name"
 # Space separated list of namespaces to use
 ess_namespaces=${ESS_NAMESPACES:-ess}
 
-root_folder="$(git rev-parse --show-toplevel)"
-ca_folder="$root_folder/.ca"
-mkdir -p "$ca_folder"
-
 uv run setup-ess-cluster
 
 k3d kubeconfig merge ess-helm -ds

tests/integration/fixtures/cluster.py

@@ -175,7 +175,7 @@ async def cert_manager(helm_client, kube_client):
         wait=True,
     )
 
-    ca_folder = Path(__file__).parent.parent.parent.parent / ".ca"
+    ca_folder = os.environ.get("HOME") / ".config" / "ess-helm-ca"
     if not ca_folder.exists():
         ca_folder.mkdir()
     ca_crt_path = Path(ca_folder) / "ca.crt"

tests/integration/lib/utils.py

@@ -268,9 +268,8 @@ async def forward_matching_logs(input_logs_queue: asyncio.Queue, output_matchers
 
 
 async def chart_from_ci_cache(helm_client: pyhelm3.Client, chart_ref: str) -> pyhelm3.Chart:
-    project_root = Path(__file__).parent.parent.parent.parent
-    if os.environ.get("CI"):
-        helm_cache = project_root / ".pyhelm_cache"
+    if os.environ.get("GITHUB_WORKSPACE"):
+        helm_cache = Path(os.environ["GITHUB_WORKSPACE"]) / ".pyhelm_cache"
         helm_cache.mkdir(parents=True, exist_ok=True)
         chart_name = chart_ref.split("/")[-1]
         cached_ref = helm_cache / chart_name