Skip to content

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

Merged
yadvr merged 3 commits into
apache:4.11from
shapeblue:systemvm-type-fix
Sep 21, 2018
Merged

systemvm: export $TYPE before patching ssvm/cpvm#2855
yadvr merged 3 commits into
apache:4.11from
shapeblue:systemvm-type-fix

Conversation

@yadvr

@yadvryadvr commented Sep 19, 2018

Copy link
Copy Markdown
Member

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

Copy link
Copy Markdown
MemberAuthor

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

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

@blueorangutan

Copy link
Copy Markdown

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

@yadvr

Copy link
Copy Markdown
MemberAuthor

@blueorangutan test matrix

@blueorangutan

Copy link
Copy Markdown

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

@blueorangutan

Copy link
Copy Markdown

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:

TestResultTime (s)Test File
ContextSuite context=TestDeployVirtioSCSIVM>:teardownError0.00test_deploy_virtio_scsi_vm.py
test_01_scale_vmError13.60test_scale_vm.py
test_04_extract_templateFailure128.41test_templates.py
ContextSuite context=TestISOUsage>:setupError0.00test_usage.py
test_01_volume_usageFailure667.76test_usage.py
test_06_download_detached_volumeFailure146.15test_volumes.py

@blueorangutan

Copy link
Copy Markdown

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:

TestResultTime (s)Test File
ContextSuite context=TestDeployVirtioSCSIVM>:teardownError0.00test_deploy_virtio_scsi_vm.py

@blueorangutan

Copy link
Copy Markdown

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:

TestResultTime (s)Test File
test_03_vpc_privategw_restart_vpc_cleanupFailure1123.78test_privategw_acl.py
test_04_extract_templateFailure128.41test_templates.py
ContextSuite context=TestISOUsage>:setupError0.00test_usage.py
test_06_download_detached_volumeFailure137.85test_volumes.py
test_hostha_enable_ha_when_host_in_maintenanceError2.84test_hostha_kvm.py

@GabrielBrascherGabrielBrascher left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Code LGTM.

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

Copy link
Copy Markdown
MemberAuthor

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

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

@fmaximus

fmaximus commented Sep 20, 2018

Copy link
Copy Markdown
Contributor

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

Copy link
Copy Markdown

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

fmaximus
fmaximus previously requested changes Sep 20, 2018

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

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

Copy link
Copy Markdown
MemberAuthor

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

@blueorangutan

Copy link
Copy Markdown

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

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

Code LGTM

@blueorangutan

Copy link
Copy Markdown

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

@yadvr

Copy link
Copy Markdown
MemberAuthor

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

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

@yadvr
yadvr dismissed fmaximus’s stale reviewSeptember 20, 2018 11:25

Fixed Frank's reported issue.

@smeetsrsmeetsr 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, ran some tests internally with this code, verified it fixes issue #2854 as well.

@blueorangutan

Copy link
Copy Markdown

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:

TestResultTime (s)Test File
test_02_vpc_privategw_static_routesFailure163.20test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanupFailure1182.61test_privategw_acl.py
test_04_extract_templateFailure128.35test_templates.py
ContextSuite context=TestISOUsage>:setupError0.00test_usage.py
test_06_download_detached_volumeFailure138.59test_volumes.py
test_hostha_enable_ha_when_host_in_maintenanceError3.51test_hostha_kvm.py

@yadvr

Copy link
Copy Markdown
MemberAuthor

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

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

@blueorangutan

Copy link
Copy Markdown

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:

TestResultTime (s)Test File
test_03_vpc_privategw_restart_vpc_cleanupFailure1099.55test_privategw_acl.py

@yadvr

Copy link
Copy Markdown
MemberAuthor

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

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

Copy link
Copy Markdown
MemberAuthor

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

Sign up for freeto 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.

7 participants

@yadvr@blueorangutan@fmaximus@wido@DaanHoogland@GabrielBrascher@smeetsr