diff --git a/build/test.mk b/build/test.mk index 7db7d8e82c..be17f6f6cc 100644 --- a/build/test.mk +++ b/build/test.mk @@ -64,7 +64,7 @@ test-functional-all: test-functional-ucp test-functional-kubernetes test-functio test-functional-all-noncloud: test-functional-ucp-noncloud test-functional-kubernetes-noncloud test-functional-corerp-noncloud test-functional-cli-noncloud test-functional-msgrp-noncloud test-functional-daprrp-noncloud test-functional-datastoresrp-noncloud test-functional-samples-noncloud ## Runs all functional tests that do not require cloud resources # Run all functional tests that require cloud resources -test-functional-all-cloud: test-functional-ucp-cloud test-functional-corerp-cloud test-functional-datastoresrp-cloud +test-functional-all-cloud: test-functional-ucp-cloud test-functional-corerp-cloud test-functional-ucp: test-functional-ucp-noncloud test-functional-ucp-cloud ## Runs all UCP functional tests (both cloud and non-cloud) @@ -103,14 +103,11 @@ test-functional-daprrp: test-functional-daprrp-noncloud ## Runs all Dapr RP func test-functional-daprrp-noncloud: ## Runs Dapr RP functional tests that do not require cloud resources CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/daprrp/noncloud/... -timeout ${TEST_TIMEOUT} -v -parallel 3 $(GOTEST_OPTS) -test-functional-datastoresrp: test-functional-datastoresrp-noncloud test-functional-datastoresrp-cloud ## Runs all Datastores RP functional tests (non-cloud and cloud) +test-functional-datastoresrp: test-functional-datastoresrp-noncloud ## Runs all Datastores RP functional tests (non-cloud) test-functional-datastoresrp-noncloud: ## Runs Datastores RP functional tests that do not require cloud resources CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/datastoresrp/noncloud/... -timeout ${TEST_TIMEOUT} -v -parallel 3 $(GOTEST_OPTS) -test-functional-datastoresrp-cloud: ## Runs Datastores RP functional tests that require cloud resources - CGO_ENABLED=1 $(GOTEST_TOOL) ./test/functional-portable/datastoresrp/cloud/... -timeout ${TEST_TIMEOUT} -v -parallel 3 $(GOTEST_OPTS) - test-functional-samples: test-functional-samples-noncloud ## Runs all Samples functional tests test-functional-samples-noncloud: ## Runs Samples functional tests that do not require cloud resources diff --git a/test/functional-portable/datastoresrp/cloud/resources/microsoftsql_test.go b/test/functional-portable/datastoresrp/cloud/resources/microsoftsql_test.go deleted file mode 100644 index b97c373989..0000000000 --- a/test/functional-portable/datastoresrp/cloud/resources/microsoftsql_test.go +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2023 The Radius Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package resource_test - -// TODO: This test will be deleted in a followup PR