From fd1b5dd7a4f1d931f7b37f8c8599c8d6c166db3a Mon Sep 17 00:00:00 2001
From: Dennis Felsing <dennis@felsing.org>
Date: Fri, 8 Nov 2024 11:13:40 +0100
Subject: [PATCH] Merge pull request #30390 from def-/pr-nightly6

Nightly fixes (November 8)
---
 .config/nextest.toml                                         | 4 ++++
 .../ignore_filter/pg_inconsistency_ignore_filter.py          | 5 +++++
 test/limits/mzcompose.py                                     | 1 +
 3 files changed, 10 insertions(+)

diff --git a/.config/nextest.toml b/.config/nextest.toml
index 159cb05a7f39e..e9c5b57d1fb36 100644
--- a/.config/nextest.toml
+++ b/.config/nextest.toml
@@ -16,6 +16,10 @@ slow-timeout = { period = "300s", terminate-after = 2 }
 filter = "package(mz-environmentd) and test(test_storage_usage_collection_interval)"
 slow-timeout = { period = "300s", terminate-after = 2 }
 
+[[profile.default.overrides]]
+filter = "package(mz-catalog) and test(global_expr_cache_roundtrip)"
+slow-timeout = { period = "300s", terminate-after = 2 }
+
 [[profile.default.overrides]]
 filter = "package(mz-environmentd)"
 threads-required = 8
diff --git a/misc/python/materialize/postgres_consistency/ignore_filter/pg_inconsistency_ignore_filter.py b/misc/python/materialize/postgres_consistency/ignore_filter/pg_inconsistency_ignore_filter.py
index e7e39b45b27ee..90441336c737b 100644
--- a/misc/python/materialize/postgres_consistency/ignore_filter/pg_inconsistency_ignore_filter.py
+++ b/misc/python/materialize/postgres_consistency/ignore_filter/pg_inconsistency_ignore_filter.py
@@ -227,6 +227,11 @@ def _matches_problematic_function_invocation(
         expression: ExpressionWithArgs,
         all_involved_characteristics: set[ExpressionCharacteristics],
     ) -> IgnoreVerdict:
+        if db_function.function_name_in_lower_case == "generate_subscripts":
+            return YesIgnore(
+                "database-issues#8410: table functions: combination with operations with NULL"
+            )
+
         if db_function.function_name_in_lower_case == "jsonb_pretty":
             return YesIgnore("Accepted")
 
diff --git a/test/limits/mzcompose.py b/test/limits/mzcompose.py
index 0715f7aa0e024..700fd33023f12 100644
--- a/test/limits/mzcompose.py
+++ b/test/limits/mzcompose.py
@@ -1675,6 +1675,7 @@ def app_password(email: str) -> str:
             "--https-resolver-template=materialized:6876",
             "--tls-key=/secrets/balancerd.key",
             "--tls-cert=/secrets/balancerd.crt",
+            "--internal-tls",
         ],
         depends_on=["test-certs"],
         volumes=[