integration test fixes for 4.18 #7190

DaanHoogland · 2023-02-10T08:58:53Z

Description

This PR...

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

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

DaanHoogland · 2023-02-10T09:22:32Z

@blueorangutan package

blueorangutan · 2023-02-10T09:23:03Z

@DaanHoogland 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.

test/integration/smoke/test_deploy_vm_extra_config_data.py

weizhouapache · 2023-02-10T10:09:27Z

test/integration/smoke/test_deploy_vm_extra_config_data.py

        updateConfigurationResponse = self.apiclient.updateConfiguration(updateConfigurationCmd)
        self.debug("updated the parameter %s with value %s" % (
            updateConfigurationResponse.name, updateConfigurationResponse.value))
+        self.cleanup = []


it is empty by default, right ?

yes, it is in this file only filled by deploy_vm()

weizhouapache

code lgtm

blueorangutan · 2023-02-10T10:15:35Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 5547

DaanHoogland · 2023-02-10T10:30:31Z

@blueorangutan package

blueorangutan · 2023-02-10T10:31:04Z

@DaanHoogland 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.

Co-authored-by: dahn <daan.hoogland@gmail.com>

blueorangutan · 2023-02-10T11:27:16Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 5552

DaanHoogland · 2023-02-10T12:23:45Z

@blueorangutan test matrix

blueorangutan · 2023-02-10T12:24:03Z

@DaanHoogland a Trillian-Jenkins matrix job (centos7 mgmt + xenserver71, rocky8 mgmt + vmware67u3, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

codecov · 2023-02-10T12:31:33Z

Codecov Report

Merging #7190 (2692fed) into main (23d8981) will increase coverage by 0.03%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #7190      +/-   ##
============================================
+ Coverage     12.63%   12.67%   +0.03%     
- Complexity     8613     8639      +26     
============================================
  Files          2711     2716       +5     
  Lines        255752   256112     +360     
  Branches      39873    39926      +53     
============================================
+ Hits          32325    32456     +131     
- Misses       219320   219528     +208     
- Partials       4107     4128      +21

Impacted Files	Coverage Δ
...ma/src/main/java/com/cloud/user/UserAccountVO.java	`46.31% <0.00%> (-4.94%)`	⬇️
...ne/schema/src/main/java/com/cloud/user/UserVO.java	`42.85% <0.00%> (-4.02%)`	⬇️
...om/cloud/api/query/dao/UserAccountJoinDaoImpl.java	`20.00% <0.00%> (-1.74%)`	⬇️
...java/com/cloud/api/query/vo/UserAccountJoinVO.java	`27.08% <0.00%> (-0.58%)`	⬇️
...loud/hypervisor/kvm/resource/VRouterVifDriver.java	`5.40% <0.00%> (-0.16%)`	⬇️
...ain/java/org/apache/cloudstack/saml/SAMLUtils.java	`64.80% <0.00%> (-0.14%)`	⬇️
server/src/main/java/com/cloud/api/ApiServer.java	`1.83% <0.00%> (-0.05%)`	⬇️
...in/java/com/cloud/server/ManagementServerImpl.java	`5.65% <0.00%> (-0.01%)`	⬇️
...java/com/cloud/agent/manager/AgentManagerImpl.java	`4.94% <0.00%> (-0.01%)`	⬇️
...ain/java/com/cloud/api/query/QueryManagerImpl.java	`2.95% <0.00%> (-0.01%)`	⬇️
... and 22 more

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

blueorangutan · 2023-02-10T12:46:06Z

Trillian Build Failed (tid-6153)

blueorangutan · 2023-02-11T01:11:26Z

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

Test	Result	Time (s)	Test File
test_02_deploy_vm_with_extraconfig_kvm	`Error`	38.53	test_deploy_vm_extra_config_data.py
test_03_update_vm_with_extraconfig_kvm	`Error`	132.82	test_deploy_vm_extra_config_data.py
test_01_deploy_vm_on_specific_host	`Error`	37.09	test_vm_deployment_planner.py
test_02_deploy_vm_on_specific_cluster	`Error`	4.32	test_vm_deployment_planner.py
test_03_deploy_vm_on_specific_pod	`Error`	5.38	test_vm_deployment_planner.py
test_04_deploy_vm_on_host_override_pod_and_cluster	`Error`	4.37	test_vm_deployment_planner.py
test_05_deploy_vm_on_cluster_override_pod	`Error`	4.33	test_vm_deployment_planner.py

blueorangutan · 2023-02-11T01:11:38Z

Trillian test result (tid-6154)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 44798 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7190-t6154-xenserver-71.zip
Smoke tests completed. 105 look OK, 2 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_07_deploy_vm_with_extraconfig_xenserver	`Error`	46.71	test_deploy_vm_extra_config_data.py
test_01_deploy_vm_on_specific_host	`Error`	10.43	test_vm_deployment_planner.py
test_02_deploy_vm_on_specific_cluster	`Error`	9.41	test_vm_deployment_planner.py
test_03_deploy_vm_on_specific_pod	`Error`	9.40	test_vm_deployment_planner.py
test_04_deploy_vm_on_host_override_pod_and_cluster	`Error`	11.41	test_vm_deployment_planner.py
test_05_deploy_vm_on_cluster_override_pod	`Error`	10.46	test_vm_deployment_planner.py

blueorangutan · 2023-02-11T01:47:21Z

Trillian test result (tid-6155)
Environment: vmware-67u3 (x2), Advanced Networking with Mgmt server r8
Total time taken: 46820 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7190-t6155-vmware-67u3.zip
Smoke tests completed. 105 look OK, 2 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_05_deploy_vm_with_extraconfig_vmware	`Error`	4.40	test_deploy_vm_extra_config_data.py
test_01_deploy_vm_on_specific_host	`Error`	11.69	test_vm_deployment_planner.py
test_02_deploy_vm_on_specific_cluster	`Error`	10.69	test_vm_deployment_planner.py
test_03_deploy_vm_on_specific_pod	`Error`	10.66	test_vm_deployment_planner.py
test_04_deploy_vm_on_host_override_pod_and_cluster	`Error`	12.66	test_vm_deployment_planner.py
test_05_deploy_vm_on_cluster_override_pod	`Error`	13.67	test_vm_deployment_planner.py

weizhouapache · 2023-02-12T12:34:50Z

@DaanHoogland
you need to create vm using VirtualMachine.create, or roll back all changes on deploy/destroy vm

DaanHoogland · 2023-02-13T10:41:44Z

@blueorangutan package

blueorangutan · 2023-02-13T10:42:04Z

@DaanHoogland 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.

This reverts commit 1d140bd.

DaanHoogland · 2023-02-13T11:15:24Z

@weizhouapache I reverted changes on test_vm_deployment_planner as the failures seem intemitted, and I don't see a reason. I reverted most changes on test_deploy_vm_extra_config_data, but added the possibility to call on the marvin object directly.

blueorangutan · 2023-02-13T11:35:29Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 5570

weizhouapache · 2023-02-13T11:48:03Z

@weizhouapache I reverted changes on test_vm_deployment_planner as the failures seem intemitted, and I don't see a reason. I reverted most changes on test_deploy_vm_extra_config_data, but added the possibility to call on the marvin object directly.

The vm, which is created by deployVirtualMachine.deployVirtualMachineCmd, cannot be cleaned up by tearDown class.
need to use VirtualMachine.create, like other tests, then it can be cleaned up in tearDown.

DaanHoogland · 2023-02-13T11:50:20Z

@weizhouapache I reverted changes on test_vm_deployment_planner as the failures seem intemitted, and I don't see a reason. I reverted most changes on test_deploy_vm_extra_config_data, but added the possibility to call on the marvin object directly.

The vm, which is created by deployVirtualMachine.deployVirtualMachineCmd, cannot be cleaned up by tearDown class. need to use VirtualMachine.create, like other tests, then it can be cleaned up in tearDown.

Yes, I realise that. I think that is a big change now, it got me some request signing errors trying. I want to merge as is.

sonarqubecloud · 2023-02-13T12:18:30Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
No Duplication information

nvazquez

Code LGTM, can we run a final round of tests?

DaanHoogland · 2023-02-13T14:41:25Z

@blueorangutan test

blueorangutan · 2023-02-13T14:42:03Z

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

blueorangutan · 2023-02-14T02:29:59Z

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

Test	Result	Time (s)	Test File

weizhouapache · 2023-02-14T07:20:06Z

Merging based on Simulator CI and Trillian test results

boring-cyborg bot added component:integration-test Python Warning... Python code Ahead! labels Feb 10, 2023

DaanHoogland commented Feb 10, 2023

View reviewed changes

test/integration/smoke/test_deploy_vm_extra_config_data.py Show resolved Hide resolved

DaanHoogland mentioned this pull request Feb 10, 2023

smoke test: fix test_deploy_vm_extra_config_data.py on kvm #7186

Closed

12 tasks

weizhouapache reviewed Feb 10, 2023

View reviewed changes

weizhouapache approved these changes Feb 10, 2023

View reviewed changes

DaanHoogland and others added 3 commits February 10, 2023 12:06

cleanup in resource housekeeping

ad99c77

cleanup in resource housekeeping

1d140bd

Update test/integration/smoke/test_deploy_vm_extra_config_data.py

73a9ec1

Co-authored-by: dahn <daan.hoogland@gmail.com>

DaanHoogland mentioned this pull request Feb 10, 2023

server: fix exception while list users with keyword #7169

Merged

12 tasks

DaanHoogland added this to the 4.18.0.0 milestone Feb 10, 2023

DaanHoogland force-pushed the testFixesFor4.18 branch from 4e53f7a to 73a9ec1 Compare February 13, 2023 10:16

revert most cleanup code

278d56d

Revert "cleanup in resource housekeeping"

c26ff09

This reverts commit 1d140bd.

add extra config to VirtualMachine.create(..)

2692fed

boring-cyborg bot added the component:marvin label Feb 13, 2023

DaanHoogland requested a review from weizhouapache February 13, 2023 11:15

weizhouapache approved these changes Feb 13, 2023

View reviewed changes

DaanHoogland marked this pull request as ready for review February 13, 2023 12:22

nvazquez approved these changes Feb 13, 2023

View reviewed changes

weizhouapache merged commit 597a803 into apache:main Feb 14, 2023

weizhouapache mentioned this pull request Mar 28, 2023

Fix ScaleVM to consider resize volume in any type of service offering #7359

Merged

12 tasks

integration test fixes for 4.18 #7190

integration test fixes for 4.18 #7190

Uh oh!

Conversation

DaanHoogland commented Feb 10, 2023

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

DaanHoogland commented Feb 10, 2023

Uh oh!

blueorangutan commented Feb 10, 2023

Uh oh!

Uh oh!

weizhouapache Feb 10, 2023

Choose a reason for hiding this comment

Uh oh!

DaanHoogland Feb 10, 2023

Choose a reason for hiding this comment

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Feb 10, 2023

Uh oh!

DaanHoogland commented Feb 10, 2023

Uh oh!

blueorangutan commented Feb 10, 2023

Uh oh!

blueorangutan commented Feb 10, 2023

Uh oh!

DaanHoogland commented Feb 10, 2023

Uh oh!

blueorangutan commented Feb 10, 2023

Uh oh!

codecov bot commented Feb 10, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

blueorangutan commented Feb 10, 2023

Uh oh!

blueorangutan commented Feb 11, 2023

Uh oh!

blueorangutan commented Feb 11, 2023

Uh oh!

blueorangutan commented Feb 11, 2023

Uh oh!

weizhouapache commented Feb 12, 2023

Uh oh!

DaanHoogland commented Feb 13, 2023

Uh oh!

blueorangutan commented Feb 13, 2023

Uh oh!

DaanHoogland commented Feb 13, 2023

Uh oh!

blueorangutan commented Feb 13, 2023

Uh oh!

weizhouapache commented Feb 13, 2023

Uh oh!

DaanHoogland commented Feb 13, 2023

Uh oh!

sonarqubecloud bot commented Feb 13, 2023

Uh oh!

nvazquez left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented Feb 13, 2023

Uh oh!

blueorangutan commented Feb 13, 2023

Uh oh!

blueorangutan commented Feb 14, 2023

Uh oh!

weizhouapache commented Feb 14, 2023

Uh oh!

Reviewers

Assignees

codecov bot commented Feb 10, 2023 •

edited

Loading