Skip to content

ACM-19143: remove obsolete image versions #7511

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.

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

Closed

Conversation

zszabo-rh
Copy link
Contributor

ACM-19143: default osImages versions should be taken from supported-ocp-versions.json
Pls note that corresponding backplane version is 5 versions behind release-ocm version.

Main changes:

  • data/default_os_images.json was modified (+ "make generate")
  • from now on subsystem tests use the default version instead of hardcoded values

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

openshift-ci-robot commented Apr 7, 2025

@zszabo-rh: This pull request references ACM-19143 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.19.0" version, but no target version was set.

In response to this:

ACM-19143: default osImages versions should be taken from supported-ocp-versions.json
Pls note that corresponding backplane version is 5 versions behind release-ocm version.

Main changes:

  • data/default_os_images.json was modified (+ "make generate")
  • from now on subsystem tests use the default version instead of hardcoded values

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 do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 7, 2025
Copy link

openshift-ci bot commented Apr 7, 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 size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Apr 7, 2025
Copy link

openshift-ci bot commented Apr 7, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: zszabo-rh
Once this PR has been reviewed and has the lgtm label, please assign carbonin for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@zszabo-rh
Copy link
Contributor Author

/test subsystem-aws

Copy link

openshift-ci bot commented Apr 7, 2025

@zszabo-rh: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test e2e-agent-compact-ipv4
/test edge-assisted-operator-catalog-publish-verify
/test edge-ci-index
/test edge-e2e-ai-operator-disconnected-capi
/test edge-e2e-ai-operator-ztp
/test edge-e2e-ai-operator-ztp-3masters
/test edge-e2e-ai-operator-ztp-capi
/test edge-e2e-ai-operator-ztp-disconnected
/test edge-e2e-metal-assisted-4-14
/test edge-e2e-metal-assisted-4-15
/test edge-e2e-metal-assisted-4-16
/test edge-e2e-metal-assisted-4-17
/test edge-e2e-metal-assisted-4-18
/test edge-e2e-metal-assisted-5-control-planes-4-18
/test edge-e2e-metal-assisted-cnv-4-18
/test edge-e2e-metal-assisted-external-4-18
/test edge-e2e-metal-assisted-kdo-4-18
/test edge-e2e-metal-assisted-lvm-4-18
/test edge-e2e-metal-assisted-mtv-4-18
/test edge-e2e-metal-assisted-nho-snr-far-4-18
/test edge-e2e-metal-assisted-nmo-4-18
/test edge-e2e-metal-assisted-none-4-18
/test edge-e2e-metal-assisted-odf-4-18
/test edge-e2e-metal-assisted-osc-4-18
/test edge-e2e-nutanix-assisted-2workers-4-18
/test edge-e2e-nutanix-assisted-4-18
/test edge-e2e-vsphere-assisted-4-18
/test edge-e2e-vsphere-assisted-4-19
/test edge-images
/test edge-lint
/test edge-operator-publish-verify
/test edge-subsystem-aws
/test edge-subsystem-kubeapi-aws
/test edge-unit-test
/test edge-verify-generated-code
/test images
/test mce-images

The following commands are available to trigger optional jobs:

/test e2e-agent-4control-ipv4
/test e2e-agent-5control-ipv4
/test e2e-agent-ha-dualstack
/test e2e-agent-sno-ipv6
/test edge-e2e-ai-operator-ztp-4masters
/test edge-e2e-ai-operator-ztp-5masters
/test edge-e2e-ai-operator-ztp-compact-day2-masters
/test edge-e2e-ai-operator-ztp-compact-day2-workers
/test edge-e2e-ai-operator-ztp-hypershift-zero-nodes
/test edge-e2e-ai-operator-ztp-multiarch-3masters-ocp
/test edge-e2e-ai-operator-ztp-multiarch-sno-ocp
/test edge-e2e-ai-operator-ztp-node-labels
/test edge-e2e-ai-operator-ztp-remove-node
/test edge-e2e-ai-operator-ztp-sno-day2-masters
/test edge-e2e-ai-operator-ztp-sno-day2-workers
/test edge-e2e-ai-operator-ztp-sno-day2-workers-ignitionoverride
/test edge-e2e-ai-operator-ztp-sno-day2-workers-late-binding
/test edge-e2e-metal-assisted-4-control-planes-4-18
/test edge-e2e-metal-assisted-4-masters-none-4-18
/test edge-e2e-metal-assisted-bond-4-14
/test edge-e2e-metal-assisted-bond-4-18
/test edge-e2e-metal-assisted-day2-4-18
/test edge-e2e-metal-assisted-day2-arm-workers-4-18
/test edge-e2e-metal-assisted-day2-sno-4-18
/test edge-e2e-metal-assisted-ipv4v6-4-18
/test edge-e2e-metal-assisted-ipv6-4-18
/test edge-e2e-metal-assisted-k8s-nmstate-4-18
/test edge-e2e-metal-assisted-kube-api-late-binding-sno-4-18
/test edge-e2e-metal-assisted-kube-api-late-unbinding-sno-4-18
/test edge-e2e-metal-assisted-kube-api-net-suite-4-18
/test edge-e2e-metal-assisted-kube-api-umlb-4-18
/test edge-e2e-metal-assisted-onprem-4-18
/test edge-e2e-metal-assisted-osc-sno-4-18
/test edge-e2e-metal-assisted-sno-4-18
/test edge-e2e-metal-assisted-static-ip-suite-4-14
/test edge-e2e-metal-assisted-static-ip-suite-4-18
/test edge-e2e-metal-assisted-tang-4-18
/test edge-e2e-metal-assisted-tpmv2-4-18
/test edge-e2e-metal-assisted-umlb-4-18
/test edge-e2e-metal-assisted-upgrade-agent-4-18
/test edge-e2e-oci-assisted-4-18
/test edge-e2e-oci-assisted-bm-iscsi-4-18
/test edge-e2e-vsphere-assisted-umlb-4-18
/test edge-e2e-vsphere-assisted-umn-4-18
/test okd-scos-e2e-aws-ovn
/test okd-scos-images
/test push-pr-image

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

pull-ci-openshift-assisted-service-master-e2e-agent-compact-ipv4
pull-ci-openshift-assisted-service-master-edge-assisted-operator-catalog-publish-verify
pull-ci-openshift-assisted-service-master-edge-ci-index
pull-ci-openshift-assisted-service-master-edge-e2e-metal-assisted-4-18
pull-ci-openshift-assisted-service-master-edge-images
pull-ci-openshift-assisted-service-master-edge-lint
pull-ci-openshift-assisted-service-master-edge-subsystem-aws
pull-ci-openshift-assisted-service-master-edge-subsystem-kubeapi-aws
pull-ci-openshift-assisted-service-master-edge-unit-test
pull-ci-openshift-assisted-service-master-edge-verify-generated-code
pull-ci-openshift-assisted-service-master-images
pull-ci-openshift-assisted-service-master-mce-images
pull-ci-openshift-assisted-service-master-okd-scos-e2e-aws-ovn

In response to this:

/test subsystem-aws

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.

@zszabo-rh
Copy link
Contributor Author

/test edge-subsystem-kubeapi-aws edge-subsystem-aws

@zszabo-rh zszabo-rh force-pushed the reduce_number_of_images branch from 71c63a5 to 4b875db Compare April 8, 2025 07:50
@zszabo-rh
Copy link
Contributor Author

/test edge-subsystem-kubeapi-aws

@zszabo-rh zszabo-rh force-pushed the reduce_number_of_images branch from 4b875db to ead0073 Compare April 8, 2025 10:17
@zszabo-rh
Copy link
Contributor Author

/retest

Copy link

codecov bot commented Apr 8, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.30%. Comparing base (abd0143) to head (2ec4cdf).
Report is 22 commits behind head on master.

Current head 2ec4cdf differs from pull request most recent head 956159f

Please upload reports for the commit 956159f to get more accurate results.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #7511      +/-   ##
==========================================
- Coverage   67.30%   67.30%   -0.01%     
==========================================
  Files         334      334              
  Lines       42299    42299              
==========================================
- Hits        28470    28468       -2     
- Misses      11257    11258       +1     
- Partials     2572     2573       +1     

see 1 file with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@zszabo-rh
Copy link
Contributor Author

/test edge-subsystem-kubeapi-aws edge-subsystem-aws

@zszabo-rh zszabo-rh force-pushed the reduce_number_of_images branch 2 times, most recently from bfe8991 to 11927d5 Compare April 9, 2025 07:16
@zszabo-rh
Copy link
Contributor Author

/test edge-subsystem-kubeapi-aws edge-subsystem-aws

@zszabo-rh zszabo-rh force-pushed the reduce_number_of_images branch from 11927d5 to ee812fc Compare April 9, 2025 10:13
@zszabo-rh
Copy link
Contributor Author

/test edge-subsystem-kubeapi-aws edge-subsystem-aws

@zszabo-rh zszabo-rh force-pushed the reduce_number_of_images branch from ee812fc to e6df9cd Compare April 10, 2025 12:11
@zszabo-rh
Copy link
Contributor Author

/test edge-subsystem-kubeapi-aws edge-subsystem-aws

@zszabo-rh zszabo-rh force-pushed the reduce_number_of_images branch from e6df9cd to 2ec4cdf Compare April 11, 2025 12:41
@zszabo-rh
Copy link
Contributor Author

/test all

@zszabo-rh zszabo-rh force-pushed the reduce_number_of_images branch from 2ec4cdf to 8619025 Compare April 14, 2025 08:30
@openshift-ci openshift-ci bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Apr 14, 2025
@zszabo-rh
Copy link
Contributor Author

/test all

@zszabo-rh zszabo-rh force-pushed the reduce_number_of_images branch from 8619025 to af0240b Compare April 14, 2025 10:04
@zszabo-rh
Copy link
Contributor Author

/test all

@zszabo-rh zszabo-rh force-pushed the reduce_number_of_images branch from af0240b to e6f03c1 Compare April 14, 2025 11:32
@zszabo-rh
Copy link
Contributor Author

/test all

@zszabo-rh zszabo-rh force-pushed the reduce_number_of_images branch from e6f03c1 to 8259224 Compare April 15, 2025 04:43
@zszabo-rh
Copy link
Contributor Author

/test edge-subsystem-aws

@zszabo-rh zszabo-rh force-pushed the reduce_number_of_images branch from 8259224 to 956159f Compare April 15, 2025 09:38
@zszabo-rh
Copy link
Contributor Author

/test edge-subsystem-aws

Copy link

openshift-ci bot commented Apr 15, 2025

@zszabo-rh: 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-agent-compact-ipv4 e6f03c1 link true /test e2e-agent-compact-ipv4
ci/prow/okd-scos-e2e-aws-ovn e6f03c1 link false /test okd-scos-e2e-aws-ovn
ci/prow/edge-e2e-metal-assisted-4-19 e6f03c1 link true /test edge-e2e-metal-assisted-4-19
ci/prow/edge-subsystem-kubeapi-aws e6f03c1 link true /test edge-subsystem-kubeapi-aws
ci/prow/edge-verify-generated-code e6f03c1 link true /test edge-verify-generated-code
ci/prow/edge-unit-test e6f03c1 link true /test edge-unit-test
ci/prow/edge-lint e6f03c1 link true /test edge-lint
ci/prow/edge-subsystem-aws 956159f link true /test edge-subsystem-aws

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.

@@ -32,7 +34,7 @@ import (
var log *logrus.Logger
var wiremock *utils_test.WireMock
var kubeClient k8sclient.Client
var VipAutoAllocOpenshiftVersion string = "4.14.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

Lets avoid setting version here, only get it dynamically

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it's a deleted line :)

Comment on lines +37 to 39
var openshiftVersionLong string = "4.11.59"
var openshiftVersion string = "4.11"
var snoVersion string = "4.11"
var multiarchOpenshiftVersion string = "4.11.0-multi"
Copy link
Contributor

Choose a reason for hiding this comment

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

what are these still used for ? 4.11 is not available anymore no ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sure, the initial value could be anything, I intentionally kept 4.11 just to see if it really gets overridden by an existing image version.

@zszabo-rh zszabo-rh closed this Apr 25, 2025
@zszabo-rh
Copy link
Contributor Author

Closed as currently there is no way to separate ACM and SaaS related changes in master.
Tailoring the supported image versions needs to be done for all ACM versions after they are branched down from master.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants