Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dataImportCronTemplates: Remove CentOS 7 & stream 8 #3048

Merged
merged 2 commits into from
Aug 22, 2024
Merged

dataImportCronTemplates: Remove CentOS 7 & stream 8 #3048

merged 2 commits into from
Aug 22, 2024

Conversation

lyarwood
Copy link
Member

@lyarwood lyarwood commented Aug 12, 2024 •
edited
Loading

What this PR does / why we need it:

Both releases are now EOL with their associated containerdisks also deprecated ahead of removal in the near future:

kubevirt/containerdisks#154
kubevirt/containerdisks#152

Reviewer Checklist

Reviewers are supposed to review the PR for every aspect below one by one. To check an item means the PR is either "OK" or "Not Applicable" in terms of that item. All items are supposed to be checked before merging a PR.

  • PR Message
  • Commit Messages
  • How to test
  • Unit Tests
  • Functional Tests
  • User Documentation
  • Developer Documentation
  • Upgrade Scenario
  • Uninstallation Scenario
  • Backward Compatibility
  • Troubleshooting Friendly

Jira Ticket:

https://issues.redhat.com/browse/CNV-43911

Release note:

CentOS 7 & CentOS stream 8 are now EOL so the associated `DataImportCronTemplates` have been removed

@kubevirt-bot kubevirt-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. size/M labels Aug 12, 2024
@coveralls
Copy link
Collaborator

coveralls commented Aug 12, 2024 •
edited
Loading

Pull Request Test Coverage Report for Build 10509285962

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 85.756%
Totals Coverage Status
Change from base Build 10509043708: 0.0%
Covered Lines: 5304
Relevant Lines: 6185
💛 - Coveralls

@lyarwood
Copy link
Member Author

/retest-required

@nunnatsa
Copy link
Collaborator

Thanks for the PR @lyarwood

Please also fix

hyperconverged-cluster-operator/tests/func-tests/golden_image_test.go

Line 35 in ee5ba66

expectedImages = []string{"centos-7-image-cron", "centos-stream8-image-cron", "centos-stream9-image-cron", "centos8-image-cron-is", "fedora-image-cron"}

@lyarwood lyarwood force-pushed the remove-centos-7-centos-stream-8-dics branch 2 times, most recently from f5cc775 to ffd33bd Compare August 20, 2024 12:50
@lyarwood
Copy link
Member Author

/hold

@kubevirt-bot kubevirt-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 20, 2024
@nunnatsa
Copy link
Collaborator

@lyarwood Another change needed in the functional test - sorry for missing that.

Please also update the expectedImageStreams variable in

hyperconverged-cluster-operator/tests/func-tests/golden_image_test.go

Lines 37 to 43 in ee5ba66

expectedImageStreams = []tests.ImageStreamConfig{
{
Name: "centos8",
RegistryName: "quay.io/kubevirt/centos8-container-disk-images",
UsageImages: []string{"centos8-image-cron-is"},
},
}

@lyarwood
Copy link
Member Author

lyarwood commented Aug 22, 2024 •
edited
Loading

@lyarwood Another change needed in the functional test - sorry for missing that.

Please also update the expectedImageStreams variable in

hyperconverged-cluster-operator/tests/func-tests/golden_image_test.go

Lines 37 to 43 in ee5ba66

expectedImageStreams = []tests.ImageStreamConfig{
{
Name: "centos8",
RegistryName: "quay.io/kubevirt/centos8-container-disk-images",
UsageImages: []string{"centos8-image-cron-is"},
},
}

Yup sorry didn't have time to fix this up yet thus the hold, will find time today.

@lyarwood
dataImportCronTemplates: Remove CentOS 7 & stream 8
3eadcaf 
Both releases are now EOL with their associated containerdisks also
deprecated ahead of removal in the near future:

kubevirt/containerdisks#154
kubevirt/containerdisks#152

Signed-off-by: Lee Yarwood <lyarwood@redhat.com>
@lyarwood
tests: Remove use of CentOS 8 from golden image func tests
8e909d4 
The source of this image stream is also changed to the smaller and more
up to date containerdisks project version of the image.

Signed-off-by: Lee Yarwood <lyarwood@redhat.com>
@lyarwood lyarwood force-pushed the remove-centos-7-centos-stream-8-dics branch from ffd33bd to 8e909d4 Compare August 22, 2024 13:41
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Aug 22, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@lyarwood
Copy link
Member Author

/hold cancel

Should be fixed now, I had just mistakenly used the image stream name in UsageImages instead of the DataImportCron name.

@kubevirt-bot kubevirt-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 22, 2024
@hco-bot
Copy link
Collaborator

hco-bot commented Aug 22, 2024

hco-e2e-upgrade-prev-operator-sdk-aws lane succeeded.
/override ci/prow/hco-e2e-upgrade-prev-operator-sdk-azure
hco-e2e-operator-sdk-sno-aws lane succeeded.
/override ci/prow/hco-e2e-operator-sdk-sno-azure

@kubevirt-bot
Copy link
Contributor

@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-operator-sdk-sno-azure, ci/prow/hco-e2e-upgrade-prev-operator-sdk-azure

In response to this:

hco-e2e-upgrade-prev-operator-sdk-aws lane succeeded.
/override ci/prow/hco-e2e-upgrade-prev-operator-sdk-azure
hco-e2e-operator-sdk-sno-aws lane succeeded.
/override ci/prow/hco-e2e-operator-sdk-sno-azure

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.

@hco-bot
Copy link
Collaborator

hco-bot commented Aug 22, 2024

hco-e2e-operator-sdk-sno-aws lane succeeded.
/override ci/prow/hco-e2e-operator-sdk-sno-azure
hco-e2e-upgrade-operator-sdk-sno-aws lane succeeded.
/override ci/prow/hco-e2e-upgrade-operator-sdk-sno-azure
hco-e2e-upgrade-prev-operator-sdk-sno-aws lane succeeded.
/override ci/prow/hco-e2e-upgrade-prev-operator-sdk-sno-azure

@kubevirt-bot
Copy link
Contributor

@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-operator-sdk-sno-azure, ci/prow/hco-e2e-upgrade-operator-sdk-sno-azure, ci/prow/hco-e2e-upgrade-prev-operator-sdk-sno-azure

In response to this:

hco-e2e-operator-sdk-sno-aws lane succeeded.
/override ci/prow/hco-e2e-operator-sdk-sno-azure
hco-e2e-upgrade-operator-sdk-sno-aws lane succeeded.
/override ci/prow/hco-e2e-upgrade-operator-sdk-sno-azure
hco-e2e-upgrade-prev-operator-sdk-sno-aws lane succeeded.
/override ci/prow/hco-e2e-upgrade-prev-operator-sdk-sno-azure

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.

@hco-bot
Copy link
Collaborator

hco-bot commented Aug 22, 2024

hco-e2e-consecutive-operator-sdk-upgrades-aws lane succeeded.
/override ci/prow/hco-e2e-consecutive-operator-sdk-upgrades-azure

@kubevirt-bot
Copy link
Contributor

@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-consecutive-operator-sdk-upgrades-azure

In response to this:

hco-e2e-consecutive-operator-sdk-upgrades-aws lane succeeded.
/override ci/prow/hco-e2e-consecutive-operator-sdk-upgrades-azure

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.

nunnatsa
nunnatsa approved these changes Aug 22, 2024
View reviewed changes
Copy link
Collaborator

@nunnatsa nunnatsa left a comment

Choose a reason for hiding this comment

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

/approve

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Aug 22, 2024
@kubevirt-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nunnatsa

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:

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

@kubevirt-bot kubevirt-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 22, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Aug 22, 2024

@lyarwood: 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/hco-e2e-upgrade-prev-operator-sdk-sno-azure 8e909d4 link false /test hco-e2e-upgrade-prev-operator-sdk-sno-azure
ci/prow/hco-e2e-upgrade-operator-sdk-sno-azure 8e909d4 link false /test hco-e2e-upgrade-operator-sdk-sno-azure
ci/prow/hco-e2e-operator-sdk-sno-azure 8e909d4 link false /test hco-e2e-operator-sdk-sno-azure
ci/prow/hco-e2e-consecutive-operator-sdk-upgrades-azure 8e909d4 link true /test hco-e2e-consecutive-operator-sdk-upgrades-azure
ci/prow/hco-e2e-kv-smoke-azure 8e909d4 link true /test hco-e2e-kv-smoke-azure

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.

@hco-bot
Copy link
Collaborator

hco-bot commented Aug 22, 2024

hco-e2e-kv-smoke-gcp lane succeeded.
/override ci/prow/hco-e2e-kv-smoke-azure

@kubevirt-bot
Copy link
Contributor

@hco-bot: Overrode contexts on behalf of hco-bot: ci/prow/hco-e2e-kv-smoke-azure

In response to this:

hco-e2e-kv-smoke-gcp lane succeeded.
/override ci/prow/hco-e2e-kv-smoke-azure

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.

@kubevirt-bot kubevirt-bot merged commit 9c8b736 into kubevirt:main Aug 22, 2024
31 checks passed
@0xFelix
Copy link
Member

0xFelix commented Aug 26, 2024

/cherry-pick release-1.12
/cherry-pick release-1.11
/cherry-pick release-1.10
/cherry-pick release-1.9

@0xFelix
Copy link
Member

0xFelix commented Aug 26, 2024

/cherry-pick release-1.8

@kubevirt-bot
Copy link
Contributor

@0xFelix: #3048 failed to apply on top of branch "release-1.12":

Applying: dataImportCronTemplates: Remove CentOS 7 & stream 8
Using index info to reconstruct a base tree...
M	assets/dataImportCronTemplates/dataImportCronTemplates.yaml
M	tests/func-tests/golden_image_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/func-tests/golden_image_test.go
CONFLICT (content): Merge conflict in tests/func-tests/golden_image_test.go
Auto-merging assets/dataImportCronTemplates/dataImportCronTemplates.yaml
CONFLICT (content): Merge conflict in assets/dataImportCronTemplates/dataImportCronTemplates.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 dataImportCronTemplates: Remove CentOS 7 & stream 8
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.12
/cherry-pick release-1.11
/cherry-pick release-1.10
/cherry-pick release-1.9

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.

@kubevirt-bot
Copy link
Contributor

@0xFelix: #3048 failed to apply on top of branch "release-1.8":

Applying: dataImportCronTemplates: Remove CentOS 7 & stream 8
Using index info to reconstruct a base tree...
A	tests/func-tests/golden_image_test.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): tests/func-tests/golden_image_test.go deleted in HEAD and modified in dataImportCronTemplates: Remove CentOS 7 & stream 8. Version dataImportCronTemplates: Remove CentOS 7 & stream 8 of tests/func-tests/golden_image_test.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 dataImportCronTemplates: Remove CentOS 7 & stream 8
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.8

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.

This was referenced Aug 26, 2024
Merged
Merged
Merged
Merged
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nunnatsa nunnatsa nunnatsa approved these changes

@avlitman avlitman Awaiting requested review from avlitman

@machadovilaca machadovilaca Awaiting requested review from machadovilaca

Assignees

@nunnatsa nunnatsa

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@lyarwood @coveralls @nunnatsa @hco-bot @kubevirt-bot @0xFelix