test: development versions (to be removed)

Signed-off-by: Francesco Canovai <[email protected]>

Author: fcanovai

.golangci.yml

@@ -33,7 +33,6 @@ linters:
     - gofumpt
     - goheader
     - goimports
-    - gomoddirectives
     - gomodguard
     - goprintffuncname
     - gosec

go.mod

@@ -155,3 +155,5 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
+
+replace github.com/cloudnative-pg/barman-cloud => github.com/fcanovai/barman-cloud v0.0.0-20241122154151-236fde9667ac

go.sum

@@ -26,8 +26,6 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cloudnative-pg/api v0.0.0-20241116094849-219d7a1d257f h1:KAXst7XLaipdFk9Qv796+tThfEJwFMG4wPLAizZ7wx4=
 github.com/cloudnative-pg/api v0.0.0-20241116094849-219d7a1d257f/go.mod h1:aYVZDHteiejVYbntDxJVx1K45xeV8y0KtR/wK4zvt7U=
-github.com/cloudnative-pg/barman-cloud v0.0.0-20241105055149-ae6c2408bd14 h1:HX5pXyzVAqfjcDgCa1l8b4sumf7XYnGqiP+6XMgbB2E=
-github.com/cloudnative-pg/barman-cloud v0.0.0-20241105055149-ae6c2408bd14/go.mod h1:HPGwXHlatQEnb2HdsbGTZLEo8qlxKLdxTHiTeF9TTqw=
 github.com/cloudnative-pg/cloudnative-pg v1.24.1-0.20241113134512-8608232c2813 h1:XWpr5y28JRwcA4BzxBkHFx7C8JDqOSdDIN7RbRdI6Dg=
 github.com/cloudnative-pg/cloudnative-pg v1.24.1-0.20241113134512-8608232c2813/go.mod h1:f4hObdRVoQtMmVtWqZ6VDZBrI6ok9Td/UMhojQ+EPmk=
 github.com/cloudnative-pg/cnpg-i v0.0.0-20241109002750-8abd359df734 h1:4jq/FUrlAKxu0Kw9PL5lj5Njq8pAnmUpP/kXKOrJAaE=
@@ -57,6 +55,8 @@ github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lSh
 github.com/evanphx/json-patch v5.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg=
 github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
+github.com/fcanovai/barman-cloud v0.0.0-20241122154151-236fde9667ac h1:f5voU+ukASKVRLd8/K/SazUWG378LMQrnuyf5DO9beo=
+github.com/fcanovai/barman-cloud v0.0.0-20241122154151-236fde9667ac/go.mod h1:HPGwXHlatQEnb2HdsbGTZLEo8qlxKLdxTHiTeF9TTqw=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=

test/e2e/e2e_suite_test.go

@@ -51,7 +51,11 @@ var _ = SynchronizedBeforeSuite(func(ctx SpecContext) []byte {
 	var cl client.Client
 	var err error
 	if cl, err = e2etestenv.Setup(ctx,
-		e2etestenv.WithKindAdditionalNetworks([]string{"barman-cloud-plugin"})); err != nil {
+		e2etestenv.WithKindAdditionalNetworks([]string{"barman-cloud-plugin"}),
+		// TODO: remove this when https://github.com/cloudnative-pg/barman-cloud/pull/47 is merged
+		e2etestenv.WithCNPGImageName("ghcr.io/fcanovai/cloudnative-pg-testing"),
+		e2etestenv.WithCNPGImageTag("main"),
+	); err != nil {
 		Fail(fmt.Sprintf("failed to setup environment: %v", err))
 	}
 

test/e2e/internal/objectstore/fakegcsserver.go

@@ -68,7 +68,10 @@ func newGCSDeployment(namespace, name string) *appsv1.Deployment {
 						{
 							Name: name,
 							// TODO: renovate the image
-							Image: "registry.barman-cloud-plugin:5000/fakegcs:test",
+							// FIXME: move to the official fsouza/fake-gcs-server
+							//   when https://github.com/fsouza/fake-gcs-server/pull/1827
+							//   is merged and released.
+							Image: "ghcr.io/fcanovai/fake-gcs-server:latest",
 							Ports: []corev1.ContainerPort{
 								{
 									ContainerPort: 4443,