Merge pull request #1161 from spanio/release-0.47

[Backport release-0.47] tests and testing changes
crossplane-contrib · Feb 16, 2024 · a66ec4a · a66ec4a
2 parents 294a33a + 257d113
commit a66ec4a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -67,7 +67,7 @@ export SUBPACKAGES := $(SUBPACKAGES)
 KIND_VERSION = v0.15.0
 UP_VERSION = v0.20.0
 UP_CHANNEL = stable
-UPTEST_VERSION = v0.8.0
+UPTEST_VERSION = v0.11.0
 
 export UP_VERSION := $(UP_VERSION)
 export UP_CHANNEL := $(UP_CHANNEL)
@@ -187,7 +187,7 @@ CROSSPLANE_NAMESPACE = upbound-system
 # - UPTEST_DATASOURCE_PATH (optional), see https://github.com/upbound/uptest#injecting-dynamic-values-and-datasource
 uptest: $(UPTEST) $(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) 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/examples/elasticache/replicationgroup.yaml b/examples/elasticache/replicationgroup.yaml
@@ -16,6 +16,7 @@ spec:
     parameterGroupName: default.redis7
     port: 6379
     preferredCacheClusterAzs:
-      - us-west-1a
-      - us-west-1b
-    region: us-west-1
+      - us-east-2a
+      - us-east-2b
+    region: us-east-2
+    engineVersion: "7.1"
diff --git a/examples/s3/object.yaml b/examples/s3/object.yaml
@@ -3,6 +3,7 @@ kind: Object
 metadata:
   annotations:
     meta.upbound.io/example-id: s3/v1beta1/object
+    uptest.upbound.io/disable-import: "true"
   labels:
     testing.upbound.io/example-name: object
   name: example-object