Skip to content

Commit e3ac5e6

Browse files
authored
[Clean] Remove tests from Operator repository (#723)
1 parent 20ec402 commit e3ac5e6

File tree

107 files changed

+1
-12704
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+1
-12704
lines changed

Makefile

Lines changed: 1 addition & 185 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ PULSAR := $(GOBUILDDIR)/bin/pulsar$(shell go env GOEXE)
3131
GOASSETSBUILDER := $(GOBUILDDIR)/bin/go-assets-builder$(shell go env GOEXE)
3232

3333
DOCKERFILE := Dockerfile
34-
DOCKERTESTFILE := Dockerfile.test
35-
DOCKERDURATIONTESTFILE := tests/duration/Dockerfile
3634

3735
HELM ?= $(shell which helm)
3836

@@ -101,12 +99,6 @@ endif
10199
ifndef OPERATORUBIIMAGE
102100
OPERATORUBIIMAGE := $(DOCKERNAMESPACE)/kube-arangodb$(IMAGESUFFIX)-ubi
103101
endif
104-
ifndef TESTIMAGE
105-
TESTIMAGE := $(DOCKERNAMESPACE)/kube-arangodb-test$(IMAGESUFFIX)
106-
endif
107-
ifndef DURATIONTESTIMAGE
108-
DURATIONTESTIMAGE := $(DOCKERNAMESPACE)/kube-arangodb-durationtest$(IMAGESUFFIX)
109-
endif
110102
ifndef ENTERPRISEIMAGE
111103
ENTERPRISEIMAGE := $(DEFAULTENTERPRISEIMAGE)
112104
endif
@@ -121,19 +113,9 @@ endif
121113

122114
BINNAME := $(PROJECT)
123115
BIN := $(BINDIR)/$(BINNAME)
124-
TESTBINNAME := $(PROJECT)_test
125-
TESTBIN := $(BINDIR)/$(TESTBINNAME)
126-
DURATIONTESTBINNAME := $(PROJECT)_duration_test
127-
DURATIONTESTBIN := $(BINDIR)/$(DURATIONTESTBINNAME)
128116
RELEASE := $(GOBUILDDIR)/bin/release
129117
GHRELEASE := $(GOBUILDDIR)/bin/github-release
130118

131-
TESTLENGTHOPTIONS := -test.short
132-
TESTTIMEOUT := 30m
133-
ifeq ($(LONG), 1)
134-
TESTLENGTHOPTIONS :=
135-
TESTTIMEOUT := 300m
136-
endif
137119
ifdef VERBOSE
138120
TESTVERBOSEOPTIONS := -v
139121
endif
@@ -143,22 +125,6 @@ SOURCES_QUERY := find $(SRCDIR) -name '*.go' -type f -not -path '$(SRCDIR)/tests
143125
SOURCES := $(shell $(SOURCES_QUERY))
144126
DASHBOARDSOURCES := $(shell find $(DASHBOARDDIR)/src -name '*.js' -not -path './test/*') $(DASHBOARDDIR)/package.json
145127

146-
ifndef ARANGOSYNCSRCDIR
147-
ARANGOSYNCSRCDIR := $(SCRIPTDIR)/arangosync
148-
endif
149-
DOCKERARANGOSYNCCTRLFILE=tests/sync/Dockerfile
150-
ifndef ARANGOSYNCTESTCTRLIMAGE
151-
ARANGOSYNCTESTCTRLIMAGE := $(DOCKERNAMESPACE)/kube-arangodb-sync-test-ctrl$(IMAGESUFFIX)
152-
endif
153-
ifndef ARANGOSYNCTESTIMAGE
154-
ARANGOSYNCTESTIMAGE := $(DOCKERNAMESPACE)/kube-arangodb-sync-test$(IMAGESUFFIX)
155-
endif
156-
ifndef ARANGOSYNCIMAGE
157-
ARANGOSYNCIMAGE := $(DOCKERNAMESPACE)/kube-arangodb-sync$(IMAGESUFFIX)
158-
endif
159-
ARANGOSYNCTESTCTRLBINNAME := $(PROJECT)_sync_test_ctrl
160-
ARANGOSYNCTESTCTRLBIN := $(BINDIR)/$(ARANGOSYNCTESTCTRLBINNAME)
161-
162128
.DEFAULT_GOAL := all
163129
.PHONY: all
164130
all: check-vars verify-generated build
@@ -268,9 +234,6 @@ dashboard/assets.go: $(DASHBOARDSOURCES) $(DASHBOARDDIR)/Dockerfile.build
268234
.PHONY: bin
269235
bin: $(BIN)
270236

271-
.PHONY: test-bin
272-
test-bin: $(TESTBIN)
273-
274237
$(BIN): $(SOURCES) dashboard/assets.go VERSION
275238
@mkdir -p $(BINDIR)
276239
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -installsuffix netgo -ldflags "-X main.projectVersion=$(VERSION) -X main.projectBuild=$(COMMIT)" -o $(BIN) $(REPOPATH)
@@ -381,78 +344,6 @@ run-unit-tests: $(SOURCES)
381344
$(REPOPATH)/pkg/util/validation \
382345
$(REPOPATH)/pkg/backup/...
383346

384-
$(TESTBIN): $(GOBUILDDIR) $(SOURCES)
385-
@mkdir -p $(BINDIR)
386-
CGO_ENABLED=0 go test -c -installsuffix netgo -ldflags "-X main.projectVersion=$(VERSION) -X main.projectBuild=$(COMMIT)" -o $(TESTBIN) $(REPOPATH)/tests
387-
388-
389-
.PHONY: docker-test
390-
docker-test: $(TESTBIN)
391-
docker build --quiet -f $(DOCKERTESTFILE) -t $(TESTIMAGE) .
392-
393-
.PHONY: run-upgrade-tests
394-
run-upgrade-tests:
395-
TESTOPTIONS="-test.run=TestUpgrade" make run-tests
396-
397-
.PHONY: prepare-run-tests
398-
prepare-run-tests:
399-
ifdef PUSHIMAGES
400-
docker push $(OPERATORIMAGE)
401-
endif
402-
ifneq ($(DEPLOYMENTNAMESPACE), default)
403-
$(ROOTDIR)/scripts/kube_delete_namespace.sh $(DEPLOYMENTNAMESPACE)
404-
kubectl create namespace $(DEPLOYMENTNAMESPACE)
405-
endif
406-
kubectl apply -f $(MANIFESTPATHCRD)
407-
kubectl apply -f $(MANIFESTPATHSTORAGE)
408-
kubectl apply -f $(MANIFESTPATHDEPLOYMENT)
409-
kubectl apply -f $(MANIFESTPATHDEPLOYMENTREPLICATION)
410-
kubectl apply -f $(MANIFESTPATHBACKUP)
411-
kubectl apply -f $(MANIFESTPATHTEST)
412-
$(ROOTDIR)/scripts/kube_create_storage.sh $(DEPLOYMENTNAMESPACE)
413-
$(ROOTDIR)/scripts/kube_create_license_key_secret.sh "$(DEPLOYMENTNAMESPACE)" '$(ENTERPRISELICENSE)'
414-
$(ROOTDIR)/scripts/kube_create_backup_remote_secret.sh "$(DEPLOYMENTNAMESPACE)" '$(TEST_REMOTE_SECRET)'
415-
416-
.PHONY: run-tests
417-
run-tests: docker-test
418-
ifdef PUSHIMAGES
419-
docker push $(OPERATORIMAGE)
420-
docker push $(TESTIMAGE)
421-
endif
422-
ifneq ($(DEPLOYMENTNAMESPACE), default)
423-
$(ROOTDIR)/scripts/kube_delete_namespace.sh $(DEPLOYMENTNAMESPACE)
424-
kubectl create namespace $(DEPLOYMENTNAMESPACE)
425-
endif
426-
kubectl apply -f $(MANIFESTPATHCRD)
427-
kubectl apply -f $(MANIFESTPATHSTORAGE)
428-
kubectl apply -f $(MANIFESTPATHDEPLOYMENT)
429-
kubectl apply -f $(MANIFESTPATHDEPLOYMENTREPLICATION)
430-
kubectl apply -f $(MANIFESTPATHBACKUP)
431-
kubectl apply -f $(MANIFESTPATHTEST)
432-
$(ROOTDIR)/scripts/kube_create_storage.sh $(DEPLOYMENTNAMESPACE)
433-
$(ROOTDIR)/scripts/kube_create_license_key_secret.sh "$(DEPLOYMENTNAMESPACE)" '$(ENTERPRISELICENSE)'
434-
$(ROOTDIR)/scripts/kube_create_backup_remote_secret.sh "$(DEPLOYMENTNAMESPACE)" '$(TEST_REMOTE_SECRET)'
435-
$(ROOTDIR)/scripts/kube_run_tests.sh $(DEPLOYMENTNAMESPACE) $(TESTIMAGE) "$(ARANGODIMAGE)" '$(ENTERPRISEIMAGE)' '$(TESTTIMEOUT)' '$(TESTLENGTHOPTIONS)' '$(TESTOPTIONS)' '$(TEST_REMOTE_REPOSITORY)'
436-
437-
$(DURATIONTESTBIN): $(SOURCES)
438-
CGO_ENABLED=0 go build -installsuffix cgo -ldflags "-X main.projectVersion=$(VERSION) -X main.projectBuild=$(COMMIT)" -o $(DURATIONTESTBINNAME) $(REPOPATH)/tests/duration
439-
440-
441-
.PHONY: docker-duration-test
442-
docker-duration-test: $(DURATIONTESTBIN)
443-
docker build --quiet -f $(DOCKERDURATIONTESTFILE) -t $(DURATIONTESTIMAGE) .
444-
ifdef PUSHIMAGES
445-
docker push $(DURATIONTESTIMAGE)
446-
endif
447-
448-
.PHONY: cleanup-tests
449-
cleanup-tests:
450-
kubectl delete ArangoDeployment -n $(DEPLOYMENTNAMESPACE) --all
451-
sleep 10
452-
ifneq ($(DEPLOYMENTNAMESPACE), default)
453-
$(ROOTDIR)/scripts/kube_delete_namespace.sh $(DEPLOYMENTNAMESPACE)
454-
endif
455-
456347
# Release building
457348

458349
.PHONY: patch-readme
@@ -470,16 +361,6 @@ patch-release: patch-readme patch-examples
470361
patch-chart:
471362
$(ROOTDIR)/scripts/patch_chart.sh "$(VERSION_MAJOR_MINOR_PATCH)" "$(OPERATORIMAGE)"
472363

473-
.PHONY: changelog
474-
changelog:
475-
docker run --rm \
476-
-e CHANGELOG_GITHUB_TOKEN=$(shell cat ~/.arangodb/github-token) \
477-
-v "$(ROOTDIR)":/usr/local/src/your-app \
478-
ferrarimarco/github-changelog-generator:1.14.3 \
479-
--user arangodb \
480-
--project kube-arangodb \
481-
--no-author
482-
483364
.PHONY: docker-push
484365
docker-push: docker
485366
ifneq ($(DOCKERNAMESPACE), arangodb)
@@ -519,71 +400,6 @@ release-minor: $(RELEASE)
519400
release-major: $(RELEASE)
520401
GOPATH=$(GOBUILDDIR) $(RELEASE) -type=major
521402

522-
## Kubernetes utilities
523-
524-
.PHONY: minikube-start
525-
minikube-start:
526-
minikube start --cpus=4 --memory=6144
527-
528-
.PHONY: delete-operator
529-
delete-operator:
530-
kubectl delete -f $(MANIFESTPATHTEST) --ignore-not-found
531-
kubectl delete -f $(MANIFESTPATHDEPLOYMENT) --ignore-not-found
532-
kubectl delete -f $(MANIFESTPATHDEPLOYMENTREPLICATION) --ignore-not-found
533-
kubectl delete -f $(MANIFESTPATHBACKUP) --ignore-not-found
534-
kubectl delete -f $(MANIFESTPATHSTORAGE) --ignore-not-found
535-
kubectl delete -f $(MANIFESTPATHCRD) --ignore-not-found
536-
537-
.PHONY: redeploy-operator
538-
redeploy-operator: delete-operator manifests
539-
kubectl apply -f $(MANIFESTPATHCRD)
540-
kubectl apply -f $(MANIFESTPATHSTORAGE)
541-
kubectl apply -f $(MANIFESTPATHDEPLOYMENT)
542-
kubectl apply -f $(MANIFESTPATHDEPLOYMENTREPLICATION)
543-
kubectl apply -f $(MANIFESTPATHBACKUP)
544-
kubectl apply -f $(MANIFESTPATHTEST)
545-
kubectl get pods
546-
547-
## ArangoSync Tests
548-
549-
$(ARANGOSYNCTESTCTRLBIN): $(GOBUILDDIR) $(SOURCES)
550-
@mkdir -p $(BINDIR)
551-
CGO_ENABLED=0 go build -installsuffix cgo -ldflags "-X main.projectVersion=$(VERSION) -X main.projectBuild=$(COMMIT)" -o $(ARANGOSYNCTESTCTRLBIN) $(REPOPATH)/tests/sync
552-
553-
.PHONY: check-sync-vars
554-
check-sync-vars:
555-
ifndef ARANGOSYNCSRCDIR
556-
@echo ARANGOSYNCSRCDIR must point to the arangosync source directory
557-
@exit 1
558-
endif
559-
ifndef ARANGODIMAGE
560-
@echo ARANGODIMAGE must point to the usable arangodb enterprise image
561-
@exit 1
562-
endif
563-
ifndef ENTERPRISELICENSE
564-
@echo For tests using ArangoSync you most likely need the license key. Please set ENTERPRISELICENSE.
565-
@exit 1
566-
endif
567-
@echo Using ArangoSync source at $(ARANGOSYNCSRCDIR)
568-
@echo Using ArangoDB image $(ARANGODIMAGE)
569-
570-
.PHONY: docker-sync
571-
docker-sync: check-sync-vars
572-
SYNCIMAGE=$(ARANGOSYNCIMAGE) TESTIMAGE=$(ARANGOSYNCTESTIMAGE) $(MAKE) -C $(ARANGOSYNCSRCDIR) docker docker-test
573-
574-
.PHONY:
575-
docker-sync-test-ctrl: $(ARANGOSYNCTESTCTRLBIN)
576-
docker build --quiet -f $(DOCKERARANGOSYNCCTRLFILE) -t $(ARANGOSYNCTESTCTRLIMAGE) .
577-
578-
.PHONY:
579-
run-sync-tests: check-vars docker-sync docker-sync-test-ctrl prepare-run-tests
580-
ifdef PUSHIMAGES
581-
docker push $(ARANGOSYNCTESTCTRLIMAGE)
582-
docker push $(ARANGOSYNCTESTIMAGE)
583-
docker push $(ARANGOSYNCIMAGE)
584-
endif
585-
$(ROOTDIR)/scripts/kube_run_sync_tests.sh $(DEPLOYMENTNAMESPACE) '$(ARANGODIMAGE)' '$(ARANGOSYNCIMAGE)' '$(ARANGOSYNCTESTIMAGE)' '$(ARANGOSYNCTESTCTRLIMAGE)' '$(TESTOPTIONS)'
586-
587403
.PHONY: tidy
588404
tidy:
589405
@go mod tidy
@@ -592,7 +408,7 @@ tidy:
592408
deps-reload: tidy init
593409

594410
.PHONY: init
595-
init: tools update-generated $(GHRELEASE) $(RELEASE) $(TESTBIN) $(BIN) vendor
411+
init: tools update-generated $(GHRELEASE) $(RELEASE) $(BIN) vendor
596412

597413
.PHONY: tools
598414
tools: update-vendor

tests/acceptance/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

tests/acceptance/activefailover.template.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

tests/acceptance/activefailover.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

tests/acceptance/cluster-local-storage.template.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

tests/acceptance/cluster-scale-1.template.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

tests/acceptance/cluster-scale-2.template.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

tests/acceptance/cluster-scale-3.template.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

tests/acceptance/cluster-scale-4.template.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

tests/acceptance/cluster-sync.template.yaml

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)