Skip to content

OCPBUGS-77895: Allow for override of agent vcpu and memory#1862

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift-metal3:masterfrom
bfournie:allow-agent-overides
Mar 12, 2026
Merged

OCPBUGS-77895: Allow for override of agent vcpu and memory#1862
openshift-merge-bot[bot] merged 1 commit intoopenshift-metal3:masterfrom
bfournie:allow-agent-overides

Conversation

@bfournie
Copy link
Contributor

@bfournie bfournie commented Mar 8, 2026

The CI conformance tests need more resources than currently configured for installations. Allow these settings to be overridden. This requires a corresponding change in openshift/release to use higher limits.

@openshift-ci openshift-ci bot requested review from andfasano and elfosardo March 8, 2026 16:25
@bfournie bfournie force-pushed the allow-agent-overides branch from 40d6034 to cd31964 Compare March 8, 2026 18:11
@bfournie
Copy link
Contributor Author

bfournie commented Mar 8, 2026

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 8, 2026
@bfournie
Copy link
Contributor Author

bfournie commented Mar 8, 2026

/retest

@bfournie bfournie force-pushed the allow-agent-overides branch from cd31964 to 0e08c59 Compare March 8, 2026 19:12
@bfournie
Copy link
Contributor Author

bfournie commented Mar 8, 2026

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 8, 2026
@bfournie bfournie force-pushed the allow-agent-overides branch 4 times, most recently from 29ce364 to 567b3d4 Compare March 8, 2026 23:53
common.sh Outdated
export ARM_WORKER_MEMORY=${ARM_WORKER_MEMORY:-${WORKER_MEMORY}}
export ARM_WORKER_DISK=${ARM_WORKER_DISK:-${WORKER_DISK}}
export ARM_WORKER_VCPU=${ARM_WORKER_VCPU:-${WORKER_VCPU}}
if [[ -z ${AGENT_E2E_TEST_SCENARIO:-} ]]; then
Copy link
Member

Choose a reason for hiding this comment

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

It doesn't look the right approach to modify the very base initial config. We've got already a section to specify agent stuff conditionally, so eventually we should insert the changes there rather than duplicating. Wondering also why we need so many resources for the conformance tests, but we can discuss it separately

@bfournie bfournie force-pushed the allow-agent-overides branch from 567b3d4 to 6d54ebc Compare March 9, 2026 20:23
@bfournie
Copy link
Contributor Author

bfournie commented Mar 9, 2026

/test e2e-agent-sno-ipv6

@zaneb
Copy link
Member

zaneb commented Mar 11, 2026

Perhaps this patch could help: 955a31f

@bfournie bfournie force-pushed the allow-agent-overides branch from 6d54ebc to a59be20 Compare March 11, 2026 18:00
@bfournie
Copy link
Contributor Author

Perhaps this patch could help: 955a31f

Yes, that's similar to my original approach in this PR. I like this approach because it allows iterative testing in openshift/release.

Updated.

Copy link
Member

@zaneb zaneb left a comment

Choose a reason for hiding this comment

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

/approve

@openshift-ci
Copy link

openshift-ci bot commented Mar 12, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: zaneb

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 Mar 12, 2026
The CI conformance tests need more resources than currently
configured for installations. Allow these settings to be
overridden. This requires a corresponding change in
openshift/release to use higher limits.
@bfournie bfournie force-pushed the allow-agent-overides branch from a59be20 to 5f02f5b Compare March 12, 2026 15:22
Copy link
Contributor

@rwsu rwsu left a comment

Choose a reason for hiding this comment

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

/lgtm


export AGENT_TEST_CASES=${AGENT_TEST_CASES:-}

export MASTER_MEMORY=${MASTER_MEMORY:-16384}
Copy link
Contributor

Choose a reason for hiding this comment

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

Would be nice to to explain that these are the fallback values of they haven't been set by the code above.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 12, 2026
@rwsu
Copy link
Contributor

rwsu commented Mar 12, 2026

/retest-required

@openshift-ci
Copy link

openshift-ci bot commented Mar 12, 2026

@bfournie: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-agent-ha-dualstack 5f02f5b link false /test e2e-agent-ha-dualstack
ci/prow/e2e-metal-ipi-ovn-dualstack 5f02f5b link false /test e2e-metal-ipi-ovn-dualstack

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.

@bfournie
Copy link
Contributor Author

/test e2e-metal-ipi-serial-ipv4-1of2

@openshift-merge-bot openshift-merge-bot bot merged commit 9a5162c into openshift-metal3:master Mar 12, 2026
16 of 18 checks passed
@bfournie bfournie deleted the allow-agent-overides branch March 13, 2026 00:36
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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants