add a helper to get dpeloyment marker

Author: gaelgatelement

tests/integration/lib/helpers.py

@@ -9,11 +9,11 @@
 
 import pyhelm3
 from lightkube.models.meta_v1 import ObjectMeta
-from lightkube.resources.core_v1 import Endpoints, Namespace, Secret
+from lightkube.resources.core_v1 import ConfigMap, Endpoints, Namespace, Secret
 
 from ..artifacts import CertKey, generate_cert
-from .fixtures import ESSData
-from .lib.utils import merge
+from .utils import merge
+import contextlib
 
 
 def namespace(name: str) -> Awaitable[Namespace]:
@@ -66,7 +66,7 @@ async def wait_for_endpoint_ready(name, namespace, cluster, kube_client):
 
 
 async def deploy_with_values_patch(
-    generated_data: ESSData, helm_client: pyhelm3.Client, values_patch: dict
+    generated_data, helm_client: pyhelm3.Client, values_patch: dict, timeout="600s"
 ) -> pyhelm3.ReleaseRevision:
     # After the base chart is setup, we enable MAS to run the syn2mas dry run job
     revision = await helm_client.get_current_revision(
@@ -76,12 +76,30 @@ async def deploy_with_values_patch(
     values = merge(values, values_patch)
     chart = await helm_client.get_chart("charts/matrix-stack")
     # Install or upgrade a release
-    revision = await helm_client.install_or_upgrade_release(
-        generated_data.release_name,
-        chart,
-        values,
+    error = None
+    try:
+        revision = await helm_client.install_or_upgrade_release(
+            generated_data.release_name,
+            chart,
+            values,
+            namespace=generated_data.ess_namespace,
+            timeout=timeout,
+            atomic=False,
+            wait=True,
+        )
+    except pyhelm3.errors.Error as e:
+        error = e
+        revision = await helm_client.get_current_revision(
+            generated_data.release_name, namespace=generated_data.ess_namespace
+        )
+    return revision, error
+
+
+async def get_deployment_marker(kube_client, generated_data, marker: str):
+    # The marker should now show delegated_auth
+    configmap = await kube_client.get(
+        ConfigMap,
         namespace=generated_data.ess_namespace,
-        atomic="CI" not in os.environ,
-        wait=True,
+        name=f"{generated_data.release_name}-markers",
     )
-    return revision
+    return configmap.data.get(marker)

tests/integration/test_matrix_authentication_service.py

@@ -4,10 +4,9 @@
 
 import pyhelm3
 import pytest
-from lightkube.resources.core_v1 import ConfigMap
 
 from .fixtures import ESSData
-from .lib.helpers import deploy_with_values_patch
+from .lib.helpers import deploy_with_values_patch, get_deployment_marker
 from .lib.utils import aiohttp_post_json, value_file_has
 
 
@@ -34,12 +33,7 @@ async def test_matrix_authentication_service_graphql_endpoint(ingress_ready, gen
 async def test_matrix_authentication_service_marker_delegated_auth(
     kube_client, helm_client: pyhelm3.Client, ingress_ready, generated_data: ESSData, ssl_context
 ):
-    configmap = await kube_client.get(
-        ConfigMap,
-        namespace=generated_data.ess_namespace,
-        name=f"{generated_data.release_name}-markers",
-    )
-    assert configmap.data.get("MATRIX_STACK_MSC3861") == "delegated_auth"
+    assert await get_deployment_marker(kube_client, generated_data, "MATRIX_STACK_MSC3861") == "delegated_auth"
 
     revision, error = await deploy_with_values_patch(
         generated_data, helm_client, {"matrixAuthenticationService": {"enabled": False}}, timeout="15s"

tests/integration/test_syn2mas.py

@@ -6,10 +6,9 @@
 import pyhelm3
 import pytest
 from lightkube import AsyncClient
-from lightkube.resources.core_v1 import ConfigMap
 
 from .fixtures import ESSData
-from .lib.helpers import deploy_with_values_patch
+from .lib.helpers import deploy_with_values_patch, get_deployment_marker
 from .lib.utils import aiohttp_post_json, value_file_has
 from .test_matrix_authentication_service import test_matrix_authentication_service_graphql_endpoint
 
@@ -28,13 +27,7 @@ async def test_run_syn2mas_upgrade(
 ):
     access_token = users[0]
     await ingress_ready("synapse")
-    configmap = await kube_client.get(
-        ConfigMap,
-        namespace=generated_data.ess_namespace,
-        name=f"{generated_data.release_name}-markers",
-    )
-    assert configmap.data.get("MATRIX_STACK_MSC3861") == "legacy_auth"
-
+    assert await get_deployment_marker(kube_client, generated_data, "MATRIX_STACK_MSC3861") == "legacy_auth"
     # After the base chart is setup, we enable MAS to run the syn2mas dry run job
     revision, error = await deploy_with_values_patch(
         generated_data, helm_client, {"matrixAuthenticationService": {"enabled": True}}
@@ -45,12 +38,7 @@ async def test_run_syn2mas_upgrade(
     await ingress_ready("synapse")
 
     # Syn2Mas is running in dryRun mode, so the state has not changed yet
-    configmap = await kube_client.get(
-        ConfigMap,
-        namespace=generated_data.ess_namespace,
-        name=f"{generated_data.release_name}-markers",
-    )
-    assert configmap.data.get("MATRIX_STACK_MSC3861") == "legacy_auth"
+    assert await get_deployment_marker(kube_client, generated_data, "MATRIX_STACK_MSC3861") == "legacy_auth"
 
     # After the base chart is setup, we enable MAS to run the syn2mas actual migration
     revision, error = await deploy_with_values_patch(
@@ -60,12 +48,7 @@ async def test_run_syn2mas_upgrade(
     assert revision.status == pyhelm3.ReleaseRevisionStatus.DEPLOYED
 
     # Syn2Mas is running in migrate mode, so the state must have changed
-    configmap = await kube_client.get(
-        ConfigMap,
-        namespace=generated_data.ess_namespace,
-        name=f"{generated_data.release_name}-markers",
-    )
-    assert configmap.data.get("MATRIX_STACK_MSC3861") == "syn2mas_migrated"
+    assert await get_deployment_marker(kube_client, generated_data, "MATRIX_STACK_MSC3861") == "syn2mas_migrated"
 
     # We should still be able to reach synapse ingress
     await ingress_ready("synapse")
@@ -92,14 +75,9 @@ async def test_run_syn2mas_upgrade(
     await test_matrix_authentication_service_graphql_endpoint(ingress_ready, generated_data, ssl_context)
 
     # The marker should now show delegated_auth
-    configmap = await kube_client.get(
-        ConfigMap,
-        namespace=generated_data.ess_namespace,
-        name=f"{generated_data.release_name}-markers",
-    )
-    assert configmap.data.get("MATRIX_STACK_MSC3861") == "delegated_auth"
-    revision = await deploy_with_values_patch(
-        generated_data, helm_client, {"matrixAuthenticationService": {"syn2mas": {"enabled": True}}}
+    assert await get_deployment_marker(kube_client, generated_data, "MATRIX_STACK_MSC3861") == "delegated_auth"
+    revision, error = await deploy_with_values_patch(
+        generated_data, helm_client, {"matrixAuthenticationService": {"syn2mas": {"enabled": True}}}, timeout="15s"
     )
     assert error is not None
     assert revision.status == pyhelm3.ReleaseRevisionStatus.FAILED

tests/integration/test_synapse.py

@@ -7,10 +7,9 @@
 
 import pyhelm3
 import pytest
-from lightkube.resources.core_v1 import ConfigMap
 
 from .fixtures import ESSData
-from .lib.helpers import deploy_with_values_patch
+from .lib.helpers import deploy_with_values_patch, get_deployment_marker
 from .lib.synapse import assert_downloaded_content, download_media, upload_media
 from .lib.utils import KubeCtl, aiohttp_client, aiohttp_get_json, aiohttp_post_json, value_file_has
 
@@ -124,13 +123,8 @@ async def test_rendezvous_cors_headers_are_only_set_with_mas(ingress_ready, gene
 async def test_synapse_service_marker_legacy_auth(
     kube_client, helm_client: pyhelm3.Client, ingress_ready, generated_data: ESSData, ssl_context
 ):
-    configmap = await kube_client.get(
-        ConfigMap,
-        namespace=generated_data.ess_namespace,
-        name=f"{generated_data.release_name}-markers",
-    )
-    assert configmap.data.get("MATRIX_STACK_MSC3861") == "legacy_auth"
-    revision = await deploy_with_values_patch(
+    assert await get_deployment_marker(kube_client, generated_data, "MATRIX_STACK_MSC3861") == "legacy_auth"
+    revision, error = await deploy_with_values_patch(
         generated_data,
         helm_client,
         {"matrixAuthenticationService": {"enabled": True, "ingress": {"host": "account.{{ $.Values.serverName }}"}}},