Merge pull request #925 from subutai-io/dev

Dev
subutai-io · May 2, 2018 · 6904b60 · 6904b60
2 parents 35408b8 + 04b9589
commit 6904b60
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -190,11 +190,11 @@ try {
 			sh """
 			rm -rf ${CWD}/p2p
 			git clone https://github.com/subutai-io/p2p
-			cd ${CWD}/p2p
 			"""
 
 			if (env.BRANCH_NAME != 'master') {
 				sh """
+				cd ${CWD}/p2p
 				git checkout --track origin/${env.BRANCH_NAME} && rm -rf .git*
 				"""
 			}

diff --git a/lib/tuntap_darwin.go b/lib/tuntap_darwin.go
@@ -193,9 +193,6 @@ func (t *TAPDarwin) MarkConfigured() {
 
 // FilterInterface will return true if this interface needs to be filtered out
 func FilterInterface(infName, infIP string) bool {
-	if len(infIP) > 4 && infIP[0:3] == "172" {
-		return true
-	}
 	Log(Info, "ping -t 1 -c 1 -S %s ptest.subutai.io", infIP)
 	ping := exec.Command("ping", "-t", "1", "-c", "1", "-S", infIP, "ptest.subutai.io")
 	if ping.Run() != nil {

diff --git a/lib/tuntap_linux.go b/lib/tuntap_linux.go
@@ -286,6 +286,9 @@ func (t *TAPLinux) MarkConfigured() {
 
 // FilterInterface will return true if this interface needs to be filtered out
 func FilterInterface(infName, infIP string) bool {
+	if len(infIP) > 4 && infIP[0:3] == "172" {
+		return true
+	}
 	Log(Trace, "ping -4 -w 1 -c 1 -I %s ptest.subutai.io", infName)
 	ping := exec.Command("ping", "-4", "-w", "1", "-c", "1", "-I", infName, "ptest.subutai.io")
 	if ping.Run() != nil {