Skip to content

NO-ISSUE: rebase-main-4.18.0-0.nightly-2024-10-30-122220_amd64-2024-10-30_arm64-2024-10-30#4124

Merged
openshift-merge-bot[bot] merged 8 commits intomainfrom
rebase-main-4.18.0-0.nightly-2024-10-30-122220_amd64-2024-10-30_arm64-2024-10-30
Oct 31, 2024
Merged

NO-ISSUE: rebase-main-4.18.0-0.nightly-2024-10-30-122220_amd64-2024-10-30_arm64-2024-10-30#4124
openshift-merge-bot[bot] merged 8 commits intomainfrom
rebase-main-4.18.0-0.nightly-2024-10-30-122220_amd64-2024-10-30_arm64-2024-10-30

Conversation

@microshift-rebase-script
Copy link
Contributor

@microshift-rebase-script microshift-rebase-script bot commented Oct 31, 2024

amd64: 4.18.0-0.nightly-2024-10-30-122220
arm64: 4.18.0-0.nightly-arm64-2024-10-30-201653
prow job: https://prow.ci.openshift.org/view/gs/origin-ci-test/logs/periodic-ci-openshift-microshift-main-rebase-on-nightlies/1851836685457821696

  • etcd embedded-component fd65559cbf04ccbaf79c8b028a866f1492c0e63a to 825fc46f2c1be39640edce95c49d3b70243e9d6b

    • a435a4ab 2024-10-28T16:23:23-04:00 Add support for cachi2 based deps Konflux is replacing RH's internal build system OSBS. OSBS supported a build-time dependency injection system called "cachito". Konflux replaces this with "cachi2" which works differently. REMOTE_SOURCES no longer need to be copied into place and there is no need to source cachito's environment information (Konflux automatically rewrites the Dockerfile to source cachi2/cachi2.env before running the original RUN commands). Additionally, cachito appears to have provided go.sum dependencies whereas cachi2 requires all build-time dependencies in go.mod. Missing dependencies are added to go.mod as // indirect in this change.
  • machine-config-operator embedded-component c499c1b28590e520514f2dbacd78111f13c81c4d to b3a562be44deb94fa4ea86e25a9d83395c3d188d

    • 3f9acedb 2024-10-25T11:51:50+02:00 OPNET-569: Do not run resolv-prepender from NM dispatcher
  • operator-framework-olm embedded-component b980e95a56dc213fa987f55db2f8fb426093e51f to 29f4d1afaf2329f5c14b538fed79078ce9b6dedf

  • oc image-amd64 ee93eb5a82af5b61c625df9d3a9b50da9740a7d4 to 62471c258d8e92d2d07c97515cc82013cc431cbe

    • 39272ca9 2024-10-23T18:22:00-04:00 OCPBUGS-43513: Show node-joiner container logs when error occurs

/label tide/merge-method-squash
/label cherry-pick-approved
/label backport-risk-assessed
/label jira/valid-bug

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 31, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 31, 2024

@microshift-rebase-script[bot]: This pull request explicitly references no jira issue.

Details

In response to this:

amd64: 4.18.0-0.nightly-2024-10-30-122220
arm64: 4.18.0-0.nightly-arm64-2024-10-30-201653
prow job: https://prow.ci.openshift.org/view/gs/origin-ci-test/logs/periodic-ci-openshift-microshift-main-rebase-on-nightlies/1851836685457821696

  • etcd embedded-component fd65559cbf04ccbaf79c8b028a866f1492c0e63a to 825fc46f2c1be39640edce95c49d3b70243e9d6b

  • a435a4ab 2024-10-28T16:23:23-04:00 Add support for cachi2 based deps Konflux is replacing RH's internal build system OSBS. OSBS supported a build-time dependency injection system called "cachito". Konflux replaces this with "cachi2" which works differently. REMOTE_SOURCES no longer need to be copied into place and there is no need to source cachito's environment information (Konflux automatically rewrites the Dockerfile to source cachi2/cachi2.env before running the original RUN commands). Additionally, cachito appears to have provided go.sum dependencies whereas cachi2 requires all build-time dependencies in go.mod. Missing dependencies are added to go.mod as // indirect in this change.

  • machine-config-operator embedded-component c499c1b28590e520514f2dbacd78111f13c81c4d to b3a562be44deb94fa4ea86e25a9d83395c3d188d

  • 3f9acedb 2024-10-25T11:51:50+02:00 OPNET-569: Do not run resolv-prepender from NM dispatcher

  • operator-framework-olm embedded-component b980e95a56dc213fa987f55db2f8fb426093e51f to 29f4d1afaf2329f5c14b538fed79078ce9b6dedf

  • 0f1b3ead 2024-10-30T00:05:48+00:00 fix: buggy nextY logic for maxOCPVersion ([release-4.14] USHIFT-3268: Increase cncf result collection timeout to 10m #3416)

  • oc image-amd64 ee93eb5a82af5b61c625df9d3a9b50da9740a7d4 to 62471c258d8e92d2d07c97515cc82013cc431cbe

  • 39272ca9 2024-10-23T18:22:00-04:00 OCPBUGS-43513: Show node-joiner container logs when error occurs

/label tide/merge-method-squash
/label cherry-pick-approved
/label backport-risk-assessed
/label jira/valid-bug

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Oct 31, 2024
@openshift-ci openshift-ci bot requested review from ggiguash and jogeo October 31, 2024 04:30
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 31, 2024

@microshift-rebase-script[bot]: all tests passed!

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

Copy link
Contributor

@pacevedom pacevedom 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 openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 31, 2024
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 31, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: microshift-rebase-script[bot], pacevedom

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 31, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit ec324ab into main Oct 31, 2024
@openshift-merge-bot openshift-merge-bot bot deleted the rebase-main-4.18.0-0.nightly-2024-10-30-122220_amd64-2024-10-30_arm64-2024-10-30 branch October 31, 2024 07:27
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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants