Skip to content

Commit eb11aa8

Browse files
Bump config to take advantage of canonical setup
1 parent f1561d0 commit eb11aa8

File tree

5 files changed

+79
-8
lines changed

5 files changed

+79
-8
lines changed

projects/kubernetes/autoscaler.config.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121
"tag": "golang-1.9"
2222
},
2323

24-
"binary_build_commands": "mkdir -p $GOPATH/src/k8s.io; ln -s $(pwd) $GOPATH/src/k8s.io/autoscaler; make build",
25-
"test_binary_build_commands": "mkdir -p $GOPATH/src/k8s.io; ln -s $(pwd) $GOPATH/src/k8s.io/autoscaler; OS_GOFLAGS='-race' make build",
24+
"canonical_go_repository": "k8s.io/autoscaler",
25+
26+
"binary_build_commands": "make build",
27+
"test_binary_build_commands": "OS_GOFLAGS='-race' make build",
2628
"rpm_build_commands": "make build-rpms",
2729

2830
"images": [
@@ -37,7 +39,7 @@
3739
{
3840
"as": "unit",
3941
"from": "test-bin",
40-
"commands": "cd $GOPATH/src/k8s.io/autoscaler/cluster-autoscaler; go test ./..."
42+
"commands": "go test ./..."
4143
}
4244
],
4345

projects/kubernetes/cluster-capacity.config.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121
"tag": "golang-1.9"
2222
},
2323

24+
"canonical_go_repository": "github.com/kubernetes-incubator/cluster-capacity",
25+
2426
"binary_build_commands": "make build",
25-
"test_binary_build_commands": "mkdir -p $GOPATH/src/github.com/kubernetes-incubator; ln -s $(pwd) $GOPATH/src/github.com/kubernetes-incubator/cluster-capacity; OS_GOFLAGS='-race' make build",
27+
"test_binary_build_commands": "OS_GOFLAGS='-race' make build",
2628
"rpm_build_commands": "make build-rpms",
2729

2830
"images": [

projects/kubernetes/descheduler.config.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121
"tag": "golang-1.9"
2222
},
2323

24-
"binary_build_commands": "mkdir -p $GOPATH/src/github.com/kubernetes-incubator; ln -s $(pwd) $GOPATH/src/github.com/kubernetes-incubator/descheduler; make build",
25-
"test_binary_build_commands": "mkdir -p $GOPATH/src/github.com/kubernetes-incubator; ln -s $(pwd) $GOPATH/src/github.com/kubernetes-incubator/descheduler; OS_GOFLAGS='-race' make build",
24+
"canonical_go_repository": "github.com/kubernetes-incubator/descheduler",
25+
26+
"binary_build_commands": "make build",
27+
"test_binary_build_commands": "OS_GOFLAGS='-race' make build",
2628

2729
"images": [
2830
{
@@ -36,7 +38,7 @@
3638
{
3739
"as": "unit",
3840
"from": "test-bin",
39-
"commands": "cd $GOPATH/src/github.com/kubernetes-incubator/descheduler; go test ./pkg/..."
41+
"commands": "go test ./pkg/..."
4042
}
4143
],
4244

projects/kubernetes/metrics-server.config.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,13 @@
2121
"tag": "golang-1.9"
2222
},
2323

24+
"canonical_go_repository": "github.com/kubernetes-incubator/metrics-server",
25+
2426
"binary_build_commands": "make build",
25-
"test_binary_build_commands": "mkdir -p $GOPATH/src/github.com/kubernetes-incubator; ln -s $(pwd) $GOPATH/src/github.com/kubernetes-incubator/metrics-server; OS_GOFLAGS='-race' make build",
27+
"test_binary_build_commands": "OS_GOFLAGS='-race' make build",
2628
"rpm_build_commands": "make build-rpms",
2729

30+
2831
"images": [
2932
{
3033
"from": "base",
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
{
2+
"tag_specification": {
3+
"cluster": "https://api.ci.openshift.org",
4+
"namespace": "openshift",
5+
"name": "origin-v3.10",
6+
"tag": "",
7+
"tag_overrides": {}
8+
},
9+
"base_images": {
10+
"base": {
11+
"cluster": "https://api.ci.openshift.org",
12+
"namespace": "openshift",
13+
"name": "origin-v3.10",
14+
"tag": "base"
15+
}
16+
},
17+
"test_base_image": {
18+
"cluster": "https://api.ci.openshift.org",
19+
"namespace": "openshift",
20+
"name": "release",
21+
"tag": "golang-1.9"
22+
},
23+
24+
"canonical_go_repository": "github.com/coreos/tectonic-installer",
25+
26+
"binary_build_commands": "go build ./installer/cmd/tectonic",
27+
28+
"images": [
29+
{
30+
"from": "base",
31+
"to": "installer",
32+
"dockerfile_path": "images/tectonic-installer/Dockerfile.ci",
33+
"inputs": {
34+
"bin": {"paths": [{"source_path": "/go/src/github.com/coreos/tectonic-installer/tectonic", "destination_dir": "."}]},
35+
"root": {"as": ["build"]}
36+
}
37+
}
38+
],
39+
40+
"tests": [
41+
{
42+
"as": "unit",
43+
"from": "src",
44+
"commands": "go test ./installer/pkg/..."
45+
}
46+
],
47+
48+
"resources": {
49+
"*": {
50+
"requests": { "cpu": "100m", "memory": "200Mi" },
51+
"limits": { "cpu": "2", "memory": "4Gi" }
52+
},
53+
"bin": {
54+
"requests": { "cpu": "3", "memory": "7Gi" },
55+
"limits": { "cpu": "7", "memory": "9Gi" }
56+
},
57+
"unit": {
58+
"requests": { "cpu": "3", "memory": "5Gi" },
59+
"limits": { "cpu": "7", "memory": "9Gi" }
60+
}
61+
}
62+
}

0 commit comments

Comments
 (0)