React to ci-operator changes to structure, add resource limits

openshift · May 28, 2018 · 0b1cdda · 0b1cdda
1 parent 7372a51
commit 0b1cdda
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 11 deletions.
diff --git a/projects/image-registry/config.json b/projects/image-registry/config.json
@@ -1,18 +1,19 @@
 {
  "tag_specification": {
+ "cluster": "https://api.ci.openshift.org",
  "namespace": "openshift",
  "name": "origin-v3.10",
  "tag": "",
  "tag_overrides": {}
  },
- "base_rpm_images": [
- {
+ "base_rpm_images": {
+ "base": {
+ "cluster": "https://api.ci.openshift.org",
  "namespace": "openshift",
  "name": "origin-v3.10",
- "tag": "base",
- "as": "base"
+ "tag": "base"
  }
- ],
+ },
  "test_base_image": {
  "namespace": "ci",
  "name": "release-with-clonerefs",

diff --git a/projects/origin/config.json b/projects/origin/config.json
@@ -1,18 +1,19 @@
 {
  "tag_specification": {
+ "cluster": "https://api.ci.openshift.org",
  "namespace": "openshift",
  "name": "origin-v3.10",
  "tag": "",
  "tag_overrides": {}
  },
- "base_rpm_images": [
- {
+ "base_rpm_images": {
+ "base": {
+ "cluster": "https://api.ci.openshift.org",
  "namespace": "openshift",
  "name": "origin-v3.10",
- "tag": "base",
- "as": "base"
+ "tag": "base"
  }
- ],
+ },
  "test_base_image": {
  "namespace": "ci",
  "name": "src-cache-origin",
@@ -52,5 +53,24 @@
  "commands": "ARTIFACT_DIR=/tmp/artifacts JUNIT_REPORT=1 hack/test-go.sh",
  "artifact_dir": "/tmp/artifacts"
  }
- ]
+ ],
+
+ "resources": {
+ "*": { 
+ "requests": { "cpu": "100m", "memory": "200Mi" }, 
+ "limits": { "cpu": "2", "memory": "4Gi" } 
+ },
+ "bin": { 
+ "requests": { "cpu": "3", "memory": "7Gi" }, 
+ "limits": { "cpu": "7", "memory": "9Gi" } 
+ },
+ "rpms": { 
+ "requests": { "cpu": "3", "memory": "4Gi" }, 
+ "limits": { "cpu": "7", "memory": "6Gi" } 
+ },
+ "unit": { 
+ "requests": { "cpu": "4", "memory": "3Gi" }, 
+ "limits": { "cpu": "7", "memory": "7Gi" } 
+ }
+ }
 }