From 864f315d2ba6ca69a0cf86697a10759bcf682332 Mon Sep 17 00:00:00 2001
From: Christian Glombek <cglombek@redhat.com>
Date: Tue, 17 Dec 2019 09:50:43 +0100
Subject: [PATCH 1/3] Fix image replacement for builder stage in Installer

The stage in the referenced Dockerfiles is `builder`, not `build`.
---
 .../installer/openshift-installer-fcos.yaml          | 12 ++++++------
 .../installer/openshift-installer-master.yaml        | 12 ++++++------
 .../installer/openshift-installer-release-4.1.yaml   | 10 +++++-----
 .../installer/openshift-installer-release-4.2.yaml   | 12 ++++++------
 .../installer/openshift-installer-release-4.3.yaml   | 12 ++++++------
 .../installer/openshift-installer-release-4.4.yaml   | 12 ++++++------
 .../installer/openshift-installer-release-4.5.yaml   | 12 ++++++------
 7 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/ci-operator/config/openshift/installer/openshift-installer-fcos.yaml b/ci-operator/config/openshift/installer/openshift-installer-fcos.yaml
index 73002f4c68364..c183db6b7e966 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-fcos.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-fcos.yaml
@@ -14,7 +14,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: installer
 - dockerfile_path: images/installer-artifacts/Dockerfile.rhel
@@ -22,7 +22,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: installer-artifacts
 - dockerfile_path: images/nested-libvirt/Dockerfile
@@ -30,7 +30,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: libvirt-installer
 - dockerfile_path: images/installer/Dockerfile.upi.ci
@@ -38,7 +38,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
@@ -46,7 +46,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: openstack-installer
 - dockerfile_path: images/baremetal/Dockerfile.ci
@@ -54,7 +54,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: baremetal-installer
 promotion:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-master.yaml b/ci-operator/config/openshift/installer/openshift-installer-master.yaml
index 363d014be1d1a..e3116c9a8bf99 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-master.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-master.yaml
@@ -14,7 +14,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: installer
 - dockerfile_path: images/installer-artifacts/Dockerfile.rhel
@@ -22,7 +22,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: installer-artifacts
 - dockerfile_path: images/nested-libvirt/Dockerfile
@@ -30,7 +30,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: libvirt-installer
 - dockerfile_path: images/installer/Dockerfile.upi.ci
@@ -38,7 +38,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
@@ -46,7 +46,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: openstack-installer
 - dockerfile_path: images/baremetal/Dockerfile.ci
@@ -54,7 +54,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: baremetal-installer
 promotion:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.1.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.1.yaml
index cd25e8c4acb40..4e5bf064e2c76 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.1.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.1.yaml
@@ -14,7 +14,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: installer
 - dockerfile_path: images/installer-artifacts/Dockerfile.rhel
@@ -22,7 +22,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: installer-artifacts
 - dockerfile_path: images/nested-libvirt/Dockerfile
@@ -30,7 +30,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   optional: true
   to: libvirt-installer
@@ -39,7 +39,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
@@ -47,7 +47,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   optional: true
   to: openstack-installer
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.2.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.2.yaml
index 0e60b86ad8242..a53b5cbb22681 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.2.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.2.yaml
@@ -14,7 +14,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: installer
 - dockerfile_path: images/installer-artifacts/Dockerfile.rhel
@@ -22,7 +22,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: installer-artifacts
 - dockerfile_path: images/nested-libvirt/Dockerfile
@@ -30,7 +30,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: libvirt-installer
 - dockerfile_path: images/installer/Dockerfile.upi.ci
@@ -38,7 +38,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
@@ -46,7 +46,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: openstack-installer
 - dockerfile_path: images/baremetal/Dockerfile.ci
@@ -54,7 +54,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: baremetal-installer
 promotion:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.3.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.3.yaml
index c516dcb26301c..5ba58e7fcc8a1 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.3.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.3.yaml
@@ -14,7 +14,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: installer
 - dockerfile_path: images/installer-artifacts/Dockerfile.rhel
@@ -22,7 +22,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: installer-artifacts
 - dockerfile_path: images/nested-libvirt/Dockerfile
@@ -30,7 +30,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: libvirt-installer
 - dockerfile_path: images/installer/Dockerfile.upi.ci
@@ -38,7 +38,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
@@ -46,7 +46,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: openstack-installer
 - dockerfile_path: images/baremetal/Dockerfile.ci
@@ -54,7 +54,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: baremetal-installer
 promotion:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.4.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.4.yaml
index d54a73d11f7ab..41c0c0b0bac08 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.4.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.4.yaml
@@ -14,7 +14,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: installer
 - dockerfile_path: images/installer-artifacts/Dockerfile.rhel
@@ -22,7 +22,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: installer-artifacts
 - dockerfile_path: images/nested-libvirt/Dockerfile
@@ -30,7 +30,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: libvirt-installer
 - dockerfile_path: images/installer/Dockerfile.upi.ci
@@ -38,7 +38,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
@@ -46,7 +46,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: openstack-installer
 - dockerfile_path: images/baremetal/Dockerfile.ci
@@ -54,7 +54,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: baremetal-installer
 promotion:
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.5.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.5.yaml
index 6b42d92936429..14d63e84ed6fe 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.5.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.5.yaml
@@ -14,7 +14,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: installer
 - dockerfile_path: images/installer-artifacts/Dockerfile.rhel
@@ -22,7 +22,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: installer-artifacts
 - dockerfile_path: images/nested-libvirt/Dockerfile
@@ -30,7 +30,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: libvirt-installer
 - dockerfile_path: images/installer/Dockerfile.upi.ci
@@ -38,7 +38,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: upi-installer
 - dockerfile_path: images/openstack/Dockerfile.ci
@@ -46,7 +46,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: openstack-installer
 - dockerfile_path: images/baremetal/Dockerfile.ci
@@ -54,7 +54,7 @@ images:
   inputs:
     root:
       as:
-      - build
+      - builder
       paths: null
   to: baremetal-installer
 promotion:

From c8b6a1b1e487bc396689c5fb880cf5d1e0d2374e Mon Sep 17 00:00:00 2001
From: Christian Glombek <cglombek@redhat.com>
Date: Tue, 17 Dec 2019 12:42:23 +0100
Subject: [PATCH 2/3] Fix image replacement for builder stage in Installer
 presubmits

The stage in the referenced Dockerfiles is `builder`, not `build`.
---
 .../openshift-installer-master-presubmits.yaml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
index cc6208648fab8..09a3677b92853 100644
--- a/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml
@@ -313,23 +313,23 @@ presubmits:
         - name: CONFIG_SPEC
           value: |
             tag_specification:
-              name: '4.0'
+              name: '4.4'
               namespace: ocp
-            build_root:
-              image_stream_tag:
-                cluster: https://api.ci.openshift.org
-                name: release
-                namespace: openshift
-                tag: golang-1.10
             base_images:
               base:
-                name: '4.0'
+                name: '4.4'
                 namespace: ocp
                 tag: base
               machine-os-content:
                 name: machine-os-content
                 namespace: rhcos
                 tag: latest
+            build_root:
+              image_stream_tag:
+                cluster: https://api.ci.openshift.org
+                name: release
+                namespace: openshift
+                tag: golang-1.13
             canonical_go_repository: github.com/openshift/installer
             images:
             - dockerfile_path: images/installer/Dockerfile.ci
@@ -337,7 +337,7 @@ presubmits:
               inputs:
                 root:
                   as:
-                  - build
+                  - builder
               to: installer
             raw_steps:
             - output_image_tag_step:

From ec24fc50391db9d0a4a31cfebb9348dccd6ce69c Mon Sep 17 00:00:00 2001
From: Christian Glombek <cglombek@redhat.com>
Date: Tue, 17 Dec 2019 12:49:57 +0100
Subject: [PATCH 3/3] Give Installer govet test more memory

---
 .../openshift/installer/openshift-installer-fcos.yaml       | 6 ++++++
 .../openshift/installer/openshift-installer-master.yaml     | 6 ++++++
 .../installer/openshift-installer-release-4.4.yaml          | 6 ++++++
 .../installer/openshift-installer-release-4.5.yaml          | 6 ++++++
 4 files changed, 24 insertions(+)

diff --git a/ci-operator/config/openshift/installer/openshift-installer-fcos.yaml b/ci-operator/config/openshift/installer/openshift-installer-fcos.yaml
index c183db6b7e966..d3ce78db780aa 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-fcos.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-fcos.yaml
@@ -73,6 +73,12 @@ resources:
     requests:
       cpu: "3"
       memory: 5Gi
+  govet:
+    limits:
+      memory: 9Gi
+    requests:
+      cpu: "3"
+      memory: 5Gi
   installer:
     limits:
       memory: 9Gi
diff --git a/ci-operator/config/openshift/installer/openshift-installer-master.yaml b/ci-operator/config/openshift/installer/openshift-installer-master.yaml
index e3116c9a8bf99..008542677f063 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-master.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-master.yaml
@@ -73,6 +73,12 @@ resources:
     requests:
       cpu: "3"
       memory: 5Gi
+  govet:
+    limits:
+      memory: 9Gi
+    requests:
+      cpu: "3"
+      memory: 5Gi
   installer:
     limits:
       memory: 9Gi
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.4.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.4.yaml
index 41c0c0b0bac08..6e059e90596a0 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.4.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.4.yaml
@@ -74,6 +74,12 @@ resources:
     requests:
       cpu: "3"
       memory: 5Gi
+  govet:
+    limits:
+      memory: 9Gi
+    requests:
+      cpu: "3"
+      memory: 5Gi
   installer:
     limits:
       memory: 9Gi
diff --git a/ci-operator/config/openshift/installer/openshift-installer-release-4.5.yaml b/ci-operator/config/openshift/installer/openshift-installer-release-4.5.yaml
index 14d63e84ed6fe..7915c7966145e 100644
--- a/ci-operator/config/openshift/installer/openshift-installer-release-4.5.yaml
+++ b/ci-operator/config/openshift/installer/openshift-installer-release-4.5.yaml
@@ -73,6 +73,12 @@ resources:
     requests:
       cpu: "3"
       memory: 5Gi
+  govet:
+    limits:
+      memory: 9Gi
+    requests:
+      cpu: "3"
+      memory: 5Gi
   installer:
     limits:
       memory: 9Gi