[test] [draft] Update backup tests to use new GCS Integrator -- DO NOT MERGE

.github/workflows/ci.yaml

@@ -177,6 +177,7 @@ jobs:
     uses: canonical/data-platform-workflows/.github/workflows/[email protected]
     with:
       path-to-charm-directory: ${{ matrix.path }}
+      cache: false # TODO: enable caching when suppported
 
   integration-test:
     name: Integration test charm

.gitignore

@@ -64,3 +64,5 @@ override.tf.json
 .terraformrc
 terraform.rc
 .env
+
+coverage.xml

pyproject.toml

@@ -15,7 +15,6 @@ requests = "2.32.4"
 # Official name: ruamel.yaml, but due to Poetry GH#109 - replace dots with dashs
 ruamel-yaml = "0.18.14"
 shortuuid = "1.0.13"
-jproperties = "2.1.2"
 pydantic = "^1.10.17, <2"
 cryptography = "^45.0.4"
 jsonschema = "^4.24.0"

tests/integration/ha/test_backups.py

@@ -378,18 +378,24 @@ async def test_small_deployment_build_and_deploy(
     if cloud_name == "azure":
         backup_integrator = AZURE_INTEGRATOR
         backup_integrator_channel = AZURE_INTEGRATOR_CHANNEL
+        backup_integrator_revision = None
     elif cloud_name == "gcs":
         backup_integrator = GCS_INTEGRATOR
         backup_integrator_channel = GCS_INTEGRATOR_CHANNEL
+        backup_integrator_revision = 63
     else:
         backup_integrator = S3_INTEGRATOR
         backup_integrator_channel = S3_INTEGRATOR_CHANNEL
-
+        backup_integrator_revision = None
     await asyncio.gather(
         ops_test.model.deploy(
             TLS_CERTIFICATES_APP_NAME, channel=TLS_STABLE_CHANNEL, config=config
         ),
-        ops_test.model.deploy(backup_integrator, channel=backup_integrator_channel),
+        ops_test.model.deploy(
+            backup_integrator,
+            channel=backup_integrator_channel,
+            revision=backup_integrator_revision,
+        ),
         ops_test.model.deploy(charm, num_units=3, series=series, config=CONFIG_OPTS),
     )
 
@@ -448,18 +454,25 @@ async def test_large_deployment_build_and_deploy(
     if cloud_name == "azure":
         backup_integrator = AZURE_INTEGRATOR
         backup_integrator_channel = AZURE_INTEGRATOR_CHANNEL
+        backup_integrator_revision = None
     elif cloud_name == "gcs":
         backup_integrator = GCS_INTEGRATOR
         backup_integrator_channel = GCS_INTEGRATOR_CHANNEL
+        backup_integrator_revision = 63
     else:
         backup_integrator = S3_INTEGRATOR
         backup_integrator_channel = S3_INTEGRATOR_CHANNEL
+        backup_integrator_revision = None
 
     await asyncio.gather(
         ops_test.model.deploy(
             TLS_CERTIFICATES_APP_NAME, channel=TLS_STABLE_CHANNEL, config=tls_config
         ),
-        ops_test.model.deploy(backup_integrator, channel=backup_integrator_channel),
+        ops_test.model.deploy(
+            backup_integrator,
+            channel=backup_integrator_channel,
+            revision=backup_integrator_revision,
+        ),
         ops_test.model.deploy(
             charm,
             application_name="main",
@@ -843,12 +856,15 @@ async def test_restore_to_new_cluster(
     if cloud_name == "azure":
         backup_integrator = AZURE_INTEGRATOR
         backup_integrator_channel = AZURE_INTEGRATOR_CHANNEL
+        backup_integrator_revision = None
     elif cloud_name == "gcs":
         backup_integrator = GCS_INTEGRATOR
         backup_integrator_channel = GCS_INTEGRATOR_CHANNEL
+        backup_integrator_revision = 63
     else:
         backup_integrator = S3_INTEGRATOR
         backup_integrator_channel = S3_INTEGRATOR_CHANNEL
+        backup_integrator_revision = None
 
     logging.info("Destroying the application")
     await asyncio.gather(
@@ -866,7 +882,11 @@ async def test_restore_to_new_cluster(
         ops_test.model.deploy(
             TLS_CERTIFICATES_APP_NAME, channel=TLS_STABLE_CHANNEL, config=config
         ),
-        ops_test.model.deploy(backup_integrator, channel=backup_integrator_channel),
+        ops_test.model.deploy(
+            backup_integrator,
+            channel=backup_integrator_channel,
+            revision=backup_integrator_revision,
+        ),
         ops_test.model.deploy(charm, num_units=3, series=series, config=CONFIG_OPTS),
     )
 
@@ -1101,7 +1121,7 @@ async def _ensure_only_gcs_integrator_related(ops_test: OpsTest, app: str) -> No
     await _drop_azure_relation_if_any(ops_test, app)
 
     if GCS_INTEGRATOR not in ops_test.model.applications:
-        await ops_test.model.deploy(GCS_INTEGRATOR, channel=GCS_INTEGRATOR_CHANNEL)
+        await ops_test.model.deploy(GCS_INTEGRATOR, channel=GCS_INTEGRATOR_CHANNEL, revision=63)
         await wait_until(
             ops_test,
             apps=[GCS_INTEGRATOR],

tests/unit/resources/config/opensearch-security/internal_users.yml

@@ -10,7 +10,7 @@ _meta:
 ## Demo users
 
 admin:
-  hash: $2b$12$mAXCJ7AiHGDGxLiqwQ4HCefDIeyQIVsjT8zBhm2qZg6TCnBVnZ9lq
+  hash: $2b$12$Pqj6sCr9RYYus0Pp2qklu.r9fOXmx0lnCJkNqpnCmgACjiblhKLOO
   reserved: false
   backend_roles:
   - admin
@@ -19,6 +19,6 @@ admin:
   - all_access
   description: Admin user
 kibanaserver:
-  hash: $2b$12$p54pyKyc0tWo.yoAlKfk5ekpLJhzEuwL./yIJURFWF5o4aXwcDVbu
+  hash: $2b$12$NLp9n6IrxhxVcaTMThPtn./JR410BOKFNndL27hovwonckVp38XcC
   reserved: false
   description: Kibanaserver user