Merge 65ca0c20f3 into 3958ee4805

The lockfile had drifted to a Python 3.12 header, not matching the
python3.13 venv the sidecar image ships. Regenerated with the correct
Python version (see #1093 for the task that automates this going
forward); the barman==3.20.0 pin and hashes are unchanged.

Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>

containers/sidecar-requirements.txt

@@ -1,8 +1,8 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# This file is autogenerated by pip-compile with Python 3.13
 # by the following command:
 #
-#    pip-compile --allow-unsafe --generate-hashes --output-file=sidecar-requirements.txt --strip-extras sidecar-requirements.in
+#    pip-compile --allow-unsafe --generate-hashes --no-index --output-file=sidecar-requirements.txt --strip-extras sidecar-requirements.in
 #
 azure-core==1.41.0 \
     --hash=sha256:522b4011e8180b1a3dcd2024396a4e7fe9ac37fb8597db47163d230b5efe892d \

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{},
+		),
 	)
 })

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{},
+		),
 	)
 })