USHIFT-6364: Cache management new functionality #5839

ggiguash · 2025-12-02T06:49:10Z

Add an optional uname override
Add dellast function
Prevent deletion of the only cache tag
Prevent reset to a non-existing cache tag

Co-authored-by: @agullon

Testing error handling

$ export AWS_BUCKET_NAME=microshift-build-cache-us-west-2

# Cannot delete the current 'last' without resetting it
$ ./test/bin/manage_build_cache.sh dellast -b release-4.21 -t 251207
You can now run: /home/microshift/microshift/_output/bin/aws --version
ERROR: Cannot delete 'last' tag because it is the same as the new '251207' tag

# Cannot set the 'last' to a non-existent tag
$ ./test/bin/manage_build_cache.sh dellast -b release-4.21 -t 251205
Checking contents of 's3://microshift-build-cache-us-west-2/release-4.21/x86_64/251205'
ERROR: Cannot reset 'last' tag to a non-existent '251205' tag

Testing with the default architecture

$ export AWS_BUCKET_NAME=microshift-build-cache-us-west-2

$ ./test/bin/manage_build_cache.sh dellast -b release-4.21 -t 251206
Checking contents of 's3://microshift-build-cache-us-west-2/release-4.21/x86_64/251206'
Updating 's3://microshift-build-cache-us-west-2/release-4.21/x86_64/last' with the '251206' tag
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/vm-storage/rhel96-bootc-brew-ec-with-optional.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/vm-storage/rhel-9.6.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/vm-storage/rhel100-bootc.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/brew-rpms.tar
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/repo.tar
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/vm-storage/rhel96-bootc.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/vm-storage/rhel-9.6-microshift-4.20.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/mirror-registry.tar

Testing with non-default architecture

$ export AWS_BUCKET_NAME=microshift-build-cache-us-west-2

$ ./test/bin/manage_build_cache.sh dellast -b release-4.21 -t 251206 -a aarch64
Checking contents of 's3://microshift-build-cache-us-west-2/release-4.21/aarch64/251206'
Updating 's3://microshift-build-cache-us-west-2/release-4.21/aarch64/last' with the '251206' tag
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/vm-storage/rhel-9.6.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/vm-storage/rhel-9.6-microshift-4.20.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/vm-storage/rhel96-bootc-brew-ec-with-optional.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/brew-rpms.tar
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/vm-storage/rhel100-bootc.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/repo.tar
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/vm-storage/rhel96-bootc.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/mirror-registry.tar

Co-authored-by: Alejandro Gullon <[email protected]>

openshift-ci-robot · 2025-12-02T06:49:14Z

@ggiguash: This pull request explicitly references no jira issue.

In response to this:

Add an optional uname override

Add dellast function

Prevent deletion of the only cache subdir

Co-authored-by: @agullon

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 · 2025-12-02T06:49:17Z

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

ggiguash · 2025-12-02T07:47:54Z

/test verify

test/bin/manage_build_cache.sh

openshift-ci-robot · 2025-12-05T08:07:50Z

@ggiguash: This pull request references USHIFT-6364 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.

In response to this:

Add an optional uname override

Add dellast function

Prevent deletion of the only cache subdir

Co-authored-by: @agullon

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-robot · 2025-12-07T07:12:04Z

@ggiguash: This pull request references USHIFT-6364 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.

In response to this:

Add an optional uname override
Add dellast function
Prevent deletion of the only cache subdir

Co-authored-by: @agullon

Testing error handling

$ export AWS_BUCKET_NAME=microshift-build-cache-us-west-2

# Cannot delete the current 'last' without resetting it
$ ./test/bin/manage_build_cache.sh dellast -b release-4.21 -t 251207
You can now run: /home/microshift/microshift/_output/bin/aws --version
ERROR: Cannot delete 'last' tag because it is the same as the new '251207' tag

# Cannot set the 'last' to a non-existent tag
$ ./test/bin/manage_build_cache.sh dellast -b release-4.21 -t 251205
Checking contents of 's3://microshift-build-cache-us-west-2/release-4.21/x86_64/251205'
ERROR: Cannot reset 'last' tag to a non-existent '251205' tag

Testing with the default `-a` architecture

$ export AWS_BUCKET_NAME=microshift-build-cache-us-west-2

$ ./test/bin/manage_build_cache.sh dellast -b release-4.21 -t 251206
Checking contents of 's3://microshift-build-cache-us-west-2/release-4.21/x86_64/251206'
Updating 's3://microshift-build-cache-us-west-2/release-4.21/x86_64/last' with the '251206' tag
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/vm-storage/rhel96-bootc-brew-ec-with-optional.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/vm-storage/rhel-9.6.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/vm-storage/rhel100-bootc.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/brew-rpms.tar
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/repo.tar
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/vm-storage/rhel96-bootc.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/vm-storage/rhel-9.6-microshift-4.20.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/mirror-registry.tar

Testing with non-default `-a` architecture

$ export AWS_BUCKET_NAME=microshift-build-cache-us-west-2

$ ./test/bin/manage_build_cache.sh dellast -b release-4.21 -t 251206 -a aarch64
Checking contents of 's3://microshift-build-cache-us-west-2/release-4.21/aarch64/251206'
Updating 's3://microshift-build-cache-us-west-2/release-4.21/aarch64/last' with the '251206' tag
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/vm-storage/rhel-9.6.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/vm-storage/rhel-9.6-microshift-4.20.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/vm-storage/rhel96-bootc-brew-ec-with-optional.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/brew-rpms.tar
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/vm-storage/rhel100-bootc.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/repo.tar
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/vm-storage/rhel96-bootc.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/mirror-registry.tar

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-robot · 2025-12-07T07:15:12Z

@ggiguash: This pull request references USHIFT-6364 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.

In response to this:

Add an optional uname override
Add dellast function
Prevent deletion of the only cache tag
Prevent reset to a non-existing cache tag

Co-authored-by: @agullon

Testing error handling

$ export AWS_BUCKET_NAME=microshift-build-cache-us-west-2

# Cannot delete the current 'last' without resetting it
$ ./test/bin/manage_build_cache.sh dellast -b release-4.21 -t 251207
You can now run: /home/microshift/microshift/_output/bin/aws --version
ERROR: Cannot delete 'last' tag because it is the same as the new '251207' tag

# Cannot set the 'last' to a non-existent tag
$ ./test/bin/manage_build_cache.sh dellast -b release-4.21 -t 251205
Checking contents of 's3://microshift-build-cache-us-west-2/release-4.21/x86_64/251205'
ERROR: Cannot reset 'last' tag to a non-existent '251205' tag

Testing with the default `-a` architecture

$ export AWS_BUCKET_NAME=microshift-build-cache-us-west-2

$ ./test/bin/manage_build_cache.sh dellast -b release-4.21 -t 251206
Checking contents of 's3://microshift-build-cache-us-west-2/release-4.21/x86_64/251206'
Updating 's3://microshift-build-cache-us-west-2/release-4.21/x86_64/last' with the '251206' tag
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/vm-storage/rhel96-bootc-brew-ec-with-optional.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/vm-storage/rhel-9.6.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/vm-storage/rhel100-bootc.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/brew-rpms.tar
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/repo.tar
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/vm-storage/rhel96-bootc.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/vm-storage/rhel-9.6-microshift-4.20.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/mirror-registry.tar

Testing with non-default `-a` architecture

$ export AWS_BUCKET_NAME=microshift-build-cache-us-west-2

$ ./test/bin/manage_build_cache.sh dellast -b release-4.21 -t 251206 -a aarch64
Checking contents of 's3://microshift-build-cache-us-west-2/release-4.21/aarch64/251206'
Updating 's3://microshift-build-cache-us-west-2/release-4.21/aarch64/last' with the '251206' tag
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/vm-storage/rhel-9.6.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/vm-storage/rhel-9.6-microshift-4.20.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/vm-storage/rhel96-bootc-brew-ec-with-optional.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/brew-rpms.tar
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/vm-storage/rhel100-bootc.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/repo.tar
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/vm-storage/rhel96-bootc.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/mirror-registry.tar

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-robot · 2025-12-07T07:15:31Z

@ggiguash: This pull request references USHIFT-6364 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.

In response to this:

Add an optional uname override
Add dellast function
Prevent deletion of the only cache tag
Prevent reset to a non-existing cache tag

Co-authored-by: @agullon

Testing error handling

$ export AWS_BUCKET_NAME=microshift-build-cache-us-west-2

# Cannot delete the current 'last' without resetting it
$ ./test/bin/manage_build_cache.sh dellast -b release-4.21 -t 251207
You can now run: /home/microshift/microshift/_output/bin/aws --version
ERROR: Cannot delete 'last' tag because it is the same as the new '251207' tag

# Cannot set the 'last' to a non-existent tag
$ ./test/bin/manage_build_cache.sh dellast -b release-4.21 -t 251205
Checking contents of 's3://microshift-build-cache-us-west-2/release-4.21/x86_64/251205'
ERROR: Cannot reset 'last' tag to a non-existent '251205' tag

Testing with the default architecture

$ export AWS_BUCKET_NAME=microshift-build-cache-us-west-2

$ ./test/bin/manage_build_cache.sh dellast -b release-4.21 -t 251206
Checking contents of 's3://microshift-build-cache-us-west-2/release-4.21/x86_64/251206'
Updating 's3://microshift-build-cache-us-west-2/release-4.21/x86_64/last' with the '251206' tag
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/vm-storage/rhel96-bootc-brew-ec-with-optional.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/vm-storage/rhel-9.6.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/vm-storage/rhel100-bootc.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/brew-rpms.tar
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/repo.tar
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/vm-storage/rhel96-bootc.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/vm-storage/rhel-9.6-microshift-4.20.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/x86_64/251207/mirror-registry.tar

Testing with non-default architecture

$ export AWS_BUCKET_NAME=microshift-build-cache-us-west-2

$ ./test/bin/manage_build_cache.sh dellast -b release-4.21 -t 251206 -a aarch64
Checking contents of 's3://microshift-build-cache-us-west-2/release-4.21/aarch64/251206'
Updating 's3://microshift-build-cache-us-west-2/release-4.21/aarch64/last' with the '251206' tag
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/vm-storage/rhel-9.6.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/vm-storage/rhel-9.6-microshift-4.20.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/vm-storage/rhel96-bootc-brew-ec-with-optional.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/brew-rpms.tar
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/vm-storage/rhel100-bootc.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/repo.tar
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/vm-storage/rhel96-bootc.iso
delete: s3://microshift-build-cache-us-west-2/release-4.21/aarch64/251207/mirror-registry.tar

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.

pacevedom

/lgtm

openshift-ci · 2025-12-07T11:33:25Z

[APPROVALNOTIFIER] This PR is APPROVED

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

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [ggiguash,pacevedom]

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

ggiguash · 2025-12-07T11:35:09Z

/override ci/prow/e2e-aws-tests-arm ci/prow/e2e-aws-tests-bootc-periodic ci/prow/e2e-aws-tests-bootc-periodic-arm ci/prow/e2e-aws-tests-periodic ci/prow/e2e-aws-tests-periodic-arm

openshift-ci · 2025-12-07T11:35:27Z

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

In response to this:

/override ci/prow/e2e-aws-tests-arm ci/prow/e2e-aws-tests-bootc-periodic ci/prow/e2e-aws-tests-bootc-periodic-arm ci/prow/e2e-aws-tests-periodic ci/prow/e2e-aws-tests-periodic-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.

ggiguash · 2025-12-07T11:35:27Z

See the PR description
/verified by manual-tests

openshift-ci · 2025-12-07T11:35:33Z

@ggiguash: all tests passed!

Full PR test history. Your PR dashboard.

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.

openshift-ci-robot · 2025-12-07T11:35:39Z

@ggiguash: This PR has been marked as verified by manual-tests.

In response to this:

See the PR description
/verified by manual-tests

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.

ggiguash and others added 3 commits December 2, 2025 08:40

Add arch override option

1409637

Add dellast action

fc61854

Add extra check to not delete cache if only 1 exists

722d35f

Co-authored-by: Alejandro Gullon <[email protected]>

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 2, 2025

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 Dec 2, 2025

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 2, 2025

ggiguash mentioned this pull request Dec 2, 2025

NO-ISSUE: add extra check to not delete cache if only 1 exists #5837

Closed

Replace <uname> by <arch> in the usage message

dae9048

agullon reviewed Dec 2, 2025

View reviewed changes

test/bin/manage_build_cache.sh Show resolved Hide resolved

ggiguash changed the title ~~NO-ISSUE: Cache management new functionality~~ USHIFT-6364: Cache management new functionality Dec 5, 2025

ggiguash marked this pull request as ready for review December 7, 2025 07:12

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

openshift-ci bot requested review from eslutsky and jerpeter1 December 7, 2025 07:12

pacevedom approved these changes Dec 7, 2025

View reviewed changes

openshift-ci bot assigned pacevedom Dec 7, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 7, 2025

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Dec 7, 2025

openshift-merge-bot bot merged commit 9a233dd into openshift:main Dec 7, 2025
15 checks passed

USHIFT-6364: Cache management new functionality #5839

USHIFT-6364: Cache management new functionality #5839

Conversation

ggiguash commented Dec 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Testing error handling

Testing with the default architecture

Testing with non-default architecture

Uh oh!

openshift-ci-robot commented Dec 2, 2025

Uh oh!

openshift-ci bot commented Dec 2, 2025

Uh oh!

ggiguash commented Dec 2, 2025

Uh oh!

Uh oh!

openshift-ci-robot commented Dec 5, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Dec 7, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Testing error handling

Testing with the default -a architecture

Testing with non-default -a architecture

Uh oh!

openshift-ci-robot commented Dec 7, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Testing error handling

Testing with the default -a architecture

Testing with non-default -a architecture

Uh oh!

openshift-ci-robot commented Dec 7, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Testing error handling

Testing with the default architecture

Testing with non-default architecture

Uh oh!

pacevedom left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Dec 7, 2025

Uh oh!

ggiguash commented Dec 7, 2025

Uh oh!

openshift-ci bot commented Dec 7, 2025

Uh oh!

ggiguash commented Dec 7, 2025

Uh oh!

openshift-ci bot commented Dec 7, 2025

Uh oh!

openshift-ci-robot commented Dec 7, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ggiguash commented Dec 2, 2025 •

edited

Loading

openshift-ci-robot commented Dec 5, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Dec 7, 2025 •

edited by openshift-ci bot

Loading

Testing with the default `-a` architecture

Testing with non-default `-a` architecture

openshift-ci-robot commented Dec 7, 2025 •

edited by openshift-ci bot

Loading

Testing with the default `-a` architecture

Testing with non-default `-a` architecture

openshift-ci-robot commented Dec 7, 2025 •

edited by openshift-ci bot

Loading