From d4f034464ad7e3ccfe88c086dfd0b470ce5ccd7d Mon Sep 17 00:00:00 2001 From: Kyle Squizzato Date: Mon, 23 Sep 2024 16:11:24 -0400 Subject: [PATCH] Ensure a Release exists for the custom build.version we deploy Signed-off-by: Kyle Squizzato --- test/e2e/e2e_suite_test.go | 6 +++++- test/e2e/provider_aws_test.go | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go index 1934d80e8..6002d43c3 100644 --- a/test/e2e/e2e_suite_test.go +++ b/test/e2e/e2e_suite_test.go @@ -50,10 +50,14 @@ func TestE2E(t *testing.T) { var _ = BeforeSuite(func() { By("building and deploying the controller-manager") - cmd := exec.Command("make", "dev-apply") + cmd := exec.Command("make", "set-hmc-version") _, err := utils.Run(cmd) Expect(err).NotTo(HaveOccurred()) + cmd = exec.Command("make", "dev-apply") + _, err = utils.Run(cmd) + Expect(err).NotTo(HaveOccurred()) + By("validating that the hmc-controller and CAPI provider controller is running and ready") kc := kubeclient.NewFromLocal(internalutils.DefaultSystemNamespace) Eventually(func() error { diff --git a/test/e2e/provider_aws_test.go b/test/e2e/provider_aws_test.go index 491f9da35..28008c1f0 100644 --- a/test/e2e/provider_aws_test.go +++ b/test/e2e/provider_aws_test.go @@ -47,7 +47,14 @@ var _ = Describe("AWS Templates", Label("provider:cloud", "provider:aws"), Order By("verifying CAPA controller is running and ready") Eventually(func() error { - return verifyControllersUp(kc, managedcluster.ProviderAWS) + err := verifyControllersUp(standaloneClient, managedcluster.ProviderCAPI, managedcluster.ProviderAWS) + if err != nil { + _, _ = fmt.Fprintf( + GinkgoWriter, "[%s] controller validation failed: %v\n", + string(managedcluster.TemplateAWSHostedCP), err) + return err + } + return nil }).WithTimeout(5 * time.Minute).WithPolling(10 * time.Second).Should(Succeed()) })