ci: remove dead jenkins code
License: MIT Signed-off-by: Lars Gierth <larsg@systemli.org>
Lars Gierth committed
Dec 22, 2015 at 01:03 UTC
711b95ed3ba04372e9e8ec2cc6dc898a6362dc13
5 files changed
+2
-95
p2p/net/swarm/dial_test.go
+1
-1
@@ -151,7 +151,7 @@ func TestDialWait(t *testing.T) {
151
func TestDialBackoff(t *testing.T) {
152
// t.Skip("skipping for another test")
153
if ci.IsRunning() {
154
- t.Skip("travis and jenkins will never have fun with this test")
154
+ t.Skip("travis will never have fun with this test")
155
}
156
157
t.Parallel()
test/jenkins/network-test.sh
deleted
-13
@@ -1,13 +0,0 @@
1
-#!/bin/sh
2
-
3
-export GOPATH=$WORKSPACE
4
-
5
-PWD=`pwd`
6
-cd ../3nodetest
7
-make clean
8
-make test
9
-make save_logs
10
-
11
-docker cp 3nodetest_server_1:/root/.ipfs/logs/events.log $(PWD)/build/server-events.log
12
-docker cp 3nodetest_bootstrap_1:/root/.ipfs/logs/events.log $(PWD)/build/bootstrap-events.log
13
-docker cp 3nodetest_client_1:/root/.ipfs/logs/events.log $(PWD)/build/client-events.log
util/testutil/ci/ci.go
+1
-7
@@ -6,7 +6,6 @@ package ci
6
import (
7
"os"
8
9
- jenkins "github.com/ipfs/go-ipfs/util/testutil/ci/jenkins"
9
travis "github.com/ipfs/go-ipfs/util/testutil/ci/travis"
10
)
11
@@ -26,14 +25,9 @@ const (
25
//
26
// CI=true
27
// travis.IsRunning()
29
-// jenkins.IsRunning()
28
//
29
func IsRunning() bool {
32
- if os.Getenv(string(VarCI)) == "true" {
33
- return true
34
- }
35
-
36
- return travis.IsRunning() || jenkins.IsRunning()
30
+ return os.Getenv(string(VarCI)) == "true" || travis.IsRunning()
31
}
32
33
// Env returns the value of a CI env variable.
util/testutil/ci/jenkins/jenkins.go
deleted
-58
@@ -1,58 +0,0 @@
1
-// Package jenkins implements some helper functions to use during
2
-// tests. Many times certain facilities are not available, or tests
3
-// must run differently.
4
-package jenkins
5
-
6
-import (
7
- "os"
8
- "strings"
9
-)
10
-
11
-// EnvVar is a type to use travis-only env var names with
12
-// the type system.
13
-type EnvVar string
14
-
15
-// Environment variables that Jenkins uses.
16
-const (
17
- VarBuildNumber EnvVar = "BUILD_NUMBER"
18
- VarBuildId EnvVar = "BUILD_ID"
19
- VarBuildUrl EnvVar = "BUILD_URL"
20
- VarNodeName EnvVar = "NODE_NAME"
21
- VarJobName EnvVar = "JOB_NAME"
22
- VarBuildTag EnvVar = "BUILD_TAG"
23
- VarJenkinsUrl EnvVar = "JENKINS_URL"
24
- VarExecutorNumber EnvVar = "EXECUTOR_NUMBER"
25
- VarJavaHome EnvVar = "JAVA_HOME"
26
- VarWorkspace EnvVar = "WORKSPACE"
27
- VarSvnRevision EnvVar = "SVN_REVISION"
28
- VarCvsBranch EnvVar = "CVS_BRANCH"
29
- VarGitCommit EnvVar = "GIT_COMMIT"
30
- VarGitUrl EnvVar = "GIT_URL"
31
- VarGitBranch EnvVar = "GIT_BRANCH"
32
-)
33
-
34
-// IsRunning attempts to determine whether this process is
35
-// running on Jenkins CI. This is done by checking any of the
36
-// following:
37
-//
38
-// JENKINS_URL is set
39
-// BuildTag has prefix "jenkins-"
40
-//
41
-func IsRunning() bool {
42
- return len(Env(VarJenkinsUrl)) > 0 || strings.HasPrefix(Env(VarBuildTag), "jenkins-")
43
-}
44
-
45
-// Env returns the value of a travis env variable.
46
-func Env(v EnvVar) string {
47
- return os.Getenv(string(v))
48
-}
49
-
50
-// JobName returns the jenkins JOB_NAME of this build.
51
-func JobName() string {
52
- return Env(VarJobName)
53
-}
54
-
55
-// BuildTag returns the jenkins BUILD_TAG.
56
-func BuildTag() string {
57
- return Env(VarBuildTag)
58
-}
util/testutil/ci/jenkins/jenkins_test.go
deleted
-16
@@ -1,16 +0,0 @@
1
-package jenkins
2
-
3
-import (
4
- "os"
5
- "strings"
6
- "testing"
7
-)
8
-
9
-func TestIsRunning(t *testing.T) {
10
- hasPrefix := strings.HasPrefix(os.Getenv("BUILD_TAG"), "jenkins-")
11
- tr := len(os.Getenv("JENKINS_URL")) > 0 || hasPrefix
12
-
13
- if tr != IsRunning() {
14
- t.Error("IsRunning() does not match TRAVIS && CI env var check")
15
- }
16
-}