Skip to content

misc: fix spelling - #8272

Open
jbampton wants to merge 6 commits into
apache:mainfrom
jbampton:fix-spelling
Open

jbampton wants to merge 6 commits into
apache:mainfrom
jbampton:fix-spelling

Conversation

@jbampton

Copy link
Copy Markdown
Member

Description

This PR fixes spelling

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

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?

@codecov

codecov Bot commented Nov 27, 2023 •

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 14.75410% with 52 lines in your changes missing coverage. Please review.
✅ Project coverage is 20.78%. Comparing base (f2ee0b7) to head (09167c1).
⚠️ Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
.../xenserver/resource/XenServerStorageProcessor.java 0.00% 9 Missing ⚠️
...e/resource/StorageSubsystemCommandHandlerBase.java 0.00% 4 Missing and 1 partial ⚠️
...ud/hypervisor/kvm/storage/KVMStorageProcessor.java 0.00% 4 Missing ⚠️
...n/java/com/cloud/vm/VirtualMachineManagerImpl.java 0.00% 3 Missing ⚠️
...oud/hypervisor/kvm/storage/KVMStorageResource.java 0.00% 3 Missing ⚠️
...storage/cache/manager/StorageCacheManagerImpl.java 0.00% 2 Missing ⚠️
...cloud/storage/resource/VmwareStorageProcessor.java 0.00% 2 Missing ⚠️
...e/cloudstack/network/guru/SspGuestNetworkGuru.java 0.00% 2 Missing ⚠️
...n/java/com/cloud/template/TemplateManagerImpl.java 0.00% 2 Missing ⚠️
.../src/main/java/com/cloud/vm/UserVmManagerImpl.java 0.00% 2 Missing ⚠️
... and 18 more
Additional details and impacted files
@@             Coverage Diff              @@
##               main    #8272      +/-   ##
============================================
- Coverage     20.78%   20.78%   -0.01%     
  Complexity    20858    20858              
============================================
  Files          6053     6053              
  Lines        548230   548230              
  Branches      73237    78410    +5173     
============================================
- Hits         113927   113926       -1     
- Misses       420955   420956       +1     
  Partials      13348    13348              
Flag Coverage Δ
uitests 3.86% <ø> (ø)
unittests 22.21% <14.75%> (-0.01%) ⬇️

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

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@jbampton

Copy link
Copy Markdown
Member Author

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@jbampton 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
Copy Markdown

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

@shwstppr

Copy link
Copy Markdown
Contributor

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

@shwstppr a [SL] Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@DaanHoogland DaanHoogland left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I see nothing only good language corrections here but I have two issues with the change as a whole:

  1. I see some corrections in commented and possibly dead code. Those should be handled by removing them
  2. I see some variable on interfaces of the system, that might give unexpected results either during or after upgrades. I'd like to see those extracted to separate commits, to facilitate testing and trouble shooting.

@blueorangutan

Copy link
Copy Markdown

[SF] Trillian test result (tid-8405)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 46063 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr8272-t8405-kvm-centos7.zip
Smoke tests completed. 117 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_02_upgrade_kubernetes_cluster Failure 560.41 test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster Failure 613.46 test_kubernetes_clusters.py

@github-actions

github-actions Bot commented Dec 7, 2023

Copy link
Copy Markdown

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

@andrijapanicsb

Copy link
Copy Markdown
Contributor

@jbampton I merged the current main into your branch to clear the conflicts (a merge commit on top, nothing rewritten or force-pushed). Where both sides changed the same line I kept the code from main and re-applied your spelling fix on it, including the Dettach... to Detach... renames. The touched modules compile and their unit tests pass locally.

@jbampton

Copy link
Copy Markdown
Member Author

Thanks @andrijapanicsb for clearing the conflicts 👍

@DaanHoogland

Copy link
Copy Markdown
Contributor

since code has changed at least a new run of smoke tests are in order.

@DaanHoogland

Copy link
Copy Markdown
Contributor

@blueorangutan package

@DaanHoogland

Copy link
Copy Markdown
Contributor

@jbampton , is this ready for what you are concerned?

@andrijapanicsb
andrijapanicsb marked this pull request as ready for review November 16, 2026 14:47

@andrijapanicsb andrijapanicsb left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

Not sure why I'm reviewing my own work; that never ends up well...

But, for reference, conflicts are solved as in the attached file.

pr8272-conflict-resolution.md

@andrijapanicsb

Copy link
Copy Markdown
Contributor

You have to shout to tell him
@blueorangutan package

@andrijapanicsb andrijapanicsb modified the milestones: 25.0, 24.0 Nov 16, 2026
@blueorangutan

Copy link
Copy Markdown

@andrijapanicsb a [SL] Jenkins job has been kicked to build packages. It will be bundled with no SystemVM templates. I'll keep you posted as I make progress.

@blueorangutan

Copy link
Copy Markdown

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

@jbampton

Copy link
Copy Markdown
Member Author

Thanks everyone for addressing this issue / PR and for fixing the conflicts.

I can see it was mid August when I wrote my "remark" my own fault sorry for that I had recently broken my back.

Not much has happened here since.

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: conflict/waiting

Development

Successfully merging this pull request may close these issues.

7 participants