Skip to content

Commit

Permalink
ci/e2e: split backup/restore test
Browse files Browse the repository at this point in the history
Installation of backup/restore operator should be done right after
Rancher Manager.

Signed-off-by: Loic Devulder <ldevulder@suse.com>
  • Loading branch information
ldevulder committed Apr 19, 2023
1 parent f86e17f commit f95f2d6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
3 changes: 2 additions & 1 deletion tests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,14 @@ generate-readme:
e2e-bootstrap-node: deps
ginkgo --timeout $(GINKGO_TIMEOUT)s --label-filter bootstrap -r -v ./e2e
e2e-backup-restore: deps
ginkgo --label-filter backup-restore -r -v ./e2e
ginkgo --label-filter test-backup-restore -r -v ./e2e
e2e-configure-rancher: deps
ginkgo --label-filter configure -r -v ./e2e
e2e-get-logs: deps
ginkgo --label-filter logs -r -v ./e2e
e2e-install-rancher: deps
ginkgo --label-filter install -r -v ./e2e
ginkgo --label-filter install-backup-restore -r -v ./e2e
e2e-ui-rancher: deps
ginkgo --label-filter ui -r -v ./e2e
e2e-uninstall-operator:
Expand Down
12 changes: 7 additions & 5 deletions tests/e2e/backup-restore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/rancher/elemental/tests/e2e/helpers/misc"
)

var _ = Describe("E2E - Test Backup/Restore", Label("backup-restore"), func() {
var _ = Describe("E2E - Install Backup/Restore Operator", Label("install-backup-restore"), func() {
// Create kubectl context
// Default timeout is too small, so New() cannot be used
k := &kubectl.Kubectl{
Expand All @@ -34,10 +34,6 @@ var _ = Describe("E2E - Test Backup/Restore", Label("backup-restore"), func() {
PollInterval: 500 * time.Millisecond,
}

// Variable(s)
backupResourceName := "elemental-backup"
restoreResourceName := "elemental-restore"

It("Install Backup/Restore Operator", func() {
// Default chart
chartRepo := "rancher-chart"
Expand Down Expand Up @@ -90,6 +86,12 @@ var _ = Describe("E2E - Test Backup/Restore", Label("backup-restore"), func() {
Expect(err).To(Not(HaveOccurred()))
})
})
})

var _ = Describe("E2E - Test Backup/Restore", Label("test-backup-restore"), func() {
// Variable(s)
backupResourceName := "elemental-backup"
restoreResourceName := "elemental-restore"

It("Do a backup", func() {
By("Adding a backup resource", func() {
Expand Down

0 comments on commit f95f2d6

Please sign in to comment.