Skip to content

USHIFT-6072: Add releases scenario for ISO and RPM deployment methods#5385

Merged
openshift-merge-bot[bot] merged 27 commits intoopenshift:mainfrom
agullon:USHIFT-6072
Oct 3, 2025
Merged

USHIFT-6072: Add releases scenario for ISO and RPM deployment methods#5385
openshift-merge-bot[bot] merged 27 commits intoopenshift:mainfrom
agullon:USHIFT-6072

Conversation

@agullon
Copy link
Contributor

@agullon agullon commented Sep 1, 2025

  • standard1 and standard2 bootc scenarios create the VM from iso file pointing to latest released MicroShift version
    • add new image-bootc files to create iso files from latest released MicroShift RPMs
      • add them into a new layer1/group3 directory
  • standard1 and standard2 rpm-ostree scenarios install MicroShift using dnf install commands
    • need to split suites/rpm RF test into separate tests to support install and not remove microshift

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

openshift-ci-robot commented Sep 1, 2025

@agullon: This pull request references USHIFT-6072 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.20.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.

@openshift-ci openshift-ci bot requested review from copejon and pacevedom September 1, 2025 11:35
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 1, 2025
@agullon
Copy link
Contributor Author

agullon commented Sep 1, 2025

/test e2e-aws-tests-cache-nightly

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 1, 2025

@agullon: The specified target(s) for /test were not found.
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-arm-bootc-release
/test e2e-aws-tests-arm-release
/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-cache
/test e2e-aws-tests-cache-arm
/test e2e-aws-tests-periodic
/test e2e-aws-tests-periodic-arm
/test e2e-aws-tests-release
/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-arm-bootc-release
pull-ci-openshift-microshift-main-e2e-aws-tests-arm-release
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-bootc-release
pull-ci-openshift-microshift-main-e2e-aws-tests-periodic
pull-ci-openshift-microshift-main-e2e-aws-tests-periodic-arm
pull-ci-openshift-microshift-main-e2e-aws-tests-release
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:

/test e2e-aws-tests-cache-nightly

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 Sep 1, 2025

/test e2e-aws-tests-cache

@agullon
Copy link
Contributor Author

agullon commented Sep 1, 2025

/test e2e-aws-tests-cache-arm

@agullon
Copy link
Contributor Author

agullon commented Sep 1, 2025

/retest-required

1 similar comment
@agullon
Copy link
Contributor Author

agullon commented Sep 2, 2025

/retest-required

@agullon
Copy link
Contributor Author

agullon commented Sep 2, 2025

/retest-required

@agullon
Copy link
Contributor Author

agullon commented Sep 2, 2025

/test e2e-aws-tests-cache-arm

@agullon
Copy link
Contributor Author

agullon commented Sep 2, 2025

/test e2e-aws-tests-cache

@agullon
Copy link
Contributor Author

agullon commented Sep 2, 2025

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

@agullon
Copy link
Contributor Author

agullon commented Sep 3, 2025

/test e2e-aws-tests-cache

source "${SCRIPTDIR}/common.sh"

AWS_BUCKET_NAME="${AWS_BUCKET_NAME:-microshift-build-cache}"
AWS_BUCKET_NAME="microshift-ushift-6072-cache-us-west-2"
Copy link
Contributor Author

@agullon agullon Sep 3, 2025

Choose a reason for hiding this comment

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

this line change will be removed before merging this PR, add it to speed up this PR testing changes

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 3, 2025

@agullon: This pull request references USHIFT-6072 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:

  • standard1 and standard2 bootc scenarios create the VM from iso file pointing to latest released MicroShift version
    • add new image-bootc files to create iso files from latest released MicroShift RPMs
      • add them into a new layer1/group3 directory
  • standard1 and standard2 rpm-ostree scenarios install MicroShift using dnf install commands
    • need to split suites/rpm RF test into separate tests to support install and not remove microshift

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 3, 2025

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

@agullon
Copy link
Contributor Author

agullon commented Oct 3, 2025

/retest

@agullon
Copy link
Contributor Author

agullon commented Oct 3, 2025

/retest

@agullon
Copy link
Contributor Author

agullon commented Oct 3, 2025

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

@agullon
Copy link
Contributor Author

agullon commented Oct 3, 2025

/retest

@@ -0,0 +1 @@
registry.redhat.io/rhel9-eus/rhel-9.4-bootc:9.4 No newline at end of file
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need this one? I dont see where its used.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

no, remove it in 6b89620 commit
I also delete it manually from S3 cache

# Checks only config files from RPM packages excluding modification time check
Command Should Work rpm -qa microshift\* | xargs -I {} bash -c 'echo {}; sudo rpm -V --configfiles --nomtime {}'

Pull Secret Should Be Installed
Copy link
Contributor

Choose a reason for hiding this comment

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

Isnt this implied in a MicroShift start and wait? If there is no pull secret no images are pulled (unless embedded, but this is not one of those tests) and MicroShift can not start.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, it is. But be aware this keyword is executed before MicroShift is installed, so it's a pre-check to abort MicroShift installation if no pull secret is present. So I think we should keep this keyword.

Check Required Env Variables
Login MicroShift Host
System Should Not Be Ostree
Pull Secret Should Be Installed
Copy link
Contributor

Choose a reason for hiding this comment

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

Is it needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, this is not need it in remove test case. I remove it in debf22b commit.

@agullon
Copy link
Contributor Author

agullon commented Oct 3, 2025

/retest

1 similar comment
@agullon
Copy link
Contributor Author

agullon commented Oct 3, 2025

/retest

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 3, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 3, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: agullon, 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
Copy link
Contributor

openshift-ci bot commented Oct 3, 2025

@agullon: 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-aws-tests-arm-bootc-release 481eb0b link true /test e2e-aws-tests-arm-bootc-release
ci/prow/e2e-aws-tests-arm-release 481eb0b link true /test e2e-aws-tests-arm-release

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.

@agullon
Copy link
Contributor Author

agullon commented Oct 3, 2025

/retest

@agullon
Copy link
Contributor Author

agullon commented Oct 3, 2025

/verified by CI

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

@agullon: 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 04d6912 into openshift:main Oct 3, 2025
13 checks passed
@agullon
Copy link
Contributor Author

agullon commented Oct 6, 2025

/cherrypick release-4.20

@openshift-cherrypick-robot

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

Applying: add releases scenarios: RPM installation and ISO installation
.git/rebase-apply/patch:257: trailing whitespace.
    launch_vm 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	test/bin/scenario.sh
M	test/scenarios-bootc/releases/el96-lrel@standard1.sh
M	test/scenarios-bootc/releases/el96-lrel@standard2.sh
M	test/scenarios/releases/el96-lrel@standard1.sh
M	test/scenarios/releases/el96-lrel@standard2.sh
Falling back to patching base and 3-way merge...
Auto-merging test/scenarios/releases/el96-lrel@standard2.sh
CONFLICT (content): Merge conflict in test/scenarios/releases/el96-lrel@standard2.sh
Auto-merging test/scenarios/releases/el96-lrel@standard1.sh
CONFLICT (content): Merge conflict in test/scenarios/releases/el96-lrel@standard1.sh
Auto-merging test/scenarios-bootc/releases/el96-lrel@standard2.sh
CONFLICT (content): Merge conflict in test/scenarios-bootc/releases/el96-lrel@standard2.sh
Auto-merging test/scenarios-bootc/releases/el96-lrel@standard1.sh
CONFLICT (content): Merge conflict in test/scenarios-bootc/releases/el96-lrel@standard1.sh
Auto-merging test/bin/scenario.sh
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 0001 add releases scenarios: RPM installation and ISO installation

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.

6 participants