From 22427996a581901ddbe09b09eefc3cbb6d42626d Mon Sep 17 00:00:00 2001 From: Alper Rifat Ulucinar Date: Sat, 20 Apr 2024 23:09:45 +0300 Subject: [PATCH] Bump uptest to v0.11.1 - Temporarily add the $(UPTEST_LOCAL) make target to consume uptest from the main channel. Signed-off-by: Alper Rifat Ulucinar --- Makefile | 18 +++++++++++++++--- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index dccb5dc6a..166df58c5 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,9 @@ KIND_VERSION = v0.15.0 # dependency for up UP_VERSION = v0.28.0 UP_CHANNEL = stable -UPTEST_VERSION = v0.8.0 +UPTEST_VERSION = v0.11.1 +UPTEST_LOCAL_VERSION = v0.12.0-2.g635fa3e +UPTEST_LOCAL_CHANNEL = main KUSTOMIZE_VERSION = v5.3.0 YQ_VERSION = v4.40.5 UXP_VERSION = 1.14.6-up.1 @@ -81,6 +83,16 @@ export UP_CHANNEL := $(UP_CHANNEL) -include build/makelib/k8s_tools.mk +# uptest download and install +UPTEST_LOCAL := $(TOOLS_HOST_DIR)/uptest-$(UPTEST_LOCAL_VERSION) + +$(UPTEST_LOCAL): + @$(INFO) installing uptest $(UPTEST_LOCAL) + @mkdir -p $(TOOLS_HOST_DIR) + @curl -fsSLo $(UPTEST_LOCAL) https://s3.us-west-2.amazonaws.com/crossplane.uptest.releases/$(UPTEST_LOCAL_CHANNEL)/$(UPTEST_LOCAL_VERSION)/bin/$(SAFEHOST_PLATFORM)/uptest || $(FAIL) + @chmod +x $(UPTEST_LOCAL) + @$(OK) installing uptest $(UPTEST_LOCAL) + # ==================================================================================== # Setup Images @@ -190,9 +202,9 @@ CROSSPLANE_NAMESPACE = upbound-system # - UPTEST_EXAMPLE_LIST, a comma-separated list of examples to test # - UPTEST_CLOUD_CREDENTIALS (optional), cloud credentials for the provider being tested, e.g. export UPTEST_CLOUD_CREDENTIALS=$(cat ~/gcp-sa.json) # - UPTEST_DATASOURCE_PATH (optional), see https://github.com/upbound/uptest#injecting-dynamic-values-and-datasource -uptest: $(UPTEST) $(KUBECTL) $(KUTTL) +uptest: $(UPTEST_LOCAL) $(KUBECTL) $(KUTTL) @$(INFO) running automated tests - @KUBECTL=$(KUBECTL) KUTTL=$(KUTTL) $(UPTEST) e2e "${UPTEST_EXAMPLE_LIST}" --data-source="${UPTEST_DATASOURCE_PATH}" --setup-script=cluster/test/setup.sh --default-conditions="Test" || $(FAIL) + @KUBECTL=$(KUBECTL) KUTTL=$(KUTTL) CROSSPLANE_NAMESPACE=$(CROSSPLANE_NAMESPACE) $(UPTEST_LOCAL) e2e "${UPTEST_EXAMPLE_LIST}" --data-source="${UPTEST_DATASOURCE_PATH}" --setup-script=cluster/test/setup.sh --default-conditions="Test" || $(FAIL) @$(OK) running automated tests uptest-local: diff --git a/go.mod b/go.mod index 6c91bf9a1..6374c5081 100644 --- a/go.mod +++ b/go.mod @@ -179,4 +179,4 @@ require ( sigs.k8s.io/yaml v1.4.0 // indirect ) -replace github.com/crossplane/upjet => github.com/ulucinar/upbound-upjet v0.0.0-20240420091421-ba32b463a6f7 +replace github.com/crossplane/upjet => github.com/ulucinar/upbound-upjet v0.0.0-20240421001949-b0089fb1a6d5 diff --git a/go.sum b/go.sum index 32d829af4..08d7ccd0f 100644 --- a/go.sum +++ b/go.sum @@ -384,8 +384,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tmccombs/hcl2json v0.3.3 h1:+DLNYqpWE0CsOQiEZu+OZm5ZBImake3wtITYxQ8uLFQ= github.com/tmccombs/hcl2json v0.3.3/go.mod h1:Y2chtz2x9bAeRTvSibVRVgbLJhLJXKlUeIvjeVdnm4w= -github.com/ulucinar/upbound-upjet v0.0.0-20240420091421-ba32b463a6f7 h1:NWS0zB6yGZBd2UFiIt3/FMXQ/2QajhYva/miYUmvLBs= -github.com/ulucinar/upbound-upjet v0.0.0-20240420091421-ba32b463a6f7/go.mod h1:0bHLtnejZ9bDeyXuBb9MSOQLvKo3+aoTeUBO8N0dGSA= +github.com/ulucinar/upbound-upjet v0.0.0-20240421001949-b0089fb1a6d5 h1:01eG3WG4KKNOvYZIm0BlZJHKpUW41EVaR+2ItgDJU6U= +github.com/ulucinar/upbound-upjet v0.0.0-20240421001949-b0089fb1a6d5/go.mod h1:0bHLtnejZ9bDeyXuBb9MSOQLvKo3+aoTeUBO8N0dGSA= github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI= github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=