Merge pull request #2114 from ipfs/remove-jenkins

ci: remove dead jenkins code
ipfs · Jan 15, 2016 · f89a915 · f89a915
2 parents b182e53 + 711b95e
commit f89a915
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 95 deletions.
diff --git a/p2p/net/swarm/dial_test.go b/p2p/net/swarm/dial_test.go
@@ -151,7 +151,7 @@ func TestDialWait(t *testing.T) {
 func TestDialBackoff(t *testing.T) {
 	// t.Skip("skipping for another test")
 	if ci.IsRunning() {
-		t.Skip("travis and jenkins will never have fun with this test")
+		t.Skip("travis will never have fun with this test")
 	}
 
 	t.Parallel()

diff --git a/test/jenkins/network-test.sh b/test/jenkins/network-test.sh
diff --git a/util/testutil/ci/ci.go b/util/testutil/ci/ci.go
@@ -6,7 +6,6 @@ package ci
 import (
 	"os"
 
-	jenkins "github.com/ipfs/go-ipfs/util/testutil/ci/jenkins"
 	travis "github.com/ipfs/go-ipfs/util/testutil/ci/travis"
 )
 
@@ -26,14 +25,9 @@ const (
 //
 //  CI=true
 //  travis.IsRunning()
-//  jenkins.IsRunning()
 //
 func IsRunning() bool {
-	if os.Getenv(string(VarCI)) == "true" {
-		return true
-	}
-
-	return travis.IsRunning() || jenkins.IsRunning()
+	return os.Getenv(string(VarCI)) == "true" || travis.IsRunning()
 }
 
 // Env returns the value of a CI env variable.

diff --git a/util/testutil/ci/jenkins/jenkins.go b/util/testutil/ci/jenkins/jenkins.go
diff --git a/util/testutil/ci/jenkins/jenkins_test.go b/util/testutil/ci/jenkins/jenkins_test.go