Skip to content

USHIFT-6205: Add MicroShift brew nightly RPMs into periodics scenarios#5612

Merged
openshift-merge-bot[bot] merged 15 commits intoopenshift:mainfrom
agullon:USHIFT-6205
Nov 10, 2025
Merged

USHIFT-6205: Add MicroShift brew nightly RPMs into periodics scenarios#5612
openshift-merge-bot[bot] merged 15 commits intoopenshift:mainfrom
agullon:USHIFT-6205

Conversation

@agullon
Copy link
Contributor

@agullon agullon commented Oct 14, 2025

openshift/release#70496 PR already merged was blocking this task: Nightly RPMs must be in cache to be able to build the ostree ref and bootc image

  • Modify 2 periodics bootc scenarios to target nightly brew RPMs
  • Add 2 new periodics ostree scenarios to target nightly brew RPMs.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 14, 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 Oct 14, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 14, 2025

@agullon: This pull request references USHIFT-6205 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 task to target the "4.21.0" version, but no target version was set.

Details

In response to this:

Replace periodics brew scenarios with scenarios targetting latest nightly brew version.

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
Copy link
Contributor

openshift-ci bot commented Oct 14, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 14, 2025
@agullon agullon marked this pull request as ready for review October 14, 2025 13:57
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 14, 2025
@openshift-ci openshift-ci bot requested review from jogeo and kasturinarra October 14, 2025 13:57
@agullon
Copy link
Contributor Author

agullon commented Oct 14, 2025

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

@agullon
Copy link
Contributor Author

agullon commented Oct 15, 2025

/test e2e-aws-tests-release

@agullon
Copy link
Contributor Author

agullon commented Oct 15, 2025

/retest

@agullon agullon changed the title USHIFT-6205: Add into periodics scenarios MicroShift nightly testing USHIFT-6205: Add MicroShift brew nightly RPMs into periodics scenarios Oct 15, 2025
@agullon
Copy link
Contributor Author

agullon commented Oct 15, 2025

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

@agullon
Copy link
Contributor Author

agullon commented Oct 15, 2025

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

@agullon
Copy link
Contributor Author

agullon commented Oct 15, 2025

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

@agullon
Copy link
Contributor Author

agullon commented Oct 15, 2025

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

@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 21, 2025

@agullon: This pull request references USHIFT-6205 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 task to target the "4.21.0" version, but no target version was set.

Details

In response to this:

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 Author

agullon commented Oct 22, 2025

/retest

@agullon
Copy link
Contributor Author

agullon commented Oct 24, 2025

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

@agullon
Copy link
Contributor Author

agullon commented Oct 24, 2025

/retest

@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 24, 2025

@agullon: This pull request references USHIFT-6205 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 task to target the "4.21.0" version, but no target version was set.

Details

In response to this:

openshift/release#70496 PR already merged was blocking this task: Nightly RPMs must be in cache to be able to build the ostree ref and bootc image

  • Modify 2 periodics bootc scenarios to target nightly brew RPMs
  • Add 2 new periodics ostree scenarios to target nightly brew RPMs.

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 Author

agullon commented Oct 24, 2025

/retest e2e-aws-tests-cache e2e-aws-tests-cache-arm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 24, 2025

@agullon: The /retest command does not accept any targets.
The following commands are available to trigger required jobs:

/test e2e-aws-ai-model-serving
/test e2e-aws-footprint-and-performance
/test e2e-aws-tests
/test e2e-aws-tests-arm
/test e2e-aws-tests-bootc
/test e2e-aws-tests-bootc-arm
/test e2e-aws-tests-bootc-periodic
/test e2e-aws-tests-bootc-periodic-arm
/test e2e-aws-tests-bootc-release
/test e2e-aws-tests-bootc-release-arm
/test e2e-aws-tests-bootc-upstream
/test e2e-aws-tests-bootc-upstream-arm
/test e2e-aws-tests-cache
/test e2e-aws-tests-cache-arm
/test e2e-aws-tests-periodic
/test e2e-aws-tests-periodic-arm
/test e2e-aws-tests-release
/test e2e-aws-tests-release-arm
/test ocp-full-conformance-rhel-eus
/test ocp-full-conformance-serial-rhel-eus
/test test-rpm
/test test-unit
/test verify

The following commands are available to trigger optional jobs:

/test images
/test security
/test test-rebase

Use /test all to run the following jobs that were automatically triggered:

pull-ci-openshift-microshift-main-e2e-aws-tests
pull-ci-openshift-microshift-main-e2e-aws-tests-arm
pull-ci-openshift-microshift-main-e2e-aws-tests-bootc
pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-arm
pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic
pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-periodic-arm
pull-ci-openshift-microshift-main-e2e-aws-tests-periodic
pull-ci-openshift-microshift-main-e2e-aws-tests-periodic-arm
pull-ci-openshift-microshift-main-images
pull-ci-openshift-microshift-main-security
pull-ci-openshift-microshift-main-test-unit
pull-ci-openshift-microshift-main-verify
Details

In response to this:

/retest e2e-aws-tests-cache e2e-aws-tests-cache-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.

@agullon
Copy link
Contributor Author

agullon commented Oct 24, 2025

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

@agullon
Copy link
Contributor Author

agullon commented Oct 24, 2025

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

@agullon
Copy link
Contributor Author

agullon commented Nov 10, 2025

/retest

1 similar comment
@agullon
Copy link
Contributor Author

agullon commented Nov 10, 2025

/retest

@agullon
Copy link
Contributor Author

agullon commented Nov 10, 2025

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

@agullon
Copy link
Contributor Author

agullon commented Nov 10, 2025

/retest

@agullon
Copy link
Contributor Author

agullon commented Nov 10, 2025

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 10, 2025

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

@jogeo
Copy link
Contributor

jogeo commented Nov 10, 2025

/lgtm

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

openshift-ci bot commented Nov 10, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: agullon, jogeo

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

@jogeo
Copy link
Contributor

jogeo commented Nov 10, 2025

/verified by CI

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

@jogeo: This PR has been marked as verified by CI.

Details

In response to this:

/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-merge-bot openshift-merge-bot bot merged commit cb4c351 into openshift:main Nov 10, 2025
15 checks passed
@agullon
Copy link
Contributor Author

agullon commented Nov 10, 2025

/cherrypick release-4.20

@openshift-cherrypick-robot

@agullon: #5612 failed to apply on top of branch "release-4.20":

Applying: replace periodics brew scenarios with scenarios targetting latest nightly brew version
Using index info to reconstruct a base tree...
M	test/bin/build_images.sh
M	test/bin/build_rpms.sh
M	test/bin/common_versions.sh
M	test/bin/manage_brew_rpms.sh
Falling back to patching base and 3-way merge...
Auto-merging test/bin/manage_brew_rpms.sh
Auto-merging test/bin/common_versions.sh
Auto-merging test/bin/build_rpms.sh
Auto-merging test/bin/build_images.sh
Applying: set correct var to point to brew nightly release rpms
Applying: fix grep expression
Applying: move bootc nightly brew containerfile into periodics dir
Applying: temp S3 nucket for testing
Applying: temp S3 bucket for testing
Using index info to reconstruct a base tree...
M	test/bin/manage_build_cache.sh
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: small fix
Applying: add 2 new periodics scenarios: nighlty brew for standard suites
Applying: small fix
Using index info to reconstruct a base tree...
A	test/assets/common_versions.sh.template
M	test/bin/common_versions.sh
Falling back to patching base and 3-way merge...
Auto-merging test/bin/common_versions.sh
CONFLICT (modify/delete): test/assets/common_versions.sh.template deleted in HEAD and modified in small fix. Version small fix of test/assets/common_versions.sh.template left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0009 small fix

Details

In response to this:

/cherrypick release-4.20

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.

@agullon
Copy link
Contributor Author

agullon commented Nov 20, 2025

/cherrypick release-4.20

@openshift-cherrypick-robot

@agullon: #5612 failed to apply on top of branch "release-4.20":

Applying: replace periodics brew scenarios with scenarios targetting latest nightly brew version
Using index info to reconstruct a base tree...
M	test/bin/build_images.sh
M	test/bin/build_rpms.sh
M	test/bin/common_versions.sh
M	test/bin/manage_brew_rpms.sh
Falling back to patching base and 3-way merge...
Auto-merging test/bin/manage_brew_rpms.sh
Auto-merging test/bin/common_versions.sh
Auto-merging test/bin/build_rpms.sh
Auto-merging test/bin/build_images.sh
Applying: set correct var to point to brew nightly release rpms
Applying: fix grep expression
Applying: move bootc nightly brew containerfile into periodics dir
Applying: temp S3 nucket for testing
Applying: temp S3 bucket for testing
Using index info to reconstruct a base tree...
M	test/bin/manage_build_cache.sh
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: small fix
Applying: add 2 new periodics scenarios: nighlty brew for standard suites
Applying: small fix
Using index info to reconstruct a base tree...
A	test/assets/common_versions.sh.template
M	test/bin/common_versions.sh
Falling back to patching base and 3-way merge...
Auto-merging test/bin/common_versions.sh
CONFLICT (modify/delete): test/assets/common_versions.sh.template deleted in HEAD and modified in small fix. Version small fix of test/assets/common_versions.sh.template left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0009 small fix

Details

In response to this:

/cherrypick release-4.20

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.

4 participants