From 9e3133bf331051230b7d7d2519bccc456551dbea Mon Sep 17 00:00:00 2001 From: Richard Kovacs Date: Tue, 6 Feb 2024 11:07:40 +0100 Subject: [PATCH] m --- e2e/Makefile | 6 +++--- .../minimal/02-create-linodemachine.yaml | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/e2e/Makefile b/e2e/Makefile index 11d80a110..0c4482e9f 100644 --- a/e2e/Makefile +++ b/e2e/Makefile @@ -1,7 +1,6 @@ -MAKEFLAGS = -s --no-print-directory - runTestCase: + echo $(MAKEFLAGS) @T="$$(KUBECONFIG="$$ROOT_DIR/kubeconfig" kuttl test --timeout 300 --skip-delete --namespace "$$NAMESPACE" "$$TC" 2>&1)" ;\ echo "$$T" |\ grep -v harness.go |\ @@ -21,10 +20,11 @@ renderTestCase: echo -n "$$D" getKubeUid: + echo $(MAKEFLAGS) @kubectl get -o jsonpath='{.metadata.uid}' -n "$$NAMESPACE" "$$OBJ" callLinodeApiGet: @curl -s -H "Authorization: Bearer $$LINODE_TOKEN" -H "X-Filter: $$FILTER" "https://api.linode.com/v4beta/$$URI" asd: - echo $(MAKEFLAGS) + diff --git a/e2e/linodemachine-controller/minimal/02-create-linodemachine.yaml b/e2e/linodemachine-controller/minimal/02-create-linodemachine.yaml index de40c5987..cc8f3ff0a 100644 --- a/e2e/linodemachine-controller/minimal/02-create-linodemachine.yaml +++ b/e2e/linodemachine-controller/minimal/02-create-linodemachine.yaml @@ -1,6 +1,8 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep commands: + - script: OBJ=machines/machine-sample make getKubeUid + - script: TPL="$PWD/02-create-linodemachine.tpl.yml" make renderTestCase - script: |- MACHINE_UID="$(OBJ=machines/machine-sample make getKubeUid)" \ TC="$(TPL="$PWD/02-create-linodemachine.tpl.yml" make renderTestCase)" make runTestCase