plugins: move vlan to plugins/main/

2017-05-09 22:17:30 -05:00 · 2017-05-09 22:17:30 -05:00 · 4af68521cd
commit 4af68521cd
parent 7cab2fd317
5 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -15,7 +15,7 @@ export GOPATH=${PWD}/gopath
 mkdir -p "${PWD}/bin"

 echo "Building plugins"
-PLUGINS="plugins/*"
+PLUGINS="plugins/sample plugins/main/vlan"
 for d in $PLUGINS; do
 	if [ -d "$d" ]; then
 		plugin="$(basename "$d")"
--- a/plugins/main/vlan/vlan.go
+++ b/plugins/main/vlan/vlan.go
--- a/plugins/main/vlan/vlan_suite_test.go
+++ b/plugins/main/vlan/vlan_suite_test.go
--- a/plugins/main/vlan/vlan_test.go
+++ b/plugins/main/vlan/vlan_test.go
--- a/2
+++ b/2
@ -27,7 +27,7 @@ CNI_PATH=$(pwd)/bin:${CNI_PATH}

 echo "Running tests"

-TESTABLE="plugins/sample plugins/vlan"
+TESTABLE="plugins/sample plugins/main/vlan"

 # user has not provided PKG override
 if [ -z "$PKG" ]; then