Ensure Origin is promoting from fcos + CI image sources

Makefile

@@ -177,10 +177,8 @@ prow-artifacts:
 .PHONY: prow-artifacts
 
 prow-release-controller-definitions:
-	oc annotate -n origin is/4.1 "release.openshift.io/config=$$(cat ci-operator/infra/openshift/release-controller/releases/release-origin-4.1.json)" --overwrite
 	oc annotate -n ocp is/4.1-art-latest "release.openshift.io/config=$$(cat ci-operator/infra/openshift/release-controller/releases/release-ocp-4.1.json)" --overwrite
 	oc annotate -n ocp is/4.1 "release.openshift.io/config=$$(cat ci-operator/infra/openshift/release-controller/releases/release-ocp-4.1-ci.json)" --overwrite
-	oc annotate -n origin is/4.2 "release.openshift.io/config=$$(cat ci-operator/infra/openshift/release-controller/releases/release-origin-4.2.json)" --overwrite
 	oc annotate -n ocp is/4.2-art-latest "release.openshift.io/config=$$(cat ci-operator/infra/openshift/release-controller/releases/release-ocp-4.2.json)" --overwrite
 	oc annotate -n ocp is/4.2 "release.openshift.io/config=$$(cat ci-operator/infra/openshift/release-controller/releases/release-ocp-4.2-ci.json)" --overwrite
 	oc annotate -n origin is/4.3 "release.openshift.io/config=$$(cat ci-operator/infra/openshift/release-controller/releases/release-origin-4.3.json)" --overwrite

ci-operator/config/openshift/installer/openshift-installer-fcos.yaml

@@ -0,0 +1,140 @@
+base_images:
+  base:
+    name: "4.3"
+    namespace: origin
+    tag: base
+build_root:
+  image_stream_tag:
+    name: release
+    namespace: openshift
+    tag: golang-1.12
+images:
+- dockerfile_path: images/installer/Dockerfile.ci
+  from: base
+  inputs:
+    root:
+      as:
+      - build
+      paths: null
+  to: installer
+- dockerfile_path: images/installer-artifacts/Dockerfile.rhel
+  from: installer
+  inputs:
+    root:
+      as:
+      - build
+      paths: null
+  to: installer-artifacts
+- dockerfile_path: images/nested-libvirt/Dockerfile
+  from: base
+  inputs:
+    root:
+      as:
+      - build
+      paths: null
+  to: libvirt-installer
+- dockerfile_path: images/installer/Dockerfile.upi.ci
+  from: base
+  inputs:
+    root:
+      as:
+      - build
+      paths: null
+  to: upi-installer
+- dockerfile_path: images/openstack/Dockerfile.ci
+  from: base
+  inputs:
+    root:
+      as:
+      - build
+      paths: null
+  to: openstack-installer
+- dockerfile_path: images/baremetal/Dockerfile.ci
+  from: base
+  inputs:
+    root:
+      as:
+      - build
+      paths: null
+  to: baremetal-installer
+promotion:
+  name: "4.3"
+  namespace: origin
+resources:
+  '*':
+    limits:
+      memory: 4Gi
+    requests:
+      cpu: 100m
+      memory: 200Mi
+  baremetal-installer:
+    limits:
+      memory: 9Gi
+    requests:
+      cpu: "3"
+      memory: 5Gi
+  installer:
+    limits:
+      memory: 9Gi
+    requests:
+      cpu: "3"
+      memory: 5Gi
+  installer-artifacts:
+    limits:
+      memory: 9Gi
+    requests:
+      cpu: "3"
+      memory: 5Gi
+  libvirt-installer:
+    limits:
+      memory: 9Gi
+    requests:
+      cpu: "3"
+      memory: 5Gi
+  openstack-installer:
+    limits:
+      memory: 9Gi
+    requests:
+      cpu: "3"
+      memory: 5Gi
+  unit:
+    limits:
+      memory: 9Gi
+    requests:
+      cpu: "3"
+      memory: 5Gi
+  upi-installer:
+    limits:
+      memory: 9Gi
+    requests:
+      cpu: "3"
+      memory: 5Gi
+tag_specification:
+  name: "4.3"
+  namespace: origin
+tests:
+- as: unit
+  commands: go test ./pkg/...
+  container:
+    from: src
+- as: gofmt
+  commands: IS_CONTAINER=TRUE ./hack/go-fmt.sh .
+  container:
+    from: src
+- as: govet
+  commands: IS_CONTAINER=TRUE ./hack/go-vet.sh ./...
+  container:
+    from: src
+- as: golint
+  commands: IS_CONTAINER=TRUE ./hack/go-lint.sh -min_confidence 0.3 $(go list -f '{{
+    .ImportPath }}' ./...)
+  container:
+    from: src
+- as: verify-vendor
+  commands: IS_CONTAINER=TRUE ./hack/verify-vendor.sh
+  container:
+    from: src
+- as: e2e-aws
+  commands: TEST_SUITE=openshift/conformance/parallel run-tests
+  openshift_installer:
+    cluster_profile: aws

ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-fcos.yaml

@@ -0,0 +1,41 @@
+base_images:
+  base:
+    name: "4.3"
+    namespace: origin
+    tag: base
+build_root:
+  image_stream_tag:
+    name: release
+    namespace: openshift
+    tag: golang-1.12
+images:
+- dockerfile_path: Dockerfile
+  from: base
+  to: machine-config-operator
+promotion:
+  name: "4.3"
+  namespace: origin
+resources:
+  '*':
+    limits:
+      memory: 8Gi
+    requests:
+      cpu: 100m
+      memory: 200Mi
+tag_specification:
+  name: "4.3"
+  namespace: origin
+tests:
+- as: unit
+  commands: make test-unit
+  container:
+    from: src
+- as: e2e-aws
+  commands: TEST_SUITE=openshift/conformance/parallel run-tests
+  openshift_installer:
+    cluster_profile: aws
+- as: verify
+  commands: |
+    make verify
+  container:
+    from: src

ci-operator/infra/openshift/release-controller/releases/release-ocp-4.3-ci.json

@@ -9,7 +9,16 @@
     "mirror-to-origin":{
       "imageStreamRef":{
         "namespace": "origin",
-        "name": "4.3"
+        "name": "4.3",
+        "excludeTags": [
+          "machine-config-operator",
+          "installer",
+          "installer-artifacts",
+          "baremetal-installer",
+          "openstack-installer",
+          "upi-installer",
+          "libvirt-installer"
+        ]
       }
     }
   },

ci-operator/infra/openshift/release-controller/releases/release-origin-4.3.json

@@ -7,5 +7,8 @@
     "tag":{"tagRef":{"name":"4.3"}}
   },
   "verify":{
+    "aws":{
+      "prowJob":{"name":"release-openshift-origin-installer-e2e-aws-4.3"}
+    }
   }
 }

ci-operator/jobs/openshift/installer/openshift-installer-fcos-postsubmits.yaml

@@ -0,0 +1,46 @@
+postsubmits:
+  openshift/installer:
+  - agent: kubernetes
+    branches:
+    - ^fcos$
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+    name: branch-ci-openshift-installer-fcos-images
+    spec:
+      containers:
+      - args:
+        - --artifact-dir=$(ARTIFACTS)
+        - --branch=fcos
+        - --give-pr-author-access-to-namespace=true
+        - --org=openshift
+        - --promote
+        - --repo=installer
+        - --resolver-address=http://ci-operator-configresolver
+        - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
+        - --target=[images]
+        command:
+        - ci-operator
+        env:
+        - name: CONFIG_SPEC
+          valueFrom:
+            configMapKeyRef:
+              key: openshift-installer-fcos.yaml
+              name: ci-operator-misc-configs
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/sentry-dsn
+          name: sentry-dsn
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: sentry-dsn
+        secret:
+          secretName: sentry-dsn