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

Don't add empty iso while starting a VM #10322

Draft
wants to merge 2 commits into
base: 4.19
Choose a base branch
from
Draft

Don't add empty iso while starting a VM #10322

wants to merge 2 commits into from

Conversation

vishesh92
Copy link
Member

Description

This PR fixes #10318

Details

This pull request includes a change to the prepareIsoForVmProfile method in the TemplateManagerImpl class to simplify the code by removing an unnecessary else block.

Codebase simplification:

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)
  • build/CI
  • test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

@vishesh92
Copy link
Member Author

@blueorangutan package

@vishesh92 vishesh92 linked an issue Feb 4, 2025 that may be closed by this pull request
ConfigDrive functionality broken for Xen/XCP-Ng #10318
Open
@blueorangutan
Copy link

@vishesh92 a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@codecov Codecov
Copy link

codecov bot commented Feb 4, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 15.14%. Comparing base (802bf5f) to head (fe33bda).

Additional details and impacted files 
@@             Coverage Diff             @@
##             4.19   #10322       +/-   ##
===========================================
+ Coverage        0   15.14%   +15.14%     
- Complexity      0    11300    +11300     
===========================================
  Files           0     5409     +5409     
  Lines           0   474627   +474627     
  Branches        0    57900    +57900     
===========================================
+ Hits            0    71883    +71883     
- Misses          0   394707   +394707     
- Partials        0     8037     +8037
Flag Coverage Δ
uitests 4.29% <ø> (?)
unittests 15.86% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@blueorangutan
Copy link

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 12324

@vishesh92
Copy link
Member Author

@blueorangutan test matrix

@blueorangutan
Copy link

@vishesh92 a [SL] Trillian-Jenkins matrix job (EL8 mgmt + EL8 KVM, Ubuntu22 mgmt + Ubuntu22 KVM, EL8 mgmt + VMware 7.0u3, EL9 mgmt + XCP-ng 8.2 ) has been kicked to run smoke tests

@blueorangutan
Copy link

[SF] Trillian test result (tid-12301)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 46562 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10322-t12301-kvm-ol8.zip
Smoke tests completed. 131 look OK, 2 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_01_invalid_upgrade_kubernetes_cluster Failure 122.51 test_kubernetes_clusters.py
test_02_upgrade_kubernetes_cluster Failure 123.45 test_kubernetes_clusters.py
test_03_deploy_and_scale_kubernetes_cluster Failure 132.11 test_kubernetes_clusters.py
test_04_autoscale_kubernetes_cluster Failure 133.97 test_kubernetes_clusters.py
test_05_basic_lifecycle_kubernetes_cluster Failure 121.19 test_kubernetes_clusters.py
test_06_delete_kubernetes_cluster Failure 128.81 test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster Failure 187.27 test_kubernetes_clusters.py
test_10_vpc_tier_kubernetes_cluster Failure 136.96 test_kubernetes_clusters.py
test_01_secure_vm_migration Error 135.75 test_vm_life_cycle.py
test_01_secure_vm_migration Error 135.75 test_vm_life_cycle.py
test_10_attachAndDetach_iso Error 6.44 test_vm_life_cycle.py
test_12_start_vm_multiple_volumes_allocated Error 17.29 test_vm_life_cycle.py

@blueorangutan
Copy link

[SF] Trillian test result (tid-12303)
Environment: vmware-70u3 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 52728 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10322-t12303-vmware-70u3.zip
Smoke tests completed. 131 look OK, 2 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80 Error 538.07 test_internal_lb.py
test_12_start_vm_multiple_volumes_allocated Error 17.08 test_vm_life_cycle.py

@blueorangutan
Copy link

[SF] Trillian test result (tid-12302)
Environment: kvm-ubuntu22 (x2), Advanced Networking with Mgmt server u22
Total time taken: 57154 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10322-t12302-kvm-ubuntu22.zip
Smoke tests completed. 130 look OK, 3 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_01_invalid_upgrade_kubernetes_cluster Failure 142.90 test_kubernetes_clusters.py
test_02_upgrade_kubernetes_cluster Failure 142.14 test_kubernetes_clusters.py
test_03_deploy_and_scale_kubernetes_cluster Failure 140.50 test_kubernetes_clusters.py
test_04_autoscale_kubernetes_cluster Failure 143.91 test_kubernetes_clusters.py
test_05_basic_lifecycle_kubernetes_cluster Failure 145.23 test_kubernetes_clusters.py
test_06_delete_kubernetes_cluster Failure 144.79 test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster Failure 223.96 test_kubernetes_clusters.py
test_10_vpc_tier_kubernetes_cluster Failure 161.56 test_kubernetes_clusters.py
test_10_attachAndDetach_iso Error 6.44 test_vm_life_cycle.py
test_12_start_vm_multiple_volumes_allocated Error 14.09 test_vm_life_cycle.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL Failure 423.97 test_vpc_redundant.py

@blueorangutan
Copy link

[SF] Trillian test result (tid-12304)
Environment: xcpng82 (x2), Advanced Networking with Mgmt server ol9
Total time taken: 68023 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10322-t12304-xcpng82.zip
Smoke tests completed. 129 look OK, 4 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_01_condensed_drs_algorithm Failure 173.70 test_cluster_drs.py
test_02_balanced_drs_algorithm Failure 159.44 test_cluster_drs.py
test_01_invalid_upgrade_kubernetes_cluster Failure 232.33 test_kubernetes_clusters.py
test_02_upgrade_kubernetes_cluster Failure 220.21 test_kubernetes_clusters.py
test_03_deploy_and_scale_kubernetes_cluster Failure 238.54 test_kubernetes_clusters.py
test_04_autoscale_kubernetes_cluster Failure 216.95 test_kubernetes_clusters.py
test_05_basic_lifecycle_kubernetes_cluster Failure 234.70 test_kubernetes_clusters.py
test_06_delete_kubernetes_cluster Failure 231.96 test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster Failure 352.32 test_kubernetes_clusters.py
test_10_vpc_tier_kubernetes_cluster Failure 256.30 test_kubernetes_clusters.py
test_01_non_strict_host_anti_affinity Error 220.82 test_nonstrict_affinity_group.py
test_02_non_strict_host_affinity Error 117.54 test_nonstrict_affinity_group.py
test_10_attachAndDetach_iso Error 9.46 test_vm_life_cycle.py
test_12_start_vm_multiple_volumes_allocated Error 16.24 test_vm_life_cycle.py

@DaanHoogland DaanHoogland mentioned this pull request Feb 5, 2025
Merged
@vishesh92
Copy link
Member Author

@blueorangutan test matrix

@blueorangutan
Copy link

@vishesh92 a [SL] Trillian-Jenkins matrix job (EL8 mgmt + EL8 KVM, Ubuntu22 mgmt + Ubuntu22 KVM, EL8 mgmt + VMware 7.0u3, EL9 mgmt + XCP-ng 8.2 ) has been kicked to run smoke tests

@weizhouapache
Copy link
Member

might CKS clusters be impacted by this PR ?

@DaanHoogland DaanHoogland added this to the 4.19.3 milestone Feb 6, 2025
@blueorangutan
Copy link

[SF] Trillian test result (tid-12323)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 45965 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10322-t12323-kvm-ol8.zip
Smoke tests completed. 131 look OK, 2 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_01_invalid_upgrade_kubernetes_cluster Failure 105.44 test_kubernetes_clusters.py
test_02_upgrade_kubernetes_cluster Failure 103.65 test_kubernetes_clusters.py
test_03_deploy_and_scale_kubernetes_cluster Failure 102.17 test_kubernetes_clusters.py
test_04_autoscale_kubernetes_cluster Failure 109.82 test_kubernetes_clusters.py
test_05_basic_lifecycle_kubernetes_cluster Failure 102.88 test_kubernetes_clusters.py
test_06_delete_kubernetes_cluster Failure 105.57 test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster Failure 158.19 test_kubernetes_clusters.py
test_10_vpc_tier_kubernetes_cluster Failure 122.25 test_kubernetes_clusters.py
test_01_secure_vm_migration Error 368.41 test_vm_life_cycle.py
test_10_attachAndDetach_iso Error 6.34 test_vm_life_cycle.py
test_12_start_vm_multiple_volumes_allocated Error 15.34 test_vm_life_cycle.py

@blueorangutan
Copy link

[SF] Trillian test result (tid-12325)
Environment: vmware-70u3 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 49614 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10322-t12325-vmware-70u3.zip
Smoke tests completed. 132 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_12_start_vm_multiple_volumes_allocated Error 16.11 test_vm_life_cycle.py

@blueorangutan
Copy link

[SF] Trillian test result (tid-12324)
Environment: kvm-ubuntu22 (x2), Advanced Networking with Mgmt server u22
Total time taken: 51680 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10322-t12324-kvm-ubuntu22.zip
Smoke tests completed. 131 look OK, 2 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_01_invalid_upgrade_kubernetes_cluster Failure 140.61 test_kubernetes_clusters.py
test_02_upgrade_kubernetes_cluster Failure 144.54 test_kubernetes_clusters.py
test_03_deploy_and_scale_kubernetes_cluster Failure 153.18 test_kubernetes_clusters.py
test_04_autoscale_kubernetes_cluster Failure 144.44 test_kubernetes_clusters.py
test_05_basic_lifecycle_kubernetes_cluster Failure 147.57 test_kubernetes_clusters.py
test_06_delete_kubernetes_cluster Failure 144.46 test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster Failure 225.82 test_kubernetes_clusters.py
test_10_vpc_tier_kubernetes_cluster Failure 153.78 test_kubernetes_clusters.py
test_10_attachAndDetach_iso Error 6.27 test_vm_life_cycle.py
test_12_start_vm_multiple_volumes_allocated Error 20.29 test_vm_life_cycle.py

@blueorangutan
Copy link

[SF] Trillian test result (tid-12326)
Environment: xcpng82 (x2), Advanced Networking with Mgmt server ol9
Total time taken: 67734 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10322-t12326-xcpng82.zip
Smoke tests completed. 129 look OK, 4 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_01_condensed_drs_algorithm Failure 165.03 test_cluster_drs.py
test_02_balanced_drs_algorithm Failure 192.07 test_cluster_drs.py
test_01_invalid_upgrade_kubernetes_cluster Failure 218.15 test_kubernetes_clusters.py
test_02_upgrade_kubernetes_cluster Failure 215.31 test_kubernetes_clusters.py
test_03_deploy_and_scale_kubernetes_cluster Failure 247.47 test_kubernetes_clusters.py
test_04_autoscale_kubernetes_cluster Failure 196.38 test_kubernetes_clusters.py
test_05_basic_lifecycle_kubernetes_cluster Failure 193.28 test_kubernetes_clusters.py
test_06_delete_kubernetes_cluster Failure 197.33 test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster Failure 325.38 test_kubernetes_clusters.py
test_10_vpc_tier_kubernetes_cluster Failure 248.24 test_kubernetes_clusters.py
test_01_non_strict_host_anti_affinity Error 213.51 test_nonstrict_affinity_group.py
test_02_non_strict_host_affinity Error 126.48 test_nonstrict_affinity_group.py
test_10_attachAndDetach_iso Error 9.39 test_vm_life_cycle.py
test_12_start_vm_multiple_volumes_allocated Error 16.52 test_vm_life_cycle.py

@vishesh92
Copy link
Member Author

@blueorangutan package

@blueorangutan
Copy link

@vishesh92 a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@blueorangutan
Copy link

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 12373

@vishesh92
Copy link
Member Author

@blueorangutan test matrix

@blueorangutan
Copy link

@vishesh92 a [SL] Trillian-Jenkins matrix job (EL8 mgmt + EL8 KVM, Ubuntu22 mgmt + Ubuntu22 KVM, EL8 mgmt + VMware 7.0u3, EL9 mgmt + XCP-ng 8.2 ) has been kicked to run smoke tests

@blueorangutan
Copy link

[SF] Trillian test result (tid-12353)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 46571 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10322-t12353-kvm-ol8.zip
Smoke tests completed. 131 look OK, 2 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_01_invalid_upgrade_kubernetes_cluster Failure 119.95 test_kubernetes_clusters.py
test_02_upgrade_kubernetes_cluster Failure 111.01 test_kubernetes_clusters.py
test_03_deploy_and_scale_kubernetes_cluster Failure 119.26 test_kubernetes_clusters.py
test_04_autoscale_kubernetes_cluster Failure 221.60 test_kubernetes_clusters.py
test_05_basic_lifecycle_kubernetes_cluster Failure 116.19 test_kubernetes_clusters.py
test_06_delete_kubernetes_cluster Failure 109.16 test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster Failure 172.99 test_kubernetes_clusters.py
test_10_vpc_tier_kubernetes_cluster Failure 124.20 test_kubernetes_clusters.py
test_10_attachAndDetach_iso Error 6.36 test_vm_life_cycle.py

@blueorangutan
Copy link

[SF] Trillian test result (tid-12355)
Environment: vmware-70u3 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 49207 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10322-t12355-vmware-70u3.zip
Smoke tests completed. 132 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_08_arping_in_ssvm Failure 5.25 test_diagnostics.py

@blueorangutan
Copy link

[SF] Trillian test result (tid-12354)
Environment: kvm-ubuntu22 (x2), Advanced Networking with Mgmt server u22
Total time taken: 58640 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10322-t12354-kvm-ubuntu22.zip
Smoke tests completed. 131 look OK, 2 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_01_invalid_upgrade_kubernetes_cluster Failure 127.89 test_kubernetes_clusters.py
test_02_upgrade_kubernetes_cluster Failure 126.79 test_kubernetes_clusters.py
test_03_deploy_and_scale_kubernetes_cluster Failure 127.82 test_kubernetes_clusters.py
test_04_autoscale_kubernetes_cluster Failure 129.95 test_kubernetes_clusters.py
test_05_basic_lifecycle_kubernetes_cluster Failure 125.83 test_kubernetes_clusters.py
test_06_delete_kubernetes_cluster Failure 130.00 test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster Failure 199.63 test_kubernetes_clusters.py
test_10_vpc_tier_kubernetes_cluster Failure 135.59 test_kubernetes_clusters.py
test_04_nonsecured_to_secured_vm_migration Error 3749.54 test_vm_life_cycle.py
test_10_attachAndDetach_iso Error 6.36 test_vm_life_cycle.py

@blueorangutan
Copy link

[SF] Trillian test result (tid-12356)
Environment: xcpng82 (x2), Advanced Networking with Mgmt server ol9
Total time taken: 65894 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10322-t12356-xcpng82.zip
Smoke tests completed. 129 look OK, 4 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_01_condensed_drs_algorithm Failure 164.25 test_cluster_drs.py
test_02_balanced_drs_algorithm Failure 177.93 test_cluster_drs.py
test_01_invalid_upgrade_kubernetes_cluster Failure 217.32 test_kubernetes_clusters.py
test_02_upgrade_kubernetes_cluster Failure 211.78 test_kubernetes_clusters.py
test_03_deploy_and_scale_kubernetes_cluster Failure 215.19 test_kubernetes_clusters.py
test_04_autoscale_kubernetes_cluster Failure 213.99 test_kubernetes_clusters.py
test_05_basic_lifecycle_kubernetes_cluster Failure 219.42 test_kubernetes_clusters.py
test_06_delete_kubernetes_cluster Failure 235.75 test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster Failure 320.29 test_kubernetes_clusters.py
test_10_vpc_tier_kubernetes_cluster Failure 270.58 test_kubernetes_clusters.py
test_01_non_strict_host_anti_affinity Error 226.04 test_nonstrict_affinity_group.py
test_02_non_strict_host_affinity Error 127.12 test_nonstrict_affinity_group.py
test_10_attachAndDetach_iso Error 9.38 test_vm_life_cycle.py

@vishesh92 vishesh92 marked this pull request as draft February 13, 2025 11:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
4.19.3
Development

Successfully merging this pull request may close these issues.

ConfigDrive functionality broken for Xen/XCP-Ng
4 participants
@vishesh92 @blueorangutan @weizhouapache @DaanHoogland