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

[azure] support new marketpalce image 413.92.2023101700 #44693

Merged
merged 1 commit into from
Oct 25, 2023
Merged

[azure] support new marketpalce image 413.92.2023101700 #44693

merged 1 commit into from
Oct 25, 2023

Conversation

jinyunma
Copy link
Contributor

@jinyunma jinyunma commented Oct 23, 2023 •
edited

https://issues.redhat.com/browse/CORS-2725

  1. update workflow cucushift-installer-rehearse-azure-ipi-marketplace to test image 413.92.2023101700 to provision all nodes on 4.14+.
  2. update existing destructive job to test NoPurchasePlan image to provision all nodes on 4.14+.
  3. add post-check step cucushift-installer-check-azure-osimage

@gpei
Copy link
Contributor

gpei commented Oct 23, 2023

@jinyunma do we have a conclusion on if 4.13 should also use the new published "413.92.2023101700"? Or we just want to guarantee 4.14 is working fine currently

jianlinliu
jianlinliu reviewed Oct 23, 2023
View reviewed changes
ci-operator/step-registry/ipi/conf/azure/osimage/ipi-conf-azure-osimage-commands.sh Outdated
offer: ${imageInfo[1]}
sku: ${imageInfo[2]}
version: ${imageInfo[3]}
${os_image_plan}
Copy link
Contributor

Choose a reason for hiding this comment

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

We need to set os_image_plan with an empty value in previous lines when OS_IMAGE_PLAN is empty?

And when OS_IMAGE_PLAN is set to WithPurchasePlan, we also assemble os_image_plan, right?

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, fixed.

@jinyunma
Copy link
Contributor Author

do we have a conclusion on if 4.13 should also use the new published "413.92.2023101700"?

not yet, didn't get response from EXDSP- 2164.

Or we just want to guarantee 4.14 is working fine currently

yes, since manual testing is passed, so I plan to add it into CI, if there is any change for image version published in azure marketplace, I think we can just update ENV OS_IMAGE_VERSION: 413.92.2023101700 on 4.14+ relevant jobs.

@jinyunma jinyunma force-pushed the az_image branch 2 times, most recently from 56e4161 to 3cee214 Compare October 23, 2023 03:47
jianlinliu
jianlinliu reviewed Oct 23, 2023
View reviewed changes
ci-operator/step-registry/ipi/conf/azure/osimage/ipi-conf-azure-osimage-commands.sh Outdated

#set plan for os image, default value is WithPurchasePlan
os_image_plan=""
if [[ "${OS_IMAGE_PLAN}" != "" ]] && [[ ${ocp_minor_version} -ge 14 ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

I guess we do not need to judge ocp_minor_version here, if someone set OS_IMAGE_PLAN on an unsupported version, that should be a job config issue.

jianlinliu
jianlinliu reviewed Oct 23, 2023
View reviewed changes
...t/openshift-tests-private/openshift-openshift-tests-private-release-4.15__amd64-nightly.yaml Outdated
TAG_VERSION: '@4.15'
test:
- chain: openshift-e2e-test-qe-destructive
workflow: cucushift-installer-rehearse-azure-ipi-marketplace
- as: azure-ipi-marketplace-noplan-f28
Copy link
Contributor

Choose a reason for hiding this comment

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

How about merge the coverage into the above destructive ci? non-destructive cover 413.92.2023101700, destructive one covers azureopenshift:aro4:413_v2:413.92.20230614 ?

@jinyunma jinyunma force-pushed the az_image branch 2 times, most recently from 8fbd189 to 580c1b7 Compare October 23, 2023 06:04
jianlinliu
jianlinliu reviewed Oct 23, 2023
View reviewed changes
...t/openshift-tests-private/openshift-openshift-tests-private-release-4.14__amd64-nightly.yaml Outdated
steps:
cluster_profile: azure-qe
env:
BASE_DOMAIN: qe.azure.devcluster.openshift.com
E2E_RUN_TAGS: '@amd64 and @azure-ipi and @network-ovnkubernetes and not @fips'
OS_IMAGE_MASTERS: azureopenshift:aro4:413_v2:413.92.20230614
OS_IMAGE_MASTERS_PLAN: NoPurchasePlan
OS_IMAGE_VERSION: 413.92.2023101700
Copy link
Contributor

Choose a reason for hiding this comment

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

We should cover azureopenshift:aro4:413_v2:413.92.20230614 on this job, right?

jianlinliu
jianlinliu reviewed Oct 23, 2023
View reviewed changes
...t/openshift-tests-private/openshift-openshift-tests-private-release-4.15__amd64-nightly.yaml Outdated
OS_IMAGE_MASTERS_PLAN: NoPurchasePlan
OS_IMAGE_PLAN: NoPurchasePlan
OS_IMAGE_URN: azureopenshift:aro4:413_v2:413.92.20230614
OS_IMAGE_VERSION: 413.92.2023101700
Copy link
Contributor

Choose a reason for hiding this comment

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

From the codes, seem like we do not need OS_IMAGE_VERSION setting here?

@jianlinliu
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 23, 2023
@jinyunma
Copy link
Contributor Author

/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.14-amd64-nightly-azure-ipi-marketplace-f28

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 23, 2023
@jinyunma
Copy link
Contributor Author

/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.14-amd64-nightly-azure-ipi-marketplace-f28

@jinyunma
Copy link
Contributor Author

/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.14-amd64-nightly-azure-ipi-marketplace-f28

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 23, 2023
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 24, 2023
@jinyunma
Copy link
Contributor Author

/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.14-amd64-nightly-azure-ipi-marketplace-noplan-f28-destructive periodic-ci-openshift-openshift-tests-private-release-4.13-amd64-nightly-azure-ipi-workers-marketplace-f28

@openshift-ci-robot
Copy link
Contributor

[REHEARSALNOTIFIER]
@jinyunma: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
periodic-ci-openshift-openshift-tests-private-release-4.12-amd64-nightly-azure-ipi-workers-marketplace-f28-destructive N/A periodic Registry content changed
periodic-ci-openshift-openshift-tests-private-release-4.13-amd64-nightly-azure-ipi-workers-marketplace-f28-destructive N/A periodic Registry content changed
periodic-ci-openshift-openshift-tests-private-release-4.11-amd64-nightly-azure-ipi-workers-marketplace-f28 N/A periodic Registry content changed
periodic-ci-openshift-openshift-tests-private-release-4.13-amd64-nightly-azure-ipi-workers-marketplace-f28 N/A periodic Registry content changed
periodic-ci-openshift-openshift-tests-private-release-4.11-amd64-nightly-azure-ipi-workers-marketplace-f28-destructive N/A periodic Registry content changed
periodic-ci-openshift-openshift-tests-private-release-4.15-amd64-nightly-azure-ipi-marketplace-noplan-f28-destructive N/A periodic Periodic changed
periodic-ci-openshift-openshift-tests-private-release-4.12-amd64-nightly-azure-ipi-workers-marketplace-f28 N/A periodic Registry content changed
periodic-ci-openshift-openshift-tests-private-release-4.14-amd64-nightly-azure-ipi-marketplace-noplan-f28-destructive N/A periodic Periodic changed
periodic-ci-openshift-openshift-tests-private-release-4.14-amd64-nightly-azure-ipi-marketplace-f28 N/A periodic Ci-operator config changed
periodic-ci-openshift-openshift-tests-private-release-4.15-amd64-nightly-azure-ipi-marketplace-f28 N/A periodic Ci-operator config changed
Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 10 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 20 rehearsals
Comment: /pj-rehearse max to run up to 35 rehearsals
Comment: /pj-rehearse auto-ack to run up to 10 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse abort to abort all active rehearsals

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@jinyunma
Copy link
Contributor Author

4.14-amd64-nightly-azure-ipi-marketplace-noplan-f28-destructive: job link

4.14-amd64-nightly-azure-ipi-marketplace-f28: job link

4.13-amd64-nightly-azure-ipi-workers-marketplace-f28: job link

minor update: query image generation from az vm image show instead of image name.

@jianlinliu
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 24, 2023
@jinyunma
Copy link
Contributor Author

/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.14-amd64-nightly-azure-ipi-marketplace-f28

@jinyunma
Copy link
Contributor Author

/pj-rehearse ack

cc @liangxia to review

@openshift-ci-robot openshift-ci-robot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Oct 24, 2023
@liangxia
Copy link
Member

/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 25, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jianlinliu, jinyunma, liangxia

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 25, 2023
@openshift-ci openshift-ci bot merged commit fc5013f into openshift:master Oct 25, 2023
18 of 19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jianlinliu jianlinliu jianlinliu left review comments

@gpei gpei Awaiting requested review from gpei

Assignees

@jianlinliu jianlinliu

@liangxia liangxia

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. rehearsals-ack Signifies that rehearsal jobs have been acknowledged
Projects
None yet
Milestone
No milestone
6 participants
@jinyunma @gpei @jianlinliu @openshift-ci-robot @liangxia @openshift-merge-robot