[DPE-6112] Dual branch config and test tweaks (#894)

* Dual branch config and test tweaks

* Missed tests

* Try test differences from 16

Author: dragomirp

.github/renovate.json5

@@ -6,39 +6,15 @@
   reviewers: [
     'team:data-platform-postgresql',
   ],
+  "baseBranches": ["main", "/^*\\/edge$/"],
   packageRules: [
     {
       matchPackageNames: [
         'pydantic',
       ],
       allowedVersions: '<2.0.0',
     },
-    {
-      matchManagers: [
-        'custom.regex',
-      ],
-      matchDepNames: [
-        'juju',
-      ],
-      matchDatasources: [
-        'pypi',
-      ],
-      allowedVersions: '<3',
-      groupName: 'Juju agents',
-    },
   ],
   customManagers: [
-    {
-      customType: 'regex',
-      fileMatch: [
-        '^\\.github/workflows/[^/]+\\.ya?ml$',
-      ],
-      matchStrings: [
-        '(libjuju: )==(?<currentValue>.*?) +# renovate: latest libjuju 2',
-      ],
-      depNameTemplate: 'juju',
-      datasourceTemplate: 'pypi',
-      versioningTemplate: 'loose',
-    },
   ],
 }

.github/workflows/check_pr.yaml

@@ -11,6 +11,7 @@ on:
       - edited
     branches:
       - main
+      - '*/edge'
 
 jobs:
   check-pr:

tests/integration/ha_tests/test_smoke.py

@@ -10,10 +10,11 @@
 from pytest_operator.plugin import OpsTest
 from tenacity import Retrying, stop_after_delay, wait_fixed
 
-from .. import markers
 from ..helpers import (
     CHARM_BASE,
     DATABASE_APP_NAME,
+    METADATA,
+    build_and_deploy,
     scale_application,
 )
 from .helpers import (
@@ -43,24 +44,13 @@
 env["KUBECONFIG"] = os.path.expanduser("~/.kube/config")
 
 
-@markers.amd64_only  # TODO: remove after arm64 stable release
 @pytest.mark.abort_on_fail
-async def test_app_force_removal(ops_test: OpsTest):
+async def test_app_force_removal(ops_test: OpsTest, charm):
     """Remove unit with force while storage is alive."""
     global primary_pv, primary_pvc
     # Deploy the charm.
     async with ops_test.fast_forward():
-        await ops_test.model.deploy(
-            DATABASE_APP_NAME,
-            application_name=DATABASE_APP_NAME,
-            num_units=1,
-            channel="14/stable",
-            base=CHARM_BASE,
-            trust=True,
-            config={"profile": "testing"},
-        )
-
-        await ops_test.model.wait_for_idle(status="active", timeout=1000)
+        await build_and_deploy(ops_test, charm, 1)
 
         assert ops_test.model.applications[DATABASE_APP_NAME].units[0].workload_status == "active"
 
@@ -103,7 +93,6 @@ async def test_app_force_removal(ops_test: OpsTest):
                 assert await is_storage_exists(ops_test, storage_id)
 
 
-@markers.amd64_only  # TODO: remove after arm64 stable release
 @pytest.mark.abort_on_fail
 async def test_app_garbage_ignorance(ops_test: OpsTest):
     """Test charm deploy in dirty environment with garbage storage."""
@@ -155,17 +144,19 @@ async def test_app_garbage_ignorance(ops_test: OpsTest):
         delete_pvc(ops_test, primary_pvc)
 
 
-@markers.amd64_only  # TODO: remove after arm64 stable release
 @pytest.mark.abort_on_fail
-async def test_app_resources_conflicts(ops_test: OpsTest):
+async def test_app_resources_conflicts(ops_test: OpsTest, charm):
     """Test application deploy in dirty environment with garbage storage from another application."""
     global primary_pv, primary_pvc
     async with ops_test.fast_forward():
+        resources = {
+            "postgresql-image": METADATA["resources"]["postgresql-image"]["upstream-source"],
+        }
         await ops_test.model.deploy(
-            DATABASE_APP_NAME,
+            charm,
+            resources=resources,
             application_name=DUP_DATABASE_APP_NAME,
             num_units=1,
-            channel="14/stable",
             base=CHARM_BASE,
             trust=True,
             config={"profile": "testing"},

tests/integration/ha_tests/test_upgrade_from_stable.py

@@ -10,7 +10,6 @@
 from pytest_operator.plugin import OpsTest
 from tenacity import Retrying, stop_after_attempt, wait_fixed
 
-from .. import markers
 from ..helpers import (
     APPLICATION_NAME,
     CHARM_BASE,
@@ -32,7 +31,6 @@
 TIMEOUT = 10 * 60
 
 
-@markers.amd64_only  # TODO: remove after arm64 stable release
 @pytest.mark.abort_on_fail
 async def test_deploy_stable(ops_test: OpsTest) -> None:
     """Simple test to ensure that the PostgreSQL and application charms get deployed."""
@@ -59,7 +57,6 @@ async def test_deploy_stable(ops_test: OpsTest) -> None:
     assert len(ops_test.model.applications[DATABASE_APP_NAME].units) == 3
 
 
-@markers.amd64_only  # TODO: remove after arm64 stable release
 @pytest.mark.abort_on_fail
 async def test_pre_upgrade_check(ops_test: OpsTest) -> None:
     """Test that the pre-upgrade-check action runs successfully."""
@@ -91,7 +88,6 @@ async def test_pre_upgrade_check(ops_test: OpsTest) -> None:
     assert stateful_set.spec.updateStrategy.rollingUpdate.partition == 2, "Partition not set to 2"
 
 
-@markers.amd64_only  # TODO: remove after arm64 stable release
 @pytest.mark.abort_on_fail
 async def test_upgrade_from_stable(ops_test: OpsTest, charm, continuous_writes):
     """Test updating from stable channel."""

tests/integration/new_relations/test_new_relations_1.py

@@ -482,7 +482,7 @@ async def test_admin_role(ops_test: OpsTest):
                     f"test_{''.join(secrets.choice(string.ascii_lowercase) for _ in range(10))}"
                 )
                 should_fail = database == DATABASE_DEFAULT_NAME
-                cursor.execute(f"CREATE TABLE {random_name}(data TEXT);")
+                cursor.execute(f"CREATE SCHEMA test; CREATE TABLE test.{random_name}(data TEXT);")
                 if should_fail:
                     assert False, (
                         f"failed to run a statement in the following database: {database}"

tests/integration/test_backups_aws.py

@@ -33,7 +33,7 @@
     tls_config = {"generate-self-signed-certificates": "true", "ca-common-name": "Test CA"}
 else:
     tls_certificates_app_name = "self-signed-certificates"
-    tls_channel = "latest/edge" if architecture.architecture == "arm64" else "latest/stable"
+    tls_channel = "latest/stable"
     tls_config = {"ca-common-name": "Test CA"}
 
 logger = logging.getLogger(__name__)

tests/integration/test_backups_gcp.py

@@ -36,7 +36,7 @@
     tls_config = {"generate-self-signed-certificates": "true", "ca-common-name": "Test CA"}
 else:
     tls_certificates_app_name = "self-signed-certificates"
-    tls_channel = "latest/edge" if architecture.architecture == "arm64" else "latest/stable"
+    tls_channel = "latest/stable"
     tls_config = {"ca-common-name": "Test CA"}
 
 logger = logging.getLogger(__name__)

tests/integration/test_backups_pitr_aws.py

@@ -28,7 +28,7 @@
     tls_config = {"generate-self-signed-certificates": "true", "ca-common-name": "Test CA"}
 else:
     tls_certificates_app_name = "self-signed-certificates"
-    tls_channel = "latest/edge" if architecture.architecture == "arm64" else "latest/stable"
+    tls_channel = "latest/stable"
     tls_config = {"ca-common-name": "Test CA"}
 
 logger = logging.getLogger(__name__)

tests/integration/test_backups_pitr_gcp.py

@@ -28,7 +28,7 @@
     tls_config = {"generate-self-signed-certificates": "true", "ca-common-name": "Test CA"}
 else:
     tls_certificates_app_name = "self-signed-certificates"
-    tls_channel = "latest/edge" if architecture.architecture == "arm64" else "latest/stable"
+    tls_channel = "latest/stable"
     tls_config = {"ca-common-name": "Test CA"}
 
 logger = logging.getLogger(__name__)

tests/integration/test_plugins.py

@@ -62,8 +62,10 @@
 HYPOPG_EXTENSION_STATEMENT = "CREATE TABLE hypopg_test (id integer, val text); SELECT hypopg_create_index('CREATE INDEX ON hypopg_test (id)');"
 IP4R_EXTENSION_STATEMENT = "CREATE TABLE ip4r_test (ip ip4);"
 JSONB_PLPERL_EXTENSION_STATEMENT = "CREATE OR REPLACE FUNCTION jsonb_plperl_test(val jsonb) RETURNS jsonb TRANSFORM FOR TYPE jsonb LANGUAGE plperl as $$ return $_[0]; $$;"
-ORAFCE_EXTENSION_STATEMENT = "SELECT add_months(date '2005-05-31',1);"
-PG_SIMILARITY_EXTENSION_STATEMENT = "SHOW pg_similarity.levenshtein_threshold;"
+ORAFCE_EXTENSION_STATEMENT = "SELECT oracle.add_months(date '2005-05-31',1);"
+PG_SIMILARITY_EXTENSION_STATEMENT = (
+    "SET pg_similarity.levenshtein_threshold = 0.7; SELECT 'aaa', 'aab', lev('aaa','aab');"
+)
 PLPERL_EXTENSION_STATEMENT = "CREATE OR REPLACE FUNCTION plperl_test(name text) RETURNS text AS $$ return $_SHARED{$_[0]}; $$ LANGUAGE plperl;"
 PREFIX_EXTENSION_STATEMENT = "SELECT '123'::prefix_range @> '123456';"
 RDKIT_EXTENSION_STATEMENT = "SELECT is_valid_smiles('CCC');"