Skip to content

MCD RPM and os container builds for 4.2+ branches#5572

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
LorbusChris:mco-rpms
Nov 30, 2019
Merged

MCD RPM and os container builds for 4.2+ branches#5572
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
LorbusChris:mco-rpms

Conversation

@LorbusChris
Copy link
Copy Markdown
Contributor

@LorbusChris LorbusChris commented Oct 24, 2019

Porting #5659 #5681 #5695 to all branches from 4.2 to master

Blocked by: openshift/machine-config-operator#1226 and openshift/machine-config-operator#1249

As a follow up, we could also backport openshift/origin@cbd4377 to 4.2 in the origin repo.

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 24, 2019
Comment thread ci-operator/config/openshift/origin/openshift-origin-master.yaml Outdated
@vrutkovs
Copy link
Copy Markdown
Contributor

MCD should be built from master-fcos branch, so file should be renamed

@vrutkovs
Copy link
Copy Markdown
Contributor

See also #5557

@LorbusChris
Copy link
Copy Markdown
Contributor Author

Doesn't it make sense to also add MCD builds for OCP on Prow either way? I was under the impression we were missing those so far.
Else, happy to rebase this on top of #5557!

@LorbusChris LorbusChris changed the title Add rpm builds of machine-config-daemon WIP Add rpm builds of machine-config-daemon Oct 24, 2019
@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 24, 2019
@LorbusChris
Copy link
Copy Markdown
Contributor Author

Do I need to add the missing image ref manually or how is that done?

@smarterclayton
Copy link
Copy Markdown
Contributor

If we’re gokng to have separate branches let’s make the branch name “fcos”. Then we can stitch those in as replacements for the others

@LorbusChris
Copy link
Copy Markdown
Contributor Author

LorbusChris commented Oct 25, 2019

so I think we need #5603 as a prerequisite then

@smarterclayton
Copy link
Copy Markdown
Contributor

Oooooo.... I understand now why you're doing this. This is because oc shimmed in to origin, rather than splitting.

Hrm.... this might still be the right thing to do then. Let me look.

@LorbusChris LorbusChris changed the title WIP Add rpm builds of machine-config-daemon Add rpm builds of machine-config-daemon Oct 29, 2019
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 29, 2019
@LorbusChris
Copy link
Copy Markdown
Contributor Author

let's get this working on the fcos branch first (#5659)
/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 29, 2019
@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 6, 2019
@LorbusChris LorbusChris changed the title Add rpm builds of machine-config-daemon [WIP]MCD RPM and os container builds for 4.2+ branchesAdd rpm builds of machine-config-daemon Nov 6, 2019
@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 6, 2019
@LorbusChris LorbusChris changed the title [Blocked]MCD RPM and os container builds for 4.2+ branches MCD RPM and os container builds for 4.2+ branches Nov 21, 2019
@LorbusChris
Copy link
Copy Markdown
Contributor Author

/retest

@LorbusChris LorbusChris force-pushed the mco-rpms branch 2 times, most recently from 045bf60 to b36f703 Compare November 25, 2019 10:26
@LorbusChris
Copy link
Copy Markdown
Contributor Author

/retest

@LorbusChris
Copy link
Copy Markdown
Contributor Author

/retest

1 similar comment
@LorbusChris
Copy link
Copy Markdown
Contributor Author

/retest

@LorbusChris
Copy link
Copy Markdown
Contributor Author

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 26, 2019
@LorbusChris
Copy link
Copy Markdown
Contributor Author

/retest

1 similar comment
@LorbusChris
Copy link
Copy Markdown
Contributor Author

/retest

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@LorbusChris: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/rehearse/openshift/origin/master/unit cfb4e44b153c81437a7163a5cc7dcd3761833262 link /test pj-rehearse
ci/rehearse/openshift/origin/master/verify cfb4e44b153c81437a7163a5cc7dcd3761833262 link /test pj-rehearse
ci/rehearse/openshift/origin/master/e2e-gcp-upgrade cfb4e44b153c81437a7163a5cc7dcd3761833262 link /test pj-rehearse
ci/rehearse/openshift/origin/master/images cfb4e44b153c81437a7163a5cc7dcd3761833262 link /test pj-rehearse
ci/rehearse/openshift/origin/master/images-artifacts cfb4e44b153c81437a7163a5cc7dcd3761833262 link /test pj-rehearse
ci/rehearse/openshift/machine-config-operator/master/e2e-gcp-upgrade 7a3ebbf link /test pj-rehearse
ci/rehearse/openshift/machine-config-operator/release-4.4/e2e-gcp-upgrade 7a3ebbf link /test pj-rehearse
ci/rehearse/openshift/machine-config-operator/release-4.2/e2e-gcp-upgrade 7a3ebbf link /test pj-rehearse
ci/rehearse/openshift/machine-config-operator/release-4.3/e2e-gcp-upgrade 7a3ebbf link /test pj-rehearse
ci/prow/pj-rehearse 7a3ebbf link /test pj-rehearse

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

Copy link
Copy Markdown
Contributor

@vrutkovs vrutkovs left a comment

Choose a reason for hiding this comment

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

LGTM

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 30, 2019
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: LorbusChris, vrutkovs

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit ecda488 into openshift:master Nov 30, 2019
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@LorbusChris: Updated the following 13 configmaps:

  • ci-operator-master-configs configmap in namespace ci at cluster ci/api-build01-ci-devcluster-openshift-com:6443 using the following files:
    • key openshift-machine-config-operator-master.yaml using file ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml
  • ci-operator-master-configs configmap in namespace ci at cluster default using the following files:
    • key openshift-machine-config-operator-master.yaml using file ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml
  • ci-operator-4.2-configs configmap in namespace ci at cluster default using the following files:
    • key openshift-machine-config-operator-release-4.2.yaml using file ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2.yaml
  • ci-operator-4.2-configs configmap in namespace ci-stg at cluster default using the following files:
    • key openshift-machine-config-operator-release-4.2.yaml using file ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2.yaml
  • ci-operator-4.3-configs configmap in namespace ci-stg at cluster default using the following files:
    • key openshift-machine-config-operator-release-4.3.yaml using file ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3.yaml
  • job-config-4.3 configmap in namespace ci at cluster default using the following files:
    • key openshift-machine-config-operator-release-4.3-postsubmits.yaml using file ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3-postsubmits.yaml
    • key openshift-machine-config-operator-release-4.3-presubmits.yaml using file ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3-presubmits.yaml
  • ci-operator-master-configs configmap in namespace ci-stg at cluster default using the following files:
    • key openshift-machine-config-operator-master.yaml using file ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml
  • ci-operator-4.3-configs configmap in namespace ci at cluster default using the following files:
    • key openshift-machine-config-operator-release-4.3.yaml using file ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3.yaml
  • ci-operator-4.4-configs configmap in namespace ci at cluster default using the following files:
    • key openshift-machine-config-operator-release-4.4.yaml using file ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.4.yaml
  • ci-operator-4.4-configs configmap in namespace ci-stg at cluster default using the following files:
    • key openshift-machine-config-operator-release-4.4.yaml using file ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-release-4.4.yaml
  • job-config-master configmap in namespace ci at cluster default using the following files:
    • key openshift-machine-config-operator-master-postsubmits.yaml using file ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-postsubmits.yaml
    • key openshift-machine-config-operator-master-presubmits.yaml using file ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml
  • job-config-4.2 configmap in namespace ci at cluster default using the following files:
    • key openshift-machine-config-operator-release-4.2-postsubmits.yaml using file ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2-postsubmits.yaml
    • key openshift-machine-config-operator-release-4.2-presubmits.yaml using file ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2-presubmits.yaml
  • job-config-4.4 configmap in namespace ci at cluster default using the following files:
    • key openshift-machine-config-operator-release-4.4-postsubmits.yaml using file ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.4-postsubmits.yaml
    • key openshift-machine-config-operator-release-4.4-presubmits.yaml using file ci-operator/jobs/openshift/machine-config-operator/openshift-machine-config-operator-release-4.4-presubmits.yaml
Details

In response to this:

Porting #5659 #5681 #5695 to all branches from 4.2 to master

Blocked by: openshift/machine-config-operator#1226 and openshift/machine-config-operator#1249

As a follow up, we could also backport openshift/origin@cbd4377 to 4.2 in the origin repo.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@smarterclayton
Copy link
Copy Markdown
Contributor

Reverting, looks like machine-config-operator is being used as machine-os-content (likely a cut and paste error).

@LorbusChris
Copy link
Copy Markdown
Contributor Author

@smarterclayton can you specify what exactly went wrong here?

@kikisdeliveryservice
Copy link
Copy Markdown
Contributor

Why was this merged without having anyone from the MCO team look at it? @LorbusChris

@runcom
Copy link
Copy Markdown
Member

runcom commented Dec 4, 2019

Besides why this was merged w/o any of the MCO members looking at it, we'd need a better process for the fcos branch and better code ownership (using tide?) to avoid this happening in the future.
It's unlikely that we would have been fully able to catch this even if any of us reviewed this ;) surely another pair of eyes but we can't rule out that I could have merged this as well or anyone. This can happen and has happened.
Also, despite many of the MCO team being in the OWNERS file I don't see a direct ping or assignment so we might want to start there.

@darkmuggle
Copy link
Copy Markdown

Thank you @runcom for the update. The failing is not the PR itself -- the point of a PR is to have a process to catch the problems before they land. In this case, the merge happened because:

  • a human said "LGTM"
  • a bot performed the merge

So even if an MCO member had looked at it, the merge could have happened anyway. The PR was not the problem, it was tooling around it.

The relevant question that needs to be answered now is who is in a position to make those changes?

@kikisdeliveryservice
Copy link
Copy Markdown
Contributor

As a point of overall teamwork, in the MCO repo (for example) we do not merge things directly affecting other groups without having them give the LGTM. This isn't only to get the substantive review but to give visibility to the affected parties. In this case that visibility would have enabled us to fix this in day 1, as opposed to taking us 2 days to find the root cause as we were completely unaware of this PR.

Agree that having the bot ping MCO would be ideal and that this FCOS branch ownership needs better resolution. But that said, we can and should ensure that when the bot fails to ping appropriately, we resolve that manually. This is about ensuring open communication and visibility for the health of the project.

@runcom
Copy link
Copy Markdown
Member

runcom commented Dec 5, 2019

But that said, we can and should ensure that when the bot fails to ping appropriately, we resolve that manually. This is about ensuring open communication and visibility for the health of the project.

@kikisdeliveryservice would you create and start a doc that highlights what you would see here to prevent such scenario? I don't have anything right now but you seem to so I think it would be beneficial to start on that and avoid falling into this again

@kikisdeliveryservice
Copy link
Copy Markdown
Contributor

But that said, we can and should ensure that when the bot fails to ping appropriately, we resolve that manually. This is about ensuring open communication and visibility for the health of the project.

@kikisdeliveryservice would you create and start a doc that highlights what you would see here to prevent such scenario? I don't have anything right now but you seem to so I think it would be beneficial to start on that and avoid falling into this again

Happy to do so @runcom 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants