Browse code

changed integration test build tags

Steve Kuznetsov authored on 2015/08/12 22:36:53
Showing 35 changed files
... ...
@@ -127,7 +127,7 @@ their own files so we can selectively build them.
127 127
 
128 128
 All integration tests are located under `test/integration/*`. All integration tests must set the
129 129
 `integration` build tag at the top of their source file, and also declare whether they need etcd
130
-with the `!no-etcd` build tag and whether they need Docker with the `!no-docker` build tag. For
130
+with the `etcd` build tag and whether they need Docker with the `docker` build tag. For
131 131
 special function sets please create subdirectories like `test/integration/deployimages`.
132 132
 
133 133
 Run the integration tests with:
... ...
@@ -24,7 +24,7 @@ function cleanup()
24 24
 }
25 25
 
26 26
 package="${OS_TEST_PACKAGE:-test/integration}"
27
-tags="${OS_TEST_TAGS:-integration no-docker}"
27
+tags="${OS_TEST_TAGS:-integration !docker}"
28 28
 
29 29
 export GOMAXPROCS="$(grep "processor" -c /proc/cpuinfo 2>/dev/null || sysctl -n hw.logicalcpu 2>/dev/null || 1)"
30 30
 TMPDIR=${TMPDIR:-/tmp}
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-docker,docker
1
+// +build integration,docker
2 2
 
3 3
 package router
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-docker,docker
1
+// +build integration,docker
2 2
 
3 3
 package router
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-docker,docker
1
+// +build integration,docker
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-// +build integration,!no-etcd
1
+// +build integration,etcd
2 2
 
3 3
 package integration
4 4