Removed service team tests after make acceptance completes (#44)

* Removed tests after run Signed-off-by: CharlieBlain <[email protected]> * Updated makefile ignore errors and continue so the tests will always be deleted Signed-off-by: CharlieBlain <[email protected]> Co-authored-by: CharlieBlain <[email protected]>
HPE · Feb 24, 2022 · 2dc907e · 2dc907e
1 parent 5cf7527
commit 2dc907e
Show file tree

Hide file tree

Showing 49 changed files with 10 additions and 1,130 deletions.
diff --git a/GNUmakefile b/GNUmakefile
@@ -61,6 +61,7 @@ docs-generate: vendor
 .PHONY: docs-generate
 
 accframework: vendor
+	go install github.com/nomad-software/[email protected] ; \
 	vend; \
 
 	# Download acceptance tests
@@ -71,18 +72,23 @@ accframework: vendor
 		fi ; \
 		if [ -d vendor/github.com/HewlettPackard/$(prefix)$${f}$(suffix)/internal/acceptance_test ] ; then \
 		cp -r vendor/github.com/HewlettPackard/$(prefix)$${f}$(suffix)/internal/acceptance_test ./internal/acceptance/$${f} ; \
-		cp -r vendor/github.com/HewlettPackard/$(prefix)$${f}$(suffix)/acc-prod_testcases ./internal/acceptance/$${f} ; \
+		cp -r vendor/github.com/HewlettPackard/$(prefix)$${f}$(suffix)/acc-testcases ./internal/acceptance/$${f} ; \
 		fi ; \
 		rm ./internal/acceptance/$${f}/provider_test.go ; \
 		cp ./internal/acceptance/acceptance-utils/provider_test.go ./internal/acceptance/$${f} ; \
+		go mod tidy ; \
+		go mod vendor ; \
 	done
 
 .PHONY: accframework
 
 acceptance: accframework
-	export TF_ACC_TEST_PATH=$(shell pwd)/internal/acceptance/vmaas/acc-prod_testcases ; \
-	for f in $(ACC_TEST_SERVICES); do \
-		TF_ACC=true go test -v -timeout=9000s -cover ./internal/acceptance/$$f ; \
+	-for f in $(ACC_TEST_SERVICES); do \
+		TF_ACC_TEST_PATH=$(shell pwd)/internal/acceptance/vmaas/acc-testcases TF_ACC=true go test -v -timeout=9000s -cover ./internal/acceptance/$$f ; \
+		# remove service tests ; \
+		rm -rf ./internal/acceptance/$$f ; \
+		go mod tidy ; \
+		go mod vendor ; \
 	done
 
 	# remove vend files

diff --git a/go.mod b/go.mod
@@ -3,7 +3,6 @@ module github.com/HewlettPackard/terraform-provider-hpegl
 go 1.14
 
 require (
-	github.com/HewlettPackard/hpegl-vmaas-cmp-go-sdk v0.1.0-beta7
 	github.com/HewlettPackard/hpegl-vmaas-terraform-resources v0.1.7
 	github.com/ashanbrown/makezero v0.0.0-20210308000810-4155955488a0 // indirect
 	github.com/esimonov/ifshort v1.0.2 // indirect

diff --git a/go.sum b/go.sum
@@ -891,11 +891,8 @@ github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b h1:HxLVTlqcHhF
 github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM=
 github.com/tetafro/godot v1.4.4 h1:VAtLEoAMmopIzHVWVBrztjVWDeYm1OD/DKqhqXR4828=
 github.com/tetafro/godot v1.4.4/go.mod h1:FVDd4JuKliW3UgjswZfJfHq4vAx0bD/Jd5brJjGeaz4=
-github.com/tidwall/gjson v1.12.1 h1:ikuZsLdhr8Ws0IdROXUS1Gi4v9Z4pGqpX/CvJkxvfpo=
 github.com/tidwall/gjson v1.12.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94 h1:ig99OeTyDwQWhPe2iw9lwfQVF1KB3Q4fpP3X7/2VBG8=
 github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk=

diff --git a/internal/acceptance/vmaas/acc-prod_testcases/data-sources/cloud.yaml b/internal/acceptance/vmaas/acc-prod_testcases/data-sources/cloud.yaml
diff --git a/internal/acceptance/vmaas/acc-prod_testcases/data-sources/cloud_folder.yaml b/internal/acceptance/vmaas/acc-prod_testcases/data-sources/cloud_folder.yaml
diff --git a/internal/acceptance/vmaas/acc-prod_testcases/data-sources/datastore.yaml b/internal/acceptance/vmaas/acc-prod_testcases/data-sources/datastore.yaml
diff --git a/internal/acceptance/vmaas/acc-prod_testcases/data-sources/edge_cluster.yaml b/internal/acceptance/vmaas/acc-prod_testcases/data-sources/edge_cluster.yaml
diff --git a/internal/acceptance/vmaas/acc-prod_testcases/data-sources/environment.yaml b/internal/acceptance/vmaas/acc-prod_testcases/data-sources/environment.yaml
diff --git a/internal/acceptance/vmaas/acc-prod_testcases/data-sources/group.yaml b/internal/acceptance/vmaas/acc-prod_testcases/data-sources/group.yaml
diff --git a/internal/acceptance/vmaas/acc-prod_testcases/data-sources/layout.yaml b/internal/acceptance/vmaas/acc-prod_testcases/data-sources/layout.yaml
diff --git a/internal/acceptance/vmaas/acc-prod_testcases/data-sources/network.yaml b/internal/acceptance/vmaas/acc-prod_testcases/data-sources/network.yaml
diff --git a/internal/acceptance/vmaas/acc-prod_testcases/data-sources/network_domain.yaml b/internal/acceptance/vmaas/acc-prod_testcases/data-sources/network_domain.yaml
diff --git a/internal/acceptance/vmaas/acc-prod_testcases/data-sources/network_interface.yaml b/internal/acceptance/vmaas/acc-prod_testcases/data-sources/network_interface.yaml
diff --git a/internal/acceptance/vmaas/acc-prod_testcases/data-sources/network_pool.yaml b/internal/acceptance/vmaas/acc-prod_testcases/data-sources/network_pool.yaml
diff --git a/internal/acceptance/vmaas/acc-prod_testcases/data-sources/network_proxy.yaml b/internal/acceptance/vmaas/acc-prod_testcases/data-sources/network_proxy.yaml
diff --git a/internal/acceptance/vmaas/acc-prod_testcases/data-sources/network_type.yaml b/internal/acceptance/vmaas/acc-prod_testcases/data-sources/network_type.yaml
diff --git a/internal/acceptance/vmaas/acc-prod_testcases/data-sources/plan.yaml b/internal/acceptance/vmaas/acc-prod_testcases/data-sources/plan.yaml
diff --git a/internal/acceptance/vmaas/acc-prod_testcases/data-sources/power_schedule.yaml b/internal/acceptance/vmaas/acc-prod_testcases/data-sources/power_schedule.yaml
diff --git a/internal/acceptance/vmaas/acc-prod_testcases/data-sources/resource_pool.yaml b/internal/acceptance/vmaas/acc-prod_testcases/data-sources/resource_pool.yaml
diff --git a/internal/acceptance/vmaas/acc-prod_testcases/data-sources/template.yaml b/internal/acceptance/vmaas/acc-prod_testcases/data-sources/template.yaml
diff --git a/internal/acceptance/vmaas/acc-prod_testcases/resources/instance-template_err.yaml b/internal/acceptance/vmaas/acc-prod_testcases/resources/instance-template_err.yaml
diff --git a/internal/acceptance/vmaas/acc-prod_testcases/resources/instance.yaml b/internal/acceptance/vmaas/acc-prod_testcases/resources/instance.yaml
diff --git a/internal/acceptance/vmaas/acc-prod_testcases/resources/instance_clone.yaml b/internal/acceptance/vmaas/acc-prod_testcases/resources/instance_clone.yaml
diff --git a/internal/acceptance/vmaas/data_source_cloud_folder_test.go b/internal/acceptance/vmaas/data_source_cloud_folder_test.go
diff --git a/internal/acceptance/vmaas/data_source_clouds_test.go b/internal/acceptance/vmaas/data_source_clouds_test.go
diff --git a/internal/acceptance/vmaas/data_source_datastores_test.go b/internal/acceptance/vmaas/data_source_datastores_test.go
diff --git a/internal/acceptance/vmaas/data_source_edge_cluster_test.go b/internal/acceptance/vmaas/data_source_edge_cluster_test.go
diff --git a/internal/acceptance/vmaas/data_source_environments_test.go b/internal/acceptance/vmaas/data_source_environments_test.go