diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-fcos.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-fcos.yaml index 22db920fe0b6f..0a47f1fab5b72 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-fcos.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-fcos.yaml @@ -3,6 +3,14 @@ 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: ocp + tag: machine-os-content build_root: image_stream_tag: name: release @@ -12,17 +20,33 @@ 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: @@ -57,7 +81,8 @@ tests: container: from: src - as: e2e-aws - commands: TEST_SUITE=openshift/conformance/parallel run-tests + commands: | + TEST_SUITE=openshift/conformance/parallel run-tests openshift_installer: cluster_profile: aws - as: verify diff --git a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-fcos-presubmits.yaml b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-fcos-presubmits.yaml index c2a7e05507c78..1b35c14e6f551 100644 --- a/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-fcos-presubmits.yaml +++ b/ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-fcos-presubmits.yaml @@ -87,7 +87,8 @@ presubmits: - name: JOB_NAME_SAFE value: e2e-aws - name: TEST_COMMAND - value: TEST_SUITE=openshift/conformance/parallel run-tests + value: | + TEST_SUITE=openshift/conformance/parallel run-tests image: ci-operator:latest imagePullPolicy: Always name: ""