systemvm: export $TYPE before patching ssvm/cpvm #2855

yadvr · 2018-09-19T17:00:31Z

This fixes a regression introduced in #2799, by exporting $TYPE
before the patch is called to patch/extract archives for ssvm/cpvm.

See comment: https://github.com/apache/cloudstack/pull/2799/files#r218825730

Note: the fix is in cloud-early-config, so we can simply rebuild a new 4.11.2 systemvmtemplate and still continue testing 4.11.2.0 RC1 for end of the week if there are more issues/bugs and try to cut RC2 next week. /cc @PaulAngus

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)

How Has This Been Tested?

Checklist:

I have read the CONTRIBUTING document.
My code follows the code style of this project.
My change requires a change to the documentation.
I have updated the documentation accordingly.
Testing
I have added tests to cover my changes.
All relevant new and existing integration tests have passed.
A full integration testsuite with all test that can run on my environment has passed.

This fixes a regression introduced in apache#2799, by exporting $TYPE before the `patch` is called to patch/extract archives for ssvm/cpvm. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

yadvr · 2018-09-19T17:00:51Z

@blueorangutan package

blueorangutan · 2018-09-19T17:01:00Z

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2018-09-19T17:47:44Z

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2306

yadvr · 2018-09-19T18:18:56Z

@blueorangutan test matrix

blueorangutan · 2018-09-19T18:19:27Z

@rhtyd a Trillian-Jenkins matrix job (centos6 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

blueorangutan · 2018-09-20T03:07:08Z

Trillian test result (tid-3026)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 28068 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2855-t3026-xenserver-71.zip
Intermittent failure detected: /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py
Intermittent failure detected: /marvin/tests/smoke/test_public_ip_range.py
Intermittent failure detected: /marvin/tests/smoke/test_scale_vm.py
Intermittent failure detected: /marvin/tests/smoke/test_templates.py
Intermittent failure detected: /marvin/tests/smoke/test_usage.py
Intermittent failure detected: /marvin/tests/smoke/test_volumes.py
Smoke tests completed. 62 look OK, 5 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
ContextSuite context=TestDeployVirtioSCSIVM>:teardown	`Error`	0.00	test_deploy_virtio_scsi_vm.py
test_01_scale_vm	`Error`	13.60	test_scale_vm.py
test_04_extract_template	`Failure`	128.41	test_templates.py
ContextSuite context=TestISOUsage>:setup	`Error`	0.00	test_usage.py
test_01_volume_usage	`Failure`	667.76	test_usage.py
test_06_download_detached_volume	`Failure`	146.15	test_volumes.py

blueorangutan · 2018-09-20T03:28:43Z

Trillian test result (tid-3028)
Environment: vmware-65 (x2), Advanced Networking with Mgmt server 7
Total time taken: 28225 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2855-t3028-vmware-65.zip
Intermittent failure detected: /marvin/tests/smoke/test_deploy_vgpu_enabled_vm.py
Intermittent failure detected: /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Smoke tests completed. 66 look OK, 1 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
ContextSuite context=TestDeployVirtioSCSIVM>:teardown	`Error`	0.00	test_deploy_virtio_scsi_vm.py

blueorangutan · 2018-09-20T03:47:25Z

Trillian test result (tid-3027)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 30774 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2855-t3027-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermittent failure detected: /marvin/tests/smoke/test_public_ip_range.py
Intermittent failure detected: /marvin/tests/smoke/test_ssvm.py
Intermittent failure detected: /marvin/tests/smoke/test_templates.py
Intermittent failure detected: /marvin/tests/smoke/test_usage.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermittent failure detected: /marvin/tests/smoke/test_volumes.py
Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 62 look OK, 5 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_03_vpc_privategw_restart_vpc_cleanup	`Failure`	1123.78	test_privategw_acl.py
test_04_extract_template	`Failure`	128.41	test_templates.py
ContextSuite context=TestISOUsage>:setup	`Error`	0.00	test_usage.py
test_06_download_detached_volume	`Failure`	137.85	test_volumes.py
test_hostha_enable_ha_when_host_in_maintenance	`Error`	2.84	test_hostha_kvm.py

GabrielBrascher

Code LGTM.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

yadvr · 2018-09-20T08:36:42Z

@blueorangutan package

blueorangutan · 2018-09-20T08:37:03Z

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

fmaximus · 2018-09-20T09:04:26Z

Another issue is present in postinit.sh. There the $CMDLINE variable isn't set, causing $TYPE to be empty. This causes cmdline.json not to be run, causing #2854.

blueorangutan · 2018-09-20T09:07:56Z

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2311

fmaximus

Current changes are OK, but an extra fix is needed:
Add CMDLINE=/var/cache/cloud/cmdline to postinit.sh

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

yadvr · 2018-09-20T09:40:44Z

Thanks @fmaximus good spot, fixed now.
@blueorangutan package

blueorangutan · 2018-09-20T09:42:05Z

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

wido

Code LGTM

blueorangutan · 2018-09-20T10:13:25Z

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2313

yadvr · 2018-09-20T10:19:41Z

@blueorangutan test

blueorangutan · 2018-09-20T10:20:03Z

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

Fixed Frank's reported issue.

smeetsr

LGTM, ran some tests internally with this code, verified it fixes issue #2854 as well.

blueorangutan · 2018-09-20T21:38:39Z

Trillian test result (tid-3035)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 38818 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2855-t3035-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermittent failure detected: /marvin/tests/smoke/test_public_ip_range.py
Intermittent failure detected: /marvin/tests/smoke/test_templates.py
Intermittent failure detected: /marvin/tests/smoke/test_usage.py
Intermittent failure detected: /marvin/tests/smoke/test_volumes.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 62 look OK, 5 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_02_vpc_privategw_static_routes	`Failure`	163.20	test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup	`Failure`	1182.61	test_privategw_acl.py
test_04_extract_template	`Failure`	128.35	test_templates.py
ContextSuite context=TestISOUsage>:setup	`Error`	0.00	test_usage.py
test_06_download_detached_volume	`Failure`	138.59	test_volumes.py
test_hostha_enable_ha_when_host_in_maintenance	`Error`	3.51	test_hostha_kvm.py

yadvr · 2018-09-20T21:39:23Z

@blueorangutan test

blueorangutan · 2018-09-20T21:40:05Z

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

blueorangutan · 2018-09-21T03:55:28Z

Trillian test result (tid-3036)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 20745 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2855-t3036-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 66 look OK, 1 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_03_vpc_privategw_restart_vpc_cleanup	`Failure`	1099.55	test_privategw_acl.py

yadvr · 2018-09-21T08:49:03Z

test LGTM. Will merge based on reviews and testing. This will make into rc2.

yadvr · 2018-09-21T08:50:47Z

FYI - the 4.11.2 systemvmtemplate for testing are here: http://packages.shapeblue.com/testing/systemvm/

systemvm: export $TYPE before patching ssvm/cpvm

dde260a

This fixes a regression introduced in apache#2799, by exporting $TYPE before the `patch` is called to patch/extract archives for ssvm/cpvm. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

yadvr added Severity:BLOCKER component:systemvm-template labels Sep 19, 2018

yadvr added this to the 4.11.2.0 milestone Sep 19, 2018

yadvr requested review from DaanHoogland, GabrielBrascher, PaulAngus, fmaximus, rafaelweingartner and wido September 19, 2018 17:00

yadvr mentioned this pull request Sep 19, 2018

systemvmtemplate: new 4.11.2 template and fixes #2799

Merged

12 tasks

DaanHoogland approved these changes Sep 19, 2018

View reviewed changes

GabrielBrascher approved these changes Sep 20, 2018

View reviewed changes

update checksums and version

451bc45

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

fmaximus previously requested changes Sep 20, 2018

View reviewed changes

fix CMDLINE in postinit.sh

31187cd

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

wido approved these changes Sep 20, 2018

View reviewed changes

smeetsr approved these changes Sep 20, 2018

View reviewed changes

fmaximus approved these changes Sep 20, 2018

View reviewed changes

yadvr merged commit 70dbfa7 into apache:4.11 Sep 21, 2018

yadvr mentioned this pull request Sep 21, 2018

VR is not reachable from VM on port 8080 to get password #2854

Closed

systemvm: export $TYPE before patching ssvm/cpvm #2855

systemvm: export $TYPE before patching ssvm/cpvm #2855

Uh oh!

Conversation

yadvr commented Sep 19, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Types of changes

How Has This Been Tested?

Checklist:

Uh oh!

yadvr commented Sep 19, 2018

Uh oh!

blueorangutan commented Sep 19, 2018

Uh oh!

blueorangutan commented Sep 19, 2018

Uh oh!

yadvr commented Sep 19, 2018

Uh oh!

blueorangutan commented Sep 19, 2018

Uh oh!

blueorangutan commented Sep 20, 2018

Uh oh!

blueorangutan commented Sep 20, 2018

Uh oh!

blueorangutan commented Sep 20, 2018

Uh oh!

GabrielBrascher left a comment

Choose a reason for hiding this comment

Uh oh!

yadvr commented Sep 20, 2018

Uh oh!

blueorangutan commented Sep 20, 2018

Uh oh!

fmaximus commented Sep 20, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

blueorangutan commented Sep 20, 2018

Uh oh!

fmaximus left a comment

Choose a reason for hiding this comment

Uh oh!

yadvr commented Sep 20, 2018

Uh oh!

blueorangutan commented Sep 20, 2018

Uh oh!

wido left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Sep 20, 2018

Uh oh!

yadvr commented Sep 20, 2018

Uh oh!

blueorangutan commented Sep 20, 2018

Uh oh!

smeetsr left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Sep 20, 2018

Uh oh!

yadvr commented Sep 20, 2018

Uh oh!

blueorangutan commented Sep 20, 2018

Uh oh!

blueorangutan commented Sep 21, 2018

Uh oh!

yadvr commented Sep 21, 2018

Uh oh!

yadvr commented Sep 21, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

yadvr commented Sep 19, 2018 •

edited

Loading

fmaximus commented Sep 20, 2018 •

edited

Loading