Bump config to take advantage of canonical setup

openshift · Jun 6, 2018 · eb11aa8 · eb11aa8
1 parent f1561d0
commit eb11aa8
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 8 deletions.
diff --git a/projects/kubernetes/autoscaler.config.json b/projects/kubernetes/autoscaler.config.json
@@ -21,8 +21,10 @@
     "tag": "golang-1.9"
   },
 
-  "binary_build_commands": "mkdir -p $GOPATH/src/k8s.io; ln -s $(pwd) $GOPATH/src/k8s.io/autoscaler; make build",
-  "test_binary_build_commands": "mkdir -p $GOPATH/src/k8s.io; ln -s $(pwd) $GOPATH/src/k8s.io/autoscaler; OS_GOFLAGS='-race' make build",
+  "canonical_go_repository": "k8s.io/autoscaler",
+
+  "binary_build_commands": "make build",
+  "test_binary_build_commands": "OS_GOFLAGS='-race' make build",
   "rpm_build_commands": "make build-rpms",
 
   "images": [
@@ -37,7 +39,7 @@
     {
       "as": "unit",
       "from": "test-bin",
-      "commands": "cd $GOPATH/src/k8s.io/autoscaler/cluster-autoscaler; go test ./..."
+      "commands": "go test ./..."
     }
   ],
 

diff --git a/projects/kubernetes/cluster-capacity.config.json b/projects/kubernetes/cluster-capacity.config.json
@@ -21,8 +21,10 @@
     "tag": "golang-1.9"
   },
 
+  "canonical_go_repository": "github.com/kubernetes-incubator/cluster-capacity",
+
   "binary_build_commands": "make build",
-  "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",
+  "test_binary_build_commands": "OS_GOFLAGS='-race' make build",
   "rpm_build_commands": "make build-rpms",
 
   "images": [

diff --git a/projects/kubernetes/descheduler.config.json b/projects/kubernetes/descheduler.config.json
@@ -21,8 +21,10 @@
     "tag": "golang-1.9"
   },
 
-  "binary_build_commands": "mkdir -p $GOPATH/src/github.com/kubernetes-incubator; ln -s $(pwd) $GOPATH/src/github.com/kubernetes-incubator/descheduler; make build",
-  "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",
+  "canonical_go_repository": "github.com/kubernetes-incubator/descheduler",
+
+  "binary_build_commands": "make build",
+  "test_binary_build_commands": "OS_GOFLAGS='-race' make build",
 
   "images": [
     {
@@ -36,7 +38,7 @@
     {
       "as": "unit",
       "from": "test-bin",
-      "commands": "cd $GOPATH/src/github.com/kubernetes-incubator/descheduler; go test ./pkg/..."
+      "commands": "go test ./pkg/..."
     }
   ],
 

diff --git a/projects/kubernetes/metrics-server.config.json b/projects/kubernetes/metrics-server.config.json
@@ -21,10 +21,13 @@
     "tag": "golang-1.9"
   },
 
+  "canonical_go_repository": "github.com/kubernetes-incubator/metrics-server",
+
   "binary_build_commands": "make build",
-  "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",
+  "test_binary_build_commands": "OS_GOFLAGS='-race' make build",
   "rpm_build_commands": "make build-rpms",
 
+
   "images": [
     {
       "from": "base",

diff --git a/projects/openshift-installer/config.json b/projects/openshift-installer/config.json
@@ -0,0 +1,62 @@
+{
+  "tag_specification": {
+    "cluster": "https://api.ci.openshift.org",
+    "namespace": "openshift",
+    "name": "origin-v3.10",
+    "tag": "",
+    "tag_overrides": {}
+  },
+  "base_images": {
+    "base": {
+      "cluster": "https://api.ci.openshift.org",
+      "namespace": "openshift",
+      "name": "origin-v3.10",
+      "tag": "base"
+    }
+  },
+  "test_base_image": {
+    "cluster": "https://api.ci.openshift.org",
+    "namespace": "openshift",
+    "name": "release",
+    "tag": "golang-1.9"
+  },
+
+  "canonical_go_repository": "github.com/coreos/tectonic-installer",
+
+  "binary_build_commands": "go build ./installer/cmd/tectonic",
+
+  "images": [
+    {
+      "from": "base",
+      "to": "installer",
+      "dockerfile_path": "images/tectonic-installer/Dockerfile.ci",
+      "inputs": {
+        "bin": {"paths": [{"source_path": "/go/src/github.com/coreos/tectonic-installer/tectonic", "destination_dir": "."}]},
+        "root": {"as": ["build"]}
+      }
+    }
+  ],
+
+  "tests": [
+    {
+      "as": "unit",
+      "from": "src",
+      "commands": "go test ./installer/pkg/..."
+    }
+  ],
+
+  "resources": {
+    "*": {
+      "requests": { "cpu": "100m", "memory": "200Mi" },
+      "limits":   { "cpu": "2",    "memory": "4Gi" }
+    },
+    "bin": {
+      "requests": { "cpu": "3",    "memory": "7Gi" },
+      "limits":   { "cpu": "7",    "memory": "9Gi" }
+    },
+    "unit": {
+      "requests": { "cpu": "3",    "memory": "5Gi" },
+      "limits":   { "cpu": "7",    "memory": "9Gi" }
+    }
+  }
+}