Merge pull request #3289 from pachyderm/1_8_fix_export

Make extract/restore specific to 1.8
pachyderm · Dec 16, 2018 · d309b7e · d309b7e
2 parents c6d3743 + bee29ac
commit d309b7e
Show file tree

Hide file tree

Showing 6 changed files with 801 additions and 139 deletions.
diff --git a/Makefile b/Makefile
@@ -429,7 +429,7 @@ pretest:
 
 local-test: docker-build launch-dev test-pfs clean-launch-dev
 
-test-misc: lint enterprise-code-checkin-test docker-build test-pfs-server test-pfs-cmds test-deploy-cmds test-libs test-vault test-auth test-enterprise test-worker
+test-misc: lint enterprise-code-checkin-test docker-build test-pfs-server test-pfs-cmds test-deploy-cmds test-libs test-vault test-auth test-enterprise test-worker test-admin
 
 # Run all the tests. Note! This is no longer the test entrypoint for travis
 test: clean-launch-dev launch-dev test-misc test-pps
@@ -508,6 +508,10 @@ test-auth:
 	go test -v ./src/server/auth/server -count 1 -timeout $(TIMEOUT)
 	go test -v ./src/server/auth/cmds -count 1 -timeout $(TIMEOUT)
 
+test-admin:
+	@# Dont cache these results as they require the pachd cluster
+	go test -v ./src/server/admin/server -count 1 -timeout $(TIMEOUT)
+
 test-enterprise:
 	@# Dont cache these results as they require the pachd cluster
 	go test -v ./src/server/enterprise/server -count 1 -timeout $(TIMEOUT)