marco/plugin-barman-cloud
1
0
Fork 0
mirror of https://github.com/cloudnative-pg/plugin-barman-cloud.git synced 2026-01-12 05:33:11 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

test(e2e): use postgres community image

Browse Source 
Explicitly define the images used by the tests, instead of relying on
the default operator image. Most tests now use postgres:17-bookworm.
Tests requiring barman-cloud on the image use
ghcr.io/cloudnative-pg/postgresql:17-bookworm instead.

Signed-off-by: Francesco Canovai <francesco.canovai@enterprisedb.com>
This commit is contained in:
Francesco Canovai 2024-12-27 15:02:00 +01:00 committed by Gabriele Bartolini
parent 4d71b02cd2
commit dfbfc9634a
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e/internal/tests/backup/fixtures.go
View File

@ -285,6 +285,7 @@ func newSrcClusterWithPlugin(namespace string) *cloudnativepgv1.Cluster {
Spec: cloudnativepgv1.ClusterSpec{ Spec: cloudnativepgv1.ClusterSpec{
Instances: 2, Instances: 2,
ImagePullPolicy: corev1.PullAlways, ImagePullPolicy: corev1.PullAlways,
ImageName: "postgres:17-bookworm",
Plugins: []cloudnativepgv1.PluginConfiguration{ Plugins: []cloudnativepgv1.PluginConfiguration{
{ {
Name: "barman-cloud.cloudnative-pg.io", Name: "barman-cloud.cloudnative-pg.io",
@ -298,6 +299,8 @@ func newSrcClusterWithPlugin(namespace string) *cloudnativepgv1.Cluster {
"log_min_messages": "DEBUG4", "log_min_messages": "DEBUG4",
}, },
}, },
PostgresUID: 999,
PostgresGID: 999,
StorageConfiguration: cloudnativepgv1.StorageConfiguration{ StorageConfiguration: cloudnativepgv1.StorageConfiguration{
Size: size, Size: size,
}, },
@ -320,6 +323,7 @@ func newDstClusterWithPlugin(namespace string) *cloudnativepgv1.Cluster {
Spec: cloudnativepgv1.ClusterSpec{ Spec: cloudnativepgv1.ClusterSpec{
Instances: 2, Instances: 2,
ImagePullPolicy: corev1.PullAlways, ImagePullPolicy: corev1.PullAlways,
ImageName: "postgres:17-bookworm",
Bootstrap: &cloudnativepgv1.BootstrapConfiguration{ Bootstrap: &cloudnativepgv1.BootstrapConfiguration{
Recovery: &cloudnativepgv1.BootstrapRecovery{ Recovery: &cloudnativepgv1.BootstrapRecovery{
Source: "source", Source: "source",
@ -338,6 +342,8 @@ func newDstClusterWithPlugin(namespace string) *cloudnativepgv1.Cluster {
"log_min_messages": "DEBUG4", "log_min_messages": "DEBUG4",
}, },
}, },
PostgresUID: 999,
PostgresGID: 999,
ExternalClusters: []cloudnativepgv1.ExternalCluster{ ExternalClusters: []cloudnativepgv1.ExternalCluster{
{ {
Name: "source", Name: "source",
@ -372,6 +378,7 @@ func newSrcClusterInTreeS3(namespace string) *cloudnativepgv1.Cluster {
Spec: cloudnativepgv1.ClusterSpec{ Spec: cloudnativepgv1.ClusterSpec{
Instances: 2, Instances: 2,
ImagePullPolicy: corev1.PullAlways, ImagePullPolicy: corev1.PullAlways,
ImageName: "ghcr.io/cloudnative-pg/postgresql:17-bookworm",
StorageConfiguration: cloudnativepgv1.StorageConfiguration{ StorageConfiguration: cloudnativepgv1.StorageConfiguration{
Size: size, Size: size,
}, },
@ -421,6 +428,7 @@ func newDstClusterInTreeS3(namespace string) *cloudnativepgv1.Cluster {
Spec: cloudnativepgv1.ClusterSpec{ Spec: cloudnativepgv1.ClusterSpec{
Instances: 2, Instances: 2,
ImagePullPolicy: corev1.PullAlways, ImagePullPolicy: corev1.PullAlways,
ImageName: "ghcr.io/cloudnative-pg/postgresql:17-bookworm",
Bootstrap: &cloudnativepgv1.BootstrapConfiguration{ Bootstrap: &cloudnativepgv1.BootstrapConfiguration{
Recovery: &cloudnativepgv1.BootstrapRecovery{ Recovery: &cloudnativepgv1.BootstrapRecovery{
Source: "source", Source: "source",
@ -486,6 +494,7 @@ func newSrcClusterInTreeAzure(namespace string) *cloudnativepgv1.Cluster {
Spec: cloudnativepgv1.ClusterSpec{ Spec: cloudnativepgv1.ClusterSpec{
Instances: 2, Instances: 2,
ImagePullPolicy: corev1.PullAlways, ImagePullPolicy: corev1.PullAlways,
ImageName: "ghcr.io/cloudnative-pg/postgresql:17-bookworm",
StorageConfiguration: cloudnativepgv1.StorageConfiguration{ StorageConfiguration: cloudnativepgv1.StorageConfiguration{
Size: size, Size: size,
}, },
@ -523,6 +532,7 @@ func newDstClusterInTreeAzure(namespace string) *cloudnativepgv1.Cluster {
Spec: cloudnativepgv1.ClusterSpec{ Spec: cloudnativepgv1.ClusterSpec{
Instances: 2, Instances: 2,
ImagePullPolicy: corev1.PullAlways, ImagePullPolicy: corev1.PullAlways,
ImageName: "ghcr.io/cloudnative-pg/postgresql:17-bookworm",
Bootstrap: &cloudnativepgv1.BootstrapConfiguration{ Bootstrap: &cloudnativepgv1.BootstrapConfiguration{
Recovery: &cloudnativepgv1.BootstrapRecovery{ Recovery: &cloudnativepgv1.BootstrapRecovery{
Source: "source", Source: "source",
@ -576,6 +586,7 @@ func newSrcClusterInTreeGCS(namespace string) *cloudnativepgv1.Cluster {
Spec: cloudnativepgv1.ClusterSpec{ Spec: cloudnativepgv1.ClusterSpec{
Instances: 2, Instances: 2,
ImagePullPolicy: corev1.PullAlways, ImagePullPolicy: corev1.PullAlways,
ImageName: "ghcr.io/cloudnative-pg/postgresql:17-bookworm",
StorageConfiguration: cloudnativepgv1.StorageConfiguration{ StorageConfiguration: cloudnativepgv1.StorageConfiguration{
Size: size, Size: size,
}, },
@ -619,6 +630,7 @@ func newDstClusterInTreeGCS(namespace string) *cloudnativepgv1.Cluster {
Spec: cloudnativepgv1.ClusterSpec{ Spec: cloudnativepgv1.ClusterSpec{
Instances: 2, Instances: 2,
ImagePullPolicy: corev1.PullAlways, ImagePullPolicy: corev1.PullAlways,
ImageName: "ghcr.io/cloudnative-pg/postgresql:17-bookworm",
Bootstrap: &cloudnativepgv1.BootstrapConfiguration{ Bootstrap: &cloudnativepgv1.BootstrapConfiguration{
Recovery: &cloudnativepgv1.BootstrapRecovery{ Recovery: &cloudnativepgv1.BootstrapRecovery{
Source: "source", Source: "source",

6
test/e2e/internal/tests/replicacluster/fixtures.go
View File

@ -111,6 +111,7 @@ func newSrcCluster(namespace string) *cloudnativepgv1.Cluster {
}, },
Spec: cloudnativepgv1.ClusterSpec{ Spec: cloudnativepgv1.ClusterSpec{
Instances: 2, Instances: 2,
ImageName: "postgres:17-bookworm",
ImagePullPolicy: corev1.PullAlways, ImagePullPolicy: corev1.PullAlways,
Plugins: []cloudnativepgv1.PluginConfiguration{ Plugins: []cloudnativepgv1.PluginConfiguration{
{ {
@ -125,6 +126,8 @@ func newSrcCluster(namespace string) *cloudnativepgv1.Cluster {
"log_min_messages": "DEBUG4", "log_min_messages": "DEBUG4",
}, },
}, },
PostgresUID: 999,
PostgresGID: 999,
StorageConfiguration: cloudnativepgv1.StorageConfiguration{ StorageConfiguration: cloudnativepgv1.StorageConfiguration{
Size: size, Size: size,
}, },
@ -217,12 +220,15 @@ func newReplicaCluster(namespace string) *cloudnativepgv1.Cluster {
}, },
Spec: cloudnativepgv1.ClusterSpec{ Spec: cloudnativepgv1.ClusterSpec{
Instances: 2, Instances: 2,
ImageName: "postgres:17-bookworm",
ImagePullPolicy: corev1.PullAlways, ImagePullPolicy: corev1.PullAlways,
Bootstrap: &cloudnativepgv1.BootstrapConfiguration{ Bootstrap: &cloudnativepgv1.BootstrapConfiguration{
Recovery: &cloudnativepgv1.BootstrapRecovery{ Recovery: &cloudnativepgv1.BootstrapRecovery{
Source: "source", Source: "source",
}, },
}, },
PostgresUID: 999,
PostgresGID: 999,
Plugins: []cloudnativepgv1.PluginConfiguration{ Plugins: []cloudnativepgv1.PluginConfiguration{
{ {
Name: "barman-cloud.cloudnative-pg.io", Name: "barman-cloud.cloudnative-pg.io",