diff --git a/Makefile b/Makefile index 5b84e976afc..a298576b119 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ SHELL = /bin/bash TAG ?= $(shell git describe --exact-match 2>/dev/null) COMMIT = $(shell git rev-parse --short=7 HEAD)$(shell [[ $$(git status --porcelain) = "" ]] || echo -dirty) ARO_IMAGE_BASE = ${RP_IMAGE_ACR}.azurecr.io/aro -E2E_FLAGS ?= -test.v --ginkgo.v --ginkgo.timeout 180m --ginkgo.flake-attempts=2 --ginkgo.junit-report=e2e-report.xml +E2E_FLAGS ?= -test.v --ginkgo.vv --ginkgo.timeout 180m --ginkgo.flake-attempts=2 --ginkgo.junit-report=e2e-report.xml GO_FLAGS ?= -tags=containers_image_openpgp,exclude_graphdriver_btrfs,exclude_graphdriver_devicemapper NO_CACHE ?= true @@ -273,4 +273,4 @@ vendor: install-go-tools: go install ${GOTESTSUM} -.PHONY: admin.kubeconfig aks.kubeconfig aro az ci-portal clean client deploy dev-config.yaml discoverycache generate image-aro-multistage image-fluentbit image-proxy init-contrib lint-go runlocal-rp proxy publish-image-aro-multistage publish-image-fluentbit publish-image-proxy secrets secrets-update e2e.test tunnel test-e2e test-go test-python vendor build-all validate-go unit-test-go coverage-go validate-fips install-go-tools \ No newline at end of file +.PHONY: admin.kubeconfig aks.kubeconfig aro az ci-portal clean client deploy dev-config.yaml discoverycache generate image-aro-multistage image-fluentbit image-proxy init-contrib lint-go runlocal-rp proxy publish-image-aro-multistage publish-image-fluentbit publish-image-proxy secrets secrets-update e2e.test tunnel test-e2e test-go test-python vendor build-all validate-go unit-test-go coverage-go validate-fips install-go-tools diff --git a/test/e2e/operator.go b/test/e2e/operator.go index 4375b41cec7..00e2e77fc15 100644 --- a/test/e2e/operator.go +++ b/test/e2e/operator.go @@ -579,7 +579,7 @@ var _ = Describe("ARO Operator - ImageConfig Reconciler", func() { }) }) -var _ = Describe("ARO Operator - dnsmasq", func() { +var _ = Describe("ARO Operator - dnsmasq", Ordered, func() { const ( timeout = 1 * time.Minute polling = 10 * time.Second @@ -614,7 +614,7 @@ var _ = Describe("ARO Operator - dnsmasq", func() { Expect(err).NotTo(HaveOccurred()) }) - It("must handle the lifetime of the `99-${MCP}-custom-dns MachineConfig for every MachineConfigPool ${MCP}", Ordered, func(ctx context.Context) { + It("must handle the lifetime of the `99-${MCP}-custom-dns MachineConfig for every MachineConfigPool ${MCP}", func(ctx context.Context) { It("should create an ARO DNS MachineConfig when creating a custom MachineConfigPool", func(ctx context.Context) { Eventually(func(g Gomega, ctx context.Context) []string { return getMachineConfigNames(g, ctx)