New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove deprecated tomcat configuration file instead of moving it, sin… #2538

Merged
merged 3 commits into from Apr 9, 2018

Conversation

Projects
None yet
6 participants
@ernjvr
Contributor

ernjvr commented Apr 6, 2018

…ce moving it prevented the 4.11 upgrade from overwriting it with the new jetty configurations. Also added systemctl daemon-reload to refresh daemon services so that management server can start up seamlessly after the upgrade.

Description

This fixes #2537

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)

Screenshots (if appropriate):

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.

@blueorangutan package

Remove deprecated tomcat configuration file instead of moving it, sin…
…ce moving it prevented the 4.11 upgrade from overwriting it with the new jetty configurations. Also added systemctl daemon-reload to refresh daemon services so that management server can start up seamlessly after the upgrade.
@blueorangutan

This comment has been minimized.

blueorangutan commented Apr 6, 2018

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

@DaanHoogland DaanHoogland requested review from wido and rhtyd Apr 6, 2018

@blueorangutan

This comment has been minimized.

blueorangutan commented Apr 6, 2018

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

@ernjvr

This comment has been minimized.

Contributor

ernjvr commented Apr 6, 2018

@blueorangutan

This comment has been minimized.

blueorangutan commented Apr 6, 2018

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

@ernjvr

This comment has been minimized.

Contributor

ernjvr commented Apr 6, 2018

Manually tested the upgrade from 4.6 to 4.11 and verified:

  • /etc/sysconfig/cloudstack-management file has been removed
  • /etc/default/management-server has the correct version 4.11 configurations
  • management server starts successfully
  • UI login is successful
  • all VMs started successfully
@blueorangutan

This comment has been minimized.

blueorangutan commented Apr 7, 2018

Trillian test result (tid-2469)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 85656 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2538-t2469-kvm-centos7.zip
Intermitten failure detected: /marvin/tests/smoke/test_routers.py
Intermitten 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_04_restart_network_wo_cleanup Failure 4.06 test_routers.py
@rhtyd

rhtyd approved these changes Apr 7, 2018

LGTM, @ernjvr can you do the same for centos6/el6 spec?

@wido

wido approved these changes Apr 9, 2018

LGTM

@rhtyd

rhtyd approved these changes Apr 9, 2018

LGTM

@rhtyd

This comment has been minimized.

Member

rhtyd commented Apr 9, 2018

@blueorangutan package

@blueorangutan

This comment has been minimized.

blueorangutan commented Apr 9, 2018

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

chown -R cloud:cloud /var/log/cloudstack/management
systemctl daemon-reload

This comment has been minimized.

@rhtyd

rhtyd Apr 9, 2018

Member

@ernjvr remove the systemctl thing, CentOS6/el6 does not have systemd. No need to reload anything here. Rest is LGTM.

@blueorangutan

This comment has been minimized.

blueorangutan commented Apr 9, 2018

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

@ernjvr

This comment has been minimized.

Contributor

ernjvr commented Apr 9, 2018

@blueorangutan package

@blueorangutan

This comment has been minimized.

blueorangutan commented Apr 9, 2018

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

@blueorangutan

This comment has been minimized.

blueorangutan commented Apr 9, 2018

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

@ernjvr

This comment has been minimized.

Contributor

ernjvr commented Apr 9, 2018

@blueorangutan

This comment has been minimized.

blueorangutan commented Apr 9, 2018

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

@rhtyd

This comment has been minimized.

Member

rhtyd commented Apr 9, 2018

LGTM, travis okay. I'll merge this.

@rhtyd rhtyd merged commit bb09caf into apache:4.11 Apr 9, 2018

2 checks passed

Jenkins This pull request looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@blueorangutan

This comment has been minimized.

blueorangutan commented Apr 10, 2018

Trillian test result (tid-2476)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 47921 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2538-t2476-kvm-centos7.zip
Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermitten failure detected: /marvin/tests/smoke/test_public_ip_range.py
Intermitten failure detected: /marvin/tests/smoke/test_reset_vm_on_reboot.py
Intermitten failure detected: /marvin/tests/smoke/test_router_dhcphosts.py
Intermitten failure detected: /marvin/tests/smoke/test_router_dns.py
Intermitten failure detected: /marvin/tests/smoke/test_router_dnsservice.py
Intermitten failure detected: /marvin/tests/smoke/test_routers_iptables_default_policy.py
Intermitten failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermitten failure detected: /marvin/tests/smoke/test_routers.py
Intermitten failure detected: /marvin/tests/smoke/test_secondary_storage.py
Intermitten failure detected: /marvin/tests/smoke/test_service_offerings.py
Intermitten failure detected: /marvin/tests/smoke/test_snapshots.py
Intermitten failure detected: /marvin/tests/smoke/test_ssvm.py
Intermitten failure detected: /marvin/tests/smoke/test_templates.py
Intermitten failure detected: /marvin/tests/smoke/test_usage.py
Intermitten failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermitten failure detected: /marvin/tests/smoke/test_vm_snapshots.py
Intermitten failure detected: /marvin/tests/smoke/test_volumes.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_router_nics.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Intermitten failure detected: /marvin/tests/smoke/test_host_maintenance.py
Intermitten failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 46 look OK, 21 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
ContextSuite context=TestResetVmOnReboot>:setup Error 0.00 test_reset_vm_on_reboot.py
ContextSuite context=TestRouterDHCPHosts>:setup Error 0.00 test_router_dhcphosts.py
ContextSuite context=TestRouterDHCPOpts>:setup Error 0.00 test_router_dhcphosts.py
ContextSuite context=TestRouterDns>:setup Error 0.00 test_router_dns.py
ContextSuite context=TestVmSnapshot>:setup Error 0.04 test_vm_snapshots.py
ContextSuite context=TestRouterDnsService>:setup Error 0.00 test_router_dnsservice.py
ContextSuite context=TestRouterIpTablesPolicies>:setup Error 0.00 test_routers_iptables_default_policy.py
ContextSuite context=TestVPCIpTablesPolicies>:setup Error 0.00 test_routers_iptables_default_policy.py
test_01_isolate_network_FW_PF_default_routes_egress_true Error 0.10 test_routers_network_ops.py
test_02_isolate_network_FW_PF_default_routes_egress_false Error 0.10 test_routers_network_ops.py
ContextSuite context=TestRedundantIsolateNetworks>:setup Error 1.20 test_routers_network_ops.py
ContextSuite context=TestRouterServices>:setup Error 0.00 test_routers.py
test_01_sys_vm_start Failure 0.06 test_secondary_storage.py
test_02_sys_template_ready Failure 0.05 test_secondary_storage.py
ContextSuite context=TestCpuCapServiceOfferings>:setup Error 0.00 test_service_offerings.py
ContextSuite context=TestServiceOfferings>:setup Error 0.11 test_service_offerings.py
ContextSuite context=TestSnapshotRootDisk>:setup Error 0.00 test_snapshots.py
test_01_list_sec_storage_vm Failure 0.03 test_ssvm.py
test_02_list_cpvm_vm Failure 0.02 test_ssvm.py
test_03_ssvm_internals Failure 0.02 test_ssvm.py
test_04_cpvm_internals Failure 0.02 test_ssvm.py
test_05_stop_ssvm Failure 0.02 test_ssvm.py
test_06_stop_cpvm Failure 0.02 test_ssvm.py
test_07_reboot_ssvm Failure 0.02 test_ssvm.py
test_08_reboot_cpvm Failure 0.02 test_ssvm.py
test_09_destroy_ssvm Failure 0.02 test_ssvm.py
test_10_destroy_cpvm Failure 0.02 test_ssvm.py
test_02_create_template_with_checksum_sha1 Error 65.29 test_templates.py
test_03_create_template_with_checksum_sha256 Error 65.30 test_templates.py
test_04_create_template_with_checksum_md5 Error 65.29 test_templates.py
test_05_create_template_with_no_checksum Error 65.29 test_templates.py
test_02_deploy_vm_from_direct_download_template Error 5.23 test_templates.py
test_03_deploy_vm_wrong_checksum Error 4.30 test_templates.py
ContextSuite context=TestTemplates>:setup Error 17.68 test_templates.py
ContextSuite context=TestISOUsage>:setup Error 0.00 test_usage.py
ContextSuite context=TestLBRuleUsage>:setup Error 0.00 test_usage.py
ContextSuite context=TestNatRuleUsage>:setup Error 0.00 test_usage.py
ContextSuite context=TestPublicIPUsage>:setup Error 0.00 test_usage.py
ContextSuite context=TestSnapshotUsage>:setup Error 0.00 test_usage.py
ContextSuite context=TestVmUsage>:setup Error 0.00 test_usage.py
ContextSuite context=TestVolumeUsage>:setup Error 0.00 test_usage.py
ContextSuite context=TestVpnUsage>:setup Error 0.00 test_usage.py
ContextSuite context=TestCreateVolume>:setup Error 0.00 test_volumes.py
ContextSuite context=TestVolumes>:setup Error 0.00 test_volumes.py
ContextSuite context=TestDeployVM>:setup Error 0.00 test_vm_life_cycle.py
ContextSuite context=TestVMLifeCycle>:setup Error 0.00 test_vm_life_cycle.py
test_01_redundant_vpc_site2site_vpn Failure 3.24 test_vpc_vpn.py
test_01_vpc_site2site_vpn_multiple_options Failure 3.21 test_vpc_vpn.py
test_01_vpc_remote_access_vpn Failure 1.10 test_vpc_vpn.py
test_01_vpc_site2site_vpn Failure 2.19 test_vpc_vpn.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL Error 1.67 test_vpc_redundant.py
test_02_redundant_VPC_default_routes Error 1.62 test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers Error 2.60 test_vpc_redundant.py
test_04_rvpc_network_garbage_collector_nics Error 3.63 test_vpc_redundant.py
test_05_rvpc_multi_tiers Error 3.64 test_vpc_redundant.py
test_01_VPC_nics_after_destroy Error 3.62 test_vpc_router_nics.py
test_02_VPC_default_routes Error 3.65 test_vpc_router_nics.py
test_02_cancel_host_maintenace_with_migration_jobs Error 2.21 test_host_maintenance.py
test_hostha_enable_ha_when_host_in_maintenance Error 4.41 test_hostha_kvm.py

@ernjvr ernjvr deleted the ernjvr:ISSUE-2537-fix-config-bugs-4.11-upgrade branch Apr 10, 2018

@rhtyd

This comment has been minimized.

Member

rhtyd commented Apr 10, 2018

The failed tests are all env related, the changes in the PR cannot be validated with Trillian smoke tests as they are upgrade related. Given the upgrade procedure was manually tested by @ernjvr / @borisstoyanov I'm okay with the merging, no regressions seen. We'll re-test during weekly runs.

@rhtyd rhtyd added this to the 4.11.1.0 milestone Apr 12, 2018

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