Skip to content

Commit 3596a36

Browse files
committed
Use framework.StartDex
Signed-off-by: Nelo-T. Wallus <red.brush9525@fastmail.com> Signed-off-by: Nelo-T. Wallus <n.wallus@sap.com>
1 parent 64db37d commit 3596a36

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,8 @@ test-e2e: WORK_DIR ?= .
277277
test-e2e: WHAT ?= ./test/e2e...
278278
test-e2e: $(KCP) $(DEX) build ## Run e2e tests
279279
mkdir .kcp
280-
$(MAKE) run-dex 2>&1 & DEX_PID=$$!; \
281280
$(MAKE) run-kcp &>.kcp/kcp.log & KCP_PID=$$!; \
282-
trap 'kill -TERM $$DEX_PID $$KCP_PID; rm -rf .kcp' TERM INT EXIT && \
281+
trap 'kill -TERM $$KCP_PID; rm -rf .kcp' TERM INT EXIT && \
283282
echo "Waiting for kcp to be ready (check .kcp/kcp.log)." && while ! KUBECONFIG=.kcp/admin.kubeconfig kubectl get --raw /readyz &>/dev/null; do sleep 1; echo -n "."; done && echo && \
284283
KUBECONFIG=$$PWD/.kcp/admin.kubeconfig GOOS=$(OS) GOARCH=$(ARCH) $(GO_TEST) -race -count $(COUNT) -p $(E2E_PARALLELISM) -parallel $(E2E_PARALLELISM) $(WHAT) $(TEST_ARGS)
285284

test/e2e/bind/happy-case_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ func testHappyCase(t *testing.T, resourceScope apiextensionsv1.ResourceScope, in
5959
ctx, cancel := context.WithCancel(context.Background())
6060
t.Cleanup(cancel)
6161

62+
framework.StartDex(t)
63+
6264
t.Logf("Creating provider workspace")
6365
providerConfig, providerKubeconfig := framework.NewWorkspace(t, framework.ClientConfig(t), framework.WithGenerateName("test-happy-case-provider"))
6466

0 commit comments

Comments
 (0)