From 0b1cdda50ac3569dbd0597cd5c6eb8c360e7b7a9 Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Mon, 28 May 2018 17:30:04 -0400
Subject: [PATCH] React to ci-operator changes to structure, add resource
 limits

---
 projects/image-registry/config.json | 11 +++++-----
 projects/origin/config.json         | 32 +++++++++++++++++++++++------
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/projects/image-registry/config.json b/projects/image-registry/config.json
index 23f0db8afdb0..da219d52d086 100644
--- 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
index c5faac1faa43..04b780b04ea4 100644
--- 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" } 
+    }
+  }
 }
\ No newline at end of file