Merge pull request #1199 from element-hq/gaelg/merge-k3d-ctx

Merge k3d context after setup

Author: gaelgatelement

DEVELOPERS.md

@@ -172,8 +172,6 @@ run `pytest-ess -- --cache-clear`.
 You must delete it using `k3d cluster delete ess-helm` manually before running any other test run.
 
 #### Usage
-Use `k3d kubeconfig merge ess-helm -ds` to get access to the cluster.
-
 The tests will use the cluster constructed by `scripts/setup_test_cluster.sh` if that is
 running. If the tests use an existing cluster, they won't destroy the cluster afterwards.
 

newsfragments/1199.internal.md

@@ -0,0 +1 @@
+CI: Publish ESS tests as a python package for use in external projects and developers environments.

scripts/setup_test_cluster.sh

@@ -14,8 +14,6 @@ ess_namespaces=${ESS_NAMESPACES:-ess}
 
 uv run setup-ess-cluster
 
-k3d kubeconfig merge ess-helm -ds
-
 for namespace in $ess_namespaces; do
   echo "Constructing ESS dependencies in $namespace"
   server_version=$(kubectl --context $k3d_context_name version | grep Server | sed 's/.*v/v/' | awk -F. '{print $1"."$2}')

tests/README.md

@@ -34,22 +34,18 @@ You can also install it from the git repository :
 ```sh
 # You can also use any ESS Community version
 VERSION=main
-uvx git+https://github.com/element-hq/ess-helm.git@$VERSION#subdirectory=tests
+uv tool install git+https://github.com/element-hq/ess-helm.git@$VERSION#subdirectory=tests
 ```
 
 Example:
 
 ```sh
 VERSION=main
-uvx git+https://github.com/element-hq/ess-helm.git@$VERSION#subdirectory=tests
+uv tool install git+https://github.com/element-hq/ess-helm.git@$VERSION#subdirectory=tests
     Updated https://github.com/element-hq/ess-helm.git (d6d33a7f7051a0b6bbdcc609a059ae328feee269)
       Built ess-community-integration-tests @ git+https://github.com/element-hq/ess-helm.git@d6d33a7f7051a0b6bbdcc609a059ae328feee269#subdirectory=tests
-Installed 60 packages in 5ms
-An executable named `ess-community-integration-tests` is not provided by package `ess-community-integration-tests`.
-The following executables are available:
-- collect-ess-logs
-- pytest-ess
-- setup-ess-cluster
+...
+Installed 3 executables: collect-ess-logs, pytest-ess, setup-ess-cluster
 ```
 
 ## Usage

tests/integration/scripts.py

@@ -197,4 +197,6 @@ def setup_cluster():
 
     os.environ["PYTEST_KEEP_CLUSTER"] = "1"
     errcode = pytest.main([str(HERE)] + ["--env-setup"])
+    subprocess.run("k3d kubeconfig merge ess-helm -ds", shell=True, check=True)
+
     sys.exit(errcode)