Skip to content

Commit

Permalink
increase upgrade test timeout
Browse files Browse the repository at this point in the history
Signed-off-by: Ankita Thomas <[email protected]>
  • Loading branch information
ankitathomas committed Jul 22, 2024
1 parent 4a0e389 commit efe2cb2
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ lint: $(GOLANGCI_LINT) ## Run golangci linter.
.PHONY: test-upgrade-e2e
test-upgrade-e2e: export TEST_CLUSTER_CATALOG_NAME := test-catalog
test-upgrade-e2e: export TEST_CLUSTER_CATALOG_IMAGE := docker-registry.catalogd-e2e.svc:5000/test-catalog:e2e
test-upgrade-e2e: kind-cluster cert-manager build-container kind-load image-registry run-latest-release pre-upgrade-setup post-upgrade-checks deploy wait ## Run upgrade e2e tests on a local kind cluster
test-upgrade-e2e: kind-cluster cert-manager build-container kind-load image-registry run-latest-release pre-upgrade-setup deploy wait ## Run upgrade e2e tests on a local kind cluster
test-upgrade-e2e:
$(MAKE) post-upgrade-checks
$(MAKE) kind-cluster-cleanup
Expand Down
13 changes: 8 additions & 5 deletions test/upgrade/unpack_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,16 @@ var _ = Describe("ClusterCatalog Unpacking", func() {
g.Expect(cond.Reason).To(Equal(catalogd.ReasonUnpackSuccessful))
}).Should(Succeed())

By("Making sure the catalog content is available via the http server")
actualFBC, err := e2e.ReadTestCatalogServerContents(ctx, catalog, c, kubeClient)
Expect(err).To(Not(HaveOccurred()))

expectedFBC, err := os.ReadFile("../../testdata/catalogs/test-catalog/expected_all.json")
Expect(err).To(Not(HaveOccurred()))
Expect(cmp.Diff(expectedFBC, actualFBC)).To(BeEmpty())

By("Making sure the catalog content is available via the http server")
Eventually(func(g Gomega) {
actualFBC, err := e2e.ReadTestCatalogServerContents(ctx, catalog, c, kubeClient)
g.Expect(err).To(Not(HaveOccurred()))
g.Expect(cmp.Diff(expectedFBC, actualFBC)).To(BeEmpty())
}).Should(Succeed())

})
})
})

0 comments on commit efe2cb2

Please sign in to comment.