Skip to content

Commit d0de91e

Browse files
authored
Merge pull request #5 from turkenf/set-uptest
Use chainsaw tool for uptest and set datasource
2 parents 70d4f14 + 89ba2c1 commit d0de91e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ GO_SUBDIRS += cmd internal apis
5656
# ====================================================================================
5757
# Setup Kubernetes tools
5858

59-
KIND_VERSION = v0.15.0
59+
KIND_VERSION = v0.25.0
6060
UP_VERSION = v0.28.0
6161
UP_CHANNEL = stable
6262
UPTEST_VERSION = v1.1.2
@@ -192,9 +192,9 @@ CROSSPLANE_NAMESPACE = upbound-system
192192
# - UPTEST_CLOUD_CREDENTIALS, cloud credentials for the provider being tested, e.g. export UPTEST_CLOUD_CREDENTIALS=$(cat ~/azure.json)
193193
# - UPTEST_EXAMPLE_LIST, a comma-separated list of examples to test
194194
# - UPTEST_DATASOURCE_PATH, see https://github.com/upbound/uptest#injecting-dynamic-values-and-datasource
195-
uptest: $(UPTEST) $(KUBECTL) $(KUTTL)
195+
uptest: $(UPTEST) $(KUBECTL) $(CHAINSAW) $(CROSSPLANE_CLI)
196196
@$(INFO) running automated tests
197-
@KUBECTL=$(KUBECTL) KUTTL=$(KUTTL) $(UPTEST) e2e "${UPTEST_EXAMPLE_LIST}" --data-source="${UPTEST_DATASOURCE_PATH}" --setup-script=cluster/test/setup.sh --default-conditions="Test" || $(FAIL)
197+
@KUBECTL=$(KUBECTL) CHAINSAW=$(CHAINSAW) CROSSPLANE_CLI=$(CROSSPLANE_CLI) CROSSPLANE_NAMESPACE=$(CROSSPLANE_NAMESPACE) $(UPTEST) e2e "${UPTEST_EXAMPLE_LIST}" --data-source="${UPTEST_DATASOURCE_PATH}" --setup-script=cluster/test/setup.sh --default-conditions="Test" || $(FAIL)
198198
@$(OK) running automated tests
199199

200200
local-deploy: build controlplane.up local.xpkg.deploy.provider.$(PROJECT_NAME)

examples/resources/v1alpha1/resource.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
})}
2020
location: West Europe
2121
name: registrytestupbound
22-
parentId: ${azurerm_resource_group.example.id}
22+
parentId: ${data.azurerm_resource_group.example.id}
2323
responseExportValues:
2424
- properties.loginServer
2525
- properties.policies.quarantinePolicy.status

0 commit comments

Comments
 (0)