fix: parallelarchive e2e test not executed by test runner (#59)

1. Renamed the test file
2. Added initial backup to setup
3. Changed log reading func to use pgbackrest plugin container

Signed-off-by: Piotr Szyma <thompson2908@gmail.com>

Author: piotrszyma

internal/cnpgi/operator/lifecycle.go

@@ -375,6 +375,7 @@ func reconcilePodSpec(
 	resources *corev1.ResourceRequirements,
 	securityContext *corev1.SecurityContext,
 ) error {
+	//nolint:prealloc
 	envs := []corev1.EnvVar{
 		{
 			Name:  "NAMESPACE",

internal/pgbackrest/archiver/archiver.go

@@ -150,6 +150,7 @@ func (archiver *WALArchiver) PgbackrestCheckWalArchiveOptions(
 	configuration *pgbackrestApi.PgbackrestConfiguration,
 	clusterName string,
 ) ([]string, error) {
+	//nolint:prealloc
 	var options []string
 
 	options, err := pgbackrestCommand.AppendCloudProviderOptionsFromConfiguration(ctx, options, configuration)

internal/pgbackrest/backup/backup.go

@@ -178,6 +178,7 @@ func (b *Command) getStanzaCreateOptions(
 	ctx context.Context,
 	stanza string,
 ) ([]string, error) {
+	//nolint:prealloc
 	options := []string{
 		"stanza-create",
 	}

internal/pgbackrest/command/backuplist.go

@@ -60,6 +60,7 @@ func executeQueryCommand(
 ) (string, error) {
 	contextLogger := log.FromContext(ctx).WithName("pgbackrest")
 
+	//nolint:prealloc
 	options := []string{"info", "--output", "json"}
 
 	options, err := AppendCloudProviderOptionsFromConfiguration(ctx, options, pgbackrestConfiguration)

test/e2e/internal/tests/parallelarchive/fixtures.go

@@ -37,6 +37,7 @@ type parallelArchiveTestResources struct {
 	ObjectStoreResources *objectstore.Resources
 	Archive              *pluginPgbackrestV1.Archive
 	Cluster              *cloudnativepgv1.Cluster
+	Backup               *cloudnativepgv1.Backup
 }
 
 // createParallelArchiveTestResources creates test resources for parallel archive testing
@@ -46,6 +47,7 @@ func createParallelArchiveTestResources(namespace string, maxParallel int) paral
 	resources.ObjectStoreResources = objectstore.NewMinioObjectStoreResources(namespace, minio)
 	resources.Archive = objectstore.NewMinioArchive(namespace, archiveName, minio, maxParallel)
 	resources.Cluster = createClusterWithArchive(namespace, clusterName, archiveName)
+	resources.Backup = createPluginBackup(namespace)
 
 	return resources
 }
@@ -85,3 +87,28 @@ func createClusterWithArchive(namespace, clusterName, archiveName string) *cloud
 
 	return cluster
 }
+
+// createPluginBackup creates a backup resource to initialize the pgBackRest stanza
+func createPluginBackup(namespace string) *cloudnativepgv1.Backup {
+	backup := &cloudnativepgv1.Backup{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "Backup",
+			APIVersion: "postgresql.cnpg.io/v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "plugin-backup",
+			Namespace: namespace,
+		},
+		Spec: cloudnativepgv1.BackupSpec{
+			Cluster: cloudnativepgv1.LocalObjectReference{
+				Name: clusterName,
+			},
+			Method: "plugin",
+			Target: "primary",
+			PluginConfiguration: &cloudnativepgv1.BackupPluginConfiguration{
+				Name: "pgbackrest.cnpg.opera.com",
+			},
+		},
+	}
+	return backup
+}

…parallelarchive/parallel_archive_test.go …ests/parallelarchive/parallel_archive.gotest/e2e/internal/tests/parallelarchive/parallel_archive_test.go renamed to test/e2e/internal/tests/parallelarchive/parallel_archive.go test/e2e/internal/tests/parallelarchive/parallel_archive_test.go renamed to test/e2e/internal/tests/parallelarchive/parallel_archive.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"time"
 
+	v1 "github.com/cloudnative-pg/api/pkg/api/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -79,10 +80,10 @@ var _ = Describe("Parallel WAL Archive", func() {
 			g.Expect(internalCluster.IsReady(*cluster)).To(BeTrue())
 		}).WithTimeout(10 * time.Minute).WithPolling(10 * time.Second).Should(Succeed())
 
-		By("creating initial data to generate some WAL traffic")
 		clientSet, cfg, err := internalClient.NewClientSet()
 		Expect(err).NotTo(HaveOccurred())
 
+		By("adding initial data to PostgreSQL")
 		_, _, err = command.ExecuteInContainer(ctx,
 			*clientSet,
 			cfg,
@@ -95,6 +96,17 @@ var _ = Describe("Parallel WAL Archive", func() {
 			[]string{"psql", "-tAc", "CREATE TABLE parallel_test (id int, data text);"})
 		Expect(err).NotTo(HaveOccurred())
 
+		By("creating a backup to initialize pgBackRest stanza")
+		backup := testResources.Backup
+		Expect(cl.Create(ctx, backup)).To(Succeed())
+
+		By("waiting for the backup to complete")
+		Eventually(func(g Gomega) {
+			g.Expect(cl.Get(ctx, types.NamespacedName{Name: backup.Name, Namespace: backup.Namespace},
+				backup)).To(Succeed())
+			g.Expect(backup.Status.Phase).To(BeEquivalentTo(v1.BackupPhaseCompleted))
+		}).Within(2 * time.Minute).WithPolling(5 * time.Second).Should(Succeed())
+
 		By("rapidly generating multiple WAL files to queue them for archiving")
 		// Generate 10 WAL switches in quick succession to create a backlog
 		// that can be processed in parallel
@@ -124,7 +136,7 @@ var _ = Describe("Parallel WAL Archive", func() {
 			clientSet,
 			cluster.Namespace,
 			fmt.Sprintf("%s-1", cluster.Name),
-			"postgres",
+			"plugin-pgbackrest",
 			nil,
 		)
 		Expect(err).NotTo(HaveOccurred())