Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@ base_images:
name: "4.3"
namespace: origin
tag: base
base-machine:
name: fedora
namespace: openshift
tag: "29"
machine-os-content-base:
name: "4.3"
namespace: origin
tag: machine-os-content
build_root:
image_stream_tag:
name: release
Expand All @@ -20,33 +12,17 @@ images:
- dockerfile_path: Dockerfile
from: base
to: machine-config-operator
- context: ci/prow/images/
from: base
inputs:
base-machine-with-rpms:
as:
- fedora:29
paths: null
machine-os-content-base:
as:
- registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
paths: null
to: machine-os-content
promotion:
additional_images:
machine-config-operator-rpms: rpms
excluded_images:
- machine-config-operator-base-with-rpms
- machine-os-content
name: "4.3"
namespace: origin
raw_steps:
- rpm_image_injection_step:
from: base
to: machine-config-operator-base-with-rpms
- rpm_image_injection_step:
from: base-machine
to: base-machine-with-rpms
resources:
'*':
limits:
Expand Down