Skip to content

USHIFT-6106: Adding optional scenarios to releases directory#5797

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
kasturinarra:add_three_more_scenarios_rhel10
Dec 17, 2025
Merged

USHIFT-6106: Adding optional scenarios to releases directory#5797
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
kasturinarra:add_three_more_scenarios_rhel10

Conversation

@kasturinarra
Copy link
Contributor

@kasturinarra kasturinarra commented Nov 24, 2025

Adding optional scenario to releases directory

@openshift-ci openshift-ci bot requested review from copejon and pmtk November 24, 2025 10:21
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 24, 2025
@kasturinarra kasturinarra changed the title Adding three more scenarios USHIFT-6106: Adding three more scenarios Nov 24, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 24, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 24, 2025

@kasturinarra: This pull request references USHIFT-6106 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

Details

In response to this:

Adding three more scenarios based on the discussion here.

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.

@agullon
Copy link
Contributor

agullon commented Nov 24, 2025

With these 3 new scenarios you are adding will have 30 scenarios in releases repository. This is around the limit of hypervisor resources, so I'd suggest removing the 2 scenarios you added for standard suites in #5695 PR in favor of the new 2 standard scenarios with the upgrade.

scenario_create_vms() {
exit_if_image_not_found "${dest_image}"

prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-brew-y2-with-optional
Copy link
Contributor

Choose a reason for hiding this comment

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

can you move outside rhel96-bootc-brew-y2-with-optional as a start_image variables

scenario_create_vms() {
exit_if_image_not_found "${dest_image}"

prepare_kickstart host1 kickstart-bootc.ks.template rhel96-bootc-brew-y2-with-optional
Copy link
Contributor

Choose a reason for hiding this comment

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

why updgrade from y2 and not from y1?

@kasturinarra
Copy link
Contributor Author

With these 3 new scenarios you are adding will have 30 scenarios in releases repository. This is around the limit of hypervisor resources, so I'd suggest removing the 2 scenarios you added for standard suites in #5695 PR in favor of the new 2 standard scenarios with the upgrade.

@agullon ah looking back i think i misunderstood... let me remove the upgrade as they are really not necessary for now.

@kasturinarra kasturinarra force-pushed the add_three_more_scenarios_rhel10 branch from 8935b34 to 564fe4c Compare November 24, 2025 10:41
Comment on lines +29 to +35
run_tests host1 \
--variable "PROMETHEUS_HOST:$(hostname)" \
--variable "PROMETHEUS_PORT:9092" \
--variable "LOKI_HOST:$(hostname)" \
--variable "LOKI_PORT:3200" \
--variable "PROM_EXPORTER_PORT:8889" \
suites/optional/
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
run_tests host1 \
--variable "PROMETHEUS_HOST:$(hostname)" \
--variable "PROMETHEUS_PORT:9092" \
--variable "LOKI_HOST:$(hostname)" \
--variable "LOKI_PORT:3200" \
--variable "PROM_EXPORTER_PORT:8889" \
suites/optional/
run_tests host1 \
--variable "PROMETHEUS_HOST:$(hostname)" \
--variable "PROMETHEUS_PORT:9093" \
--variable "LOKI_HOST:$(hostname)" \
--variable "LOKI_PORT:3201" \
--variable "PROM_EXPORTER_PORT:8889" \
suites/optional/

changing the ports to not reuse the same port (it'll cause an error trying to open same port) from https://github.com/openshift/microshift/blob/main/test/scenarios-bootc/releases/el96-lrel%40optional.sh scenario

@kasturinarra kasturinarra force-pushed the add_three_more_scenarios_rhel10 branch from 564fe4c to cf261c4 Compare November 24, 2025 11:09
@agullon
Copy link
Contributor

agullon commented Nov 24, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 24, 2025
@kasturinarra
Copy link
Contributor Author

/retest

1 similar comment
@kasturinarra
Copy link
Contributor Author

/retest

@kasturinarra
Copy link
Contributor Author

/test e2e-aws-tests-bootc-release-arm

@agullon
Copy link
Contributor

agullon commented Nov 25, 2025

@kasturinarra do you mind to change the PR title to avoid confusion? it says three scenarios, but in the final implementations there's only one

@kasturinarra kasturinarra changed the title USHIFT-6106: Adding three more scenarios USHIFT-6106: Adding optional scenarios to releases directory Nov 25, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 25, 2025

@kasturinarra: This pull request references USHIFT-6106 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

Details

In response to this:

Adding optional scenario to releases directory

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.

@agullon
Copy link
Contributor

agullon commented Nov 25, 2025

/lgtm cancel

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 25, 2025
@kasturinarra kasturinarra force-pushed the add_three_more_scenarios_rhel10 branch from ff0175d to 191e851 Compare November 26, 2025 10:42
@kasturinarra
Copy link
Contributor Author

/test e2e-aws-tests e2e-aws-tests-arm

@kasturinarra kasturinarra force-pushed the add_three_more_scenarios_rhel10 branch from 191e851 to 748db15 Compare November 26, 2025 13:19
@kasturinarra
Copy link
Contributor Author

/retest

@kasturinarra
Copy link
Contributor Author

/test e2e-aws-tests-bootc-release-arm

@kasturinarra kasturinarra force-pushed the add_three_more_scenarios_rhel10 branch 5 times, most recently from c6ddc13 to 2f13332 Compare December 11, 2025 18:11
@kasturinarra
Copy link
Contributor Author

/test e2e-aws-tests-release

@kasturinarra
Copy link
Contributor Author

/test e2e-aws-tests-bootc-release /test e2e-aws-tests-bootc-release-arm

@kasturinarra kasturinarra force-pushed the add_three_more_scenarios_rhel10 branch 4 times, most recently from 1155d2e to b43877d Compare December 16, 2025 10:42
@kasturinarra
Copy link
Contributor Author

/test e2e-aws-tests-periodic

@kasturinarra
Copy link
Contributor Author

/test e2e-aws-tests-bootc-release-arm e2e-aws-tests-bootc-release e2e-aws-tests-release e2e-aws-tests-release-arm

@kasturinarra
Copy link
Contributor Author

/test e2e-aws-tests-periodic-arm e2e-aws-tests-periodic

@kasturinarra
Copy link
Contributor Author

/test e2e-aws-tests-periodic

@kasturinarra kasturinarra force-pushed the add_three_more_scenarios_rhel10 branch from b43877d to 15ed2bf Compare December 17, 2025 10:14
@ggiguash
Copy link
Contributor

Overriding quite a few tests to make progress. All of the reported issues are handled elsewhere.
/override ci/prow/e2e-aws-tests ci/prow/e2e-aws-tests-arm ci/prow/e2e-aws-tests-bootc-release ci/prow/e2e-aws-tests-bootc-release-arm ci/prow/e2e-aws-tests-periodic ci/prow/e2e-aws-tests-periodic-arm ci/prow/e2e-aws-tests-release ci/prow/e2e-aws-tests-release-arm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 17, 2025

@ggiguash: Overrode contexts on behalf of ggiguash: ci/prow/e2e-aws-tests, ci/prow/e2e-aws-tests-arm, ci/prow/e2e-aws-tests-bootc-release, ci/prow/e2e-aws-tests-bootc-release-arm, ci/prow/e2e-aws-tests-periodic, ci/prow/e2e-aws-tests-periodic-arm, ci/prow/e2e-aws-tests-release, ci/prow/e2e-aws-tests-release-arm

Details

In response to this:

Overriding quite a few tests to make progress. All of the reported issues are handled elsewhere.
/override ci/prow/e2e-aws-tests ci/prow/e2e-aws-tests-arm ci/prow/e2e-aws-tests-bootc-release ci/prow/e2e-aws-tests-bootc-release-arm ci/prow/e2e-aws-tests-periodic ci/prow/e2e-aws-tests-periodic-arm ci/prow/e2e-aws-tests-release ci/prow/e2e-aws-tests-release-arm

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.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 17, 2025

@kasturinarra: 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.

@ggiguash
Copy link
Contributor

/lgtm
/verified by ci

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Dec 17, 2025
@openshift-ci-robot
Copy link

@ggiguash: This PR has been marked as verified by ci.

Details

In response to this:

/lgtm
/verified by ci

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 the lgtm Indicates that a PR is ready to be merged. label Dec 17, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 17, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ggiguash, kasturinarra

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:
  • OWNERS [ggiguash,kasturinarra]

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

@openshift-merge-bot openshift-merge-bot bot merged commit 3475287 into openshift:main Dec 17, 2025
18 checks passed
@kasturinarra
Copy link
Contributor Author

/cherry-pick release-4.21

@openshift-cherrypick-robot

@kasturinarra: new pull request created: #5934

Details

In response to this:

/cherry-pick release-4.21

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.

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. 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. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants