From db6b1818c5e0d169f2819e3348a2843941d75160 Mon Sep 17 00:00:00 2001
From: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
Date: Wed, 2 Sep 2026 11:04:45 +0200
Subject: [PATCH] fix(e2e): use runtime Skip for GCS tests instead of removing
 them

Deleting the GCS Entry() calls dropped e2e coverage permanently and
left the GCS factory types and fakegcsserver.go referenced nowhere.
Ginkgo's --fail-on-pending forbids Pending/XEntry, but a runtime
Skip() inside the shared spec body avoids that check while keeping
the factories wired up, making it easier to notice and re-enable the
tests once EnterpriseDB/barman#1218 is fixed.

Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
---
 test/e2e/internal/tests/backup/backup_restore.go | 16 ++++++++++++++++
 .../tests/replicacluster/replica_cluster.go      |  9 +++++++++
 2 files changed, 25 insertions(+)

diff --git a/test/e2e/internal/tests/backup/backup_restore.go b/test/e2e/internal/tests/backup/backup_restore.go
index e069d27..c0f9b91 100644
--- a/test/e2e/internal/tests/backup/backup_restore.go
+++ b/test/e2e/internal/tests/backup/backup_restore.go
@@ -56,6 +56,12 @@ var _ = Describe("Backup and restore", func() {
 			ctx SpecContext,
 			factory testCaseFactory,
 		) {
+			switch factory.(type) {
+			case *gcsBackupPluginBackupPluginRestore, *gcsBackupPluginBackupInTreeRestore,
+				*gcsBackupPluginInTreeBackupPluginRestore:
+				Skip("GCS e2e tests are disabled until https://github.com/EnterpriseDB/barman/issues/1218 is fixed")
+			}
+
 			testResources := factory.createBackupRestoreTestResources(namespace.Name)
 
 			By("starting the ObjectStore deployment")
@@ -198,5 +204,15 @@ var _ = Describe("Backup and restore", func() {
 			"using in-tree for backup and the plugin for restore on Azure",
 			&azureBackupPluginInTreeBackupPluginRestore{},
 		),
+		Entry("using the plugin for backup and restore on GCS",
+			&gcsBackupPluginBackupPluginRestore{},
+		),
+		Entry("using the plugin for backup and in-tree for restore on GCS",
+			&gcsBackupPluginBackupInTreeRestore{},
+		),
+		Entry(
+			"using in-tree for backup and the plugin for restore on GCS",
+			&gcsBackupPluginInTreeBackupPluginRestore{},
+		),
 	)
 })
diff --git a/test/e2e/internal/tests/replicacluster/replica_cluster.go b/test/e2e/internal/tests/replicacluster/replica_cluster.go
index 802e32b..e4cf598 100644
--- a/test/e2e/internal/tests/replicacluster/replica_cluster.go
+++ b/test/e2e/internal/tests/replicacluster/replica_cluster.go
@@ -57,6 +57,11 @@ var _ = Describe("Replica cluster", func() {
 			ctx SpecContext,
 			factory testCaseFactory,
 		) {
+			switch factory.(type) {
+			case gcsReplicaClusterFactory:
+				Skip("GCS e2e tests are disabled until https://github.com/EnterpriseDB/barman/issues/1218 is fixed")
+			}
+
 			testResources := factory.createReplicaClusterTestResources(namespace.Name)
 
 			By("starting the ObjectStore deployments")
@@ -268,5 +273,9 @@ var _ = Describe("Replica cluster", func() {
 			"with Azurite",
 			azuriteReplicaClusterFactory{},
 		),
+		Entry(
+			"with fake-gcs-server",
+			gcsReplicaClusterFactory{},
+		),
 	)
 })