Skip to content

mco-fcos: Build os container with MCD RPM for each PR #5695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Oct 31, 2019
Merged

mco-fcos: Build os container with MCD RPM for each PR #5695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 26 additions & 1 deletion ...ator/config/openshift/machine-config-operator/openshift-machine-config-operator-fcos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@ base_images:
name: "4.3"
namespace: origin
tag: base
base-machine:
name: fedora
namespace: openshift
tag: "29"
Copy link
Copy Markdown

@DanyC97 DanyC97 Oct 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

am i missing s'thing @LorbusChris w.r.t the version ? i thought will be 31 ?

Copy link
Copy Markdown
Contributor Author

@LorbusChris LorbusChris Oct 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

29 has proven to work so far, we'll update this soon!

Copy link
Copy Markdown

@DanyC97 DanyC97 Oct 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fair point, thx for the info

Copy link
Copy Markdown
Contributor

@smarterclayton smarterclayton Oct 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can actually switch to coreos-assembler now, but haven't yet got to it.

Copy link
Copy Markdown
Contributor Author

@LorbusChris LorbusChris Oct 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm planning to port these changes to 4.2+ OCP branches. Should I wait for the switch to cosa with that?

machine-os-content-base:
name: "4.3"
namespace: ocp
tag: machine-os-content
build_root:
image_stream_tag:
name: release
Expand All @@ -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
Comment thread
LorbusChris marked this conversation as resolved.
Outdated
resources:
'*':
limits:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .../openshift/machine-config-operator/openshift-machine-config-operator-fcos-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Copy Markdown
Contributor

@sgreene570 sgreene570 Oct 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does the pipe here do?

Copy link
Copy Markdown
Contributor Author

@LorbusChris LorbusChris Oct 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's not supposed to change anything functionally, just to trigger an e2e-aws rehearsal here, see Clayton's comment above.

Copy link
Copy Markdown
Contributor

@sgreene570 sgreene570 Oct 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah ok, just wanted to make sure that's what it was.

Copy link
Copy Markdown
Contributor Author

@LorbusChris LorbusChris Oct 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(also, this is just my naive assumpion; I've seen multi-line commands written this way (with the pipe) elsewhere). It did trigger the e2e test this time, so let's see whether or not it works! =)

Copy link
Copy Markdown
Contributor

@smarterclayton smarterclayton Oct 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

| just makes it multiline.

Copy link
Copy Markdown
Contributor Author

@LorbusChris LorbusChris Oct 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will it still work with just one line?

Copy link
Copy Markdown
Contributor Author

@LorbusChris LorbusChris Oct 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(otherwise I'll pull run-tests down in a second line)

image: ci-operator:latest
imagePullPolicy: Always
name: ""
Expand Down