Skip to content

Console: upgrade noVNC from v1.2.0 to v1.4.0#7281

Merged
andrijapanicsb merged 5 commits intoapache:4.18from
weizhouapache:4.18-novnc-1.4.0
Apr 5, 2023
Merged

Console: upgrade noVNC from v1.2.0 to v1.4.0#7281
andrijapanicsb merged 5 commits intoapache:4.18from
weizhouapache:4.18-novnc-1.4.0

Conversation

@weizhouapache
Copy link
Copy Markdown
Member

Description

This PR upgrades the noVNC in ConsoleProxy VM from v1.2.0 to v1.4.0

Steps

  1. Create the patch by commands

    git clone -b v1.2.0 https://github.com/novnc/noVNC.git .
    git checkout v1.4.0
    git diff v1.2.0 >noVNC-v1.2.0-v1.4.0.patch

  2. Apply the patch by

    cd systemvm/agent/noVNC
    patch -p1 <noVNC-v1.2.0-v1.4.0.patch

  3. Fix conflicts

  4. Use png instead of svg in html/css

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)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Screenshots (if appropriate):

How Has This Been Tested?

1. Create the patch by commands

git clone -b v1.2.0 https://github.com/novnc/noVNC.git .
git checkout v1.4.0
git diff v1.2.0 >noVNC-v1.2.0-v1.4.0.patch

2. Apply the patch by

cd systemvm/agent/noVNC
patch -p1 <noVNC-v1.2.0-v1.4.0.patch
@weizhouapache
Copy link
Copy Markdown
Member Author

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

@weizhouapache a 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: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 5636

@codecov
Copy link
Copy Markdown

codecov bot commented Feb 23, 2023

Codecov Report

Merging #7281 (4c4351d) into 4.18 (a367049) will not change coverage.
The diff coverage is n/a.

❗ Current head 4c4351d differs from pull request most recent head 73078d8. Consider uploading reports for the commit 73078d8 to get more accurate results

@@            Coverage Diff            @@
##               4.18    #7281   +/-   ##
=========================================
  Coverage     12.69%   12.69%           
  Complexity     8655     8655           
=========================================
  Files          2716     2716           
  Lines        256112   256112           
  Branches      39926    39926           
=========================================
  Hits          32503    32503           
  Misses       219477   219477           
  Partials       4132     4132           

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@borisstoyanov
Copy link
Copy Markdown
Contributor

@blueorangutan help

@blueorangutan
Copy link
Copy Markdown

@borisstoyanov I understand these words: "help", "hello", "thanks", "package", "test"
Test command usage: test [mgmt os] [hypervisor] [keepEnv] [qemuEv]
Mgmt OS options: ['centos7', 'centos6', 'suse15', 'alma8', 'ubuntu18', 'ubuntu22', 'ubuntu20', 'rocky8', 'alma9']
Hypervisor options: ['kvm-centos6', 'kvm-centos7', 'kvm-rocky8', 'kvm-alma8', 'kvm-alma9', 'kvm-ubuntu18', 'kvm-ubuntu20', 'kvm-ubuntu22', 'kvm-suse15', 'vmware-55u3', 'vmware-60u2', 'vmware-65u2', 'vmware-67u3', 'vmware-70u1', 'vmware-70u2', 'vmware-70u3', 'xenserver-65sp1', 'xenserver-71', 'xenserver-74', 'xcpng74', 'xcpng76', 'xcpng80', 'xcpng81', 'xcpng82']
Note: when keepEnv is passed, you need to specify mgmt server os and hypervisor or use the matrix command.
when qemuEv is passed, it will deploy KVM hyperviosr hosts with qemu-kvm-ev, else it will default to stock qemu.
Package command usage: package [all(default value),kvm,xen,vmware,hyperv,ovm] - a comma separated list can be passed with package command to bundle the required hypervisor's systemVM templates. Not passing any argument will bundle all - kvm,xen and vmware templates.

Blessed contributors for kicking Trillian test jobs: ['rohityadavcloud', 'nvazquez', 'borisstoyanov', 'DaanHoogland', 'shwstppr', 'andrijapanicsb', 'rahulbcn27', 'davidjumani', 'harikrishna-patnala', 'vladimirpetrov', 'weizhouapache', 'NuxRo', 'mlsorensen']

@borisstoyanov
Copy link
Copy Markdown
Contributor

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

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

@sonarqubecloud
Copy link
Copy Markdown

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@blueorangutan
Copy link
Copy Markdown

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

Test Result Time (s) Test File
test_06_download_detached_volume Failure 301.76 test_volumes.py

@yadvr yadvr requested a review from davidjumani February 24, 2023 07:43
@yadvr yadvr added this to the 4.18.1.0 milestone Mar 1, 2023
Copy link
Copy Markdown
Contributor

@vladimirpetrov vladimirpetrov left a comment

Choose a reason for hiding this comment

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

LGTM based on manual testing. Tested upgrade from 4.18, virtual keys, hiding full screen button when not connected, API driver console access, secure KVM VNC connection. Virtual shift key is not working properly on KVM but it's not a regression - the same behavior is in 4.18.0.

Copy link
Copy Markdown
Member

@yadvr yadvr left a comment

Choose a reason for hiding this comment

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

Overall LGTM - @weizhouapache could you remove some folders/files that aren't necessary for novnc (such as the .github folder).

@yadvr yadvr changed the base branch from main to 4.18 April 5, 2023 06:33
@yadvr yadvr marked this pull request as ready for review April 5, 2023 06:33
@yadvr
Copy link
Copy Markdown
Member

yadvr commented Apr 5, 2023

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

@rohityadavcloud a 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: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 5862

@andrijapanicsb andrijapanicsb self-requested a review April 5, 2023 07:47
Copy link
Copy Markdown
Contributor

@andrijapanicsb andrijapanicsb left a comment

Choose a reason for hiding this comment

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

LGTM

(tested)

@andrijapanicsb andrijapanicsb merged commit 9e13042 into apache:4.18 Apr 5, 2023
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Apr 5, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

kishankavala pushed a commit to shapeblue/cloudstack that referenced this pull request Apr 13, 2023
* noVNC: apply noVNC-v1.2.0-v1.4.0.patch

1. Create the patch by commands

git clone -b v1.2.0 https://github.com/novnc/noVNC.git .
git checkout v1.4.0
git diff v1.2.0 >noVNC-v1.2.0-v1.4.0.patch

2. Apply the patch by

cd systemvm/agent/noVNC
patch -p1 <noVNC-v1.2.0-v1.4.0.patch

* noVNC: apply noVNC-v1.2.0-v1.4.0.patch part2

fix conflicts

* noVNC: svg to png

* noVNC: remove systemvm/agent/noVNC/tests/

* noVNC: remove systemvm/agent/noVNC/.github/
@weizhouapache weizhouapache deleted the 4.18-novnc-1.4.0 branch August 25, 2023 13:26
@vishesh92 vishesh92 mentioned this pull request Jul 2, 2025
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants