Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: remove dead jenkins code #2114

Merged
merged 1 commit into from
Jan 15, 2016
Merged

ci: remove dead jenkins code #2114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion p2p/net/swarm/dial_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
13 changes: 0 additions & 13 deletions test/jenkins/network-test.sh
View file
Open in desktop

This file was deleted.

8 changes: 1 addition & 7 deletions util/testutil/ci/ci.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand All @@ -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.
Expand Down
58 changes: 0 additions & 58 deletions util/testutil/ci/jenkins/jenkins.go
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions util/testutil/ci/jenkins/jenkins_test.go
View file
Open in desktop

This file was deleted.