Skip to content

Commit edf4fe9

Browse files
yadvryadvr
committed
Merge branch '4.9'
2 parents bc02858 + fd6833b commit edf4fe9

13 files changed

Lines changed: 206 additions & 379 deletions

‎.travis.yml‎

Lines changed: 118 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,41 +17,141 @@
1717
sudo: required
1818
dist: trusty
1919
language: java
20-
cache:
21-
directories:
22-
- $HOME/.cache
2320
jdk:
2421
- oraclejdk7
2522
python:
2623
- "2.7"
2724
cache:
2825
directories:
2926
- $HOME/.m2
30-
timeout: 1000
27+
timeout: 500
3128
notifications:
3229
email: false
3330
env:
3431
global:
35-
- REGRESSION_CYCLE=4
36-
- REGRESSION_INDEX=6
3732
- PATH=$HOME/.local/bin:$PATH
3833
matrix:
39-
- TESTS="smoke/test_affinity_groups smoke/test_affinity_groups_projects smoke/test_dynamicroles smoke/test_deploy_vgpu_enabled_vm smoke/test_deploy_vm_iso smoke/test_deploy_vm_root_resize smoke/test_deploy_vm_with_userdata smoke/test_deploy_vms_with_varied_deploymentplanners smoke/test_disk_offerings smoke/test_global_settings smoke/test_guest_vlan_range"
40-
- TESTS="smoke/test_hosts smoke/test_internal_lb smoke/test_iso smoke/test_list_ids_parameter smoke/test_loadbalance smoke/test_login smoke/test_multipleips_per_nic smoke/test_network smoke/test_network_acl smoke/test_nic smoke/test_nic_adapter_type smoke/test_non_contigiousvlan"
41-
- TESTS="smoke/test_outofbandmanagement smoke/test_over_provisioning smoke/test_password_server smoke/test_portable_publicip smoke/test_primary_storage smoke/test_privategw_acl smoke/test_public_ip_range smoke/test_pvlan smoke/test_regions smoke/test_reset_vm_on_reboot smoke/test_resource_detail"
42-
- TESTS="smoke/test_router_dhcphosts smoke/test_routers smoke/test_routers_iptables_default_policy smoke/test_routers_network_ops smoke/test_staticroles smoke/test_scale_vm smoke/test_secondary_storage smoke/test_service_offerings smoke/test_snapshots smoke/test_ssvm smoke/test_templates"
43-
- TESTS="smoke/test_usage_events smoke/test_vm_life_cycle smoke/test_vm_snapshots smoke/test_volumes smoke/test_vpc_redundant smoke/test_vpc_router_nics smoke/test_vpc_vpn smoke/misc/test_deploy_vm smoke/misc/test_vm_ha smoke/misc/test_escalations_templates smoke/misc/test_vm_sync"
44-
45-
- TESTS="component/test_mm_max_limits component/test_acl_isolatednetwork_delete"
46-
- TESTS="component/test_mm_domain_limits component/test_acl_listsnapshot"
47-
- TESTS="component/test_acl_listvm component/test_acl_sharednetwork_deployVM-impersonation component/test_acl_sharednetwork"
48-
- TESTS="component/test_snapshots component/test_acl_listvolume"
34+
- TESTS="smoke/test_affinity_groups
35+
smoke/test_affinity_groups_projects
36+
smoke/test_deploy_vgpu_enabled_vm
37+
smoke/test_deploy_vm_iso
38+
smoke/test_deploy_vm_root_resize
39+
smoke/test_deploy_vm_with_userdata
40+
smoke/test_deploy_vms_with_varied_deploymentplanners
41+
smoke/test_disk_offerings
42+
smoke/test_dynamicroles
43+
smoke/test_global_settings
44+
smoke/test_guest_vlan_range
45+
smoke/test_hosts
46+
smoke/test_internal_lb
47+
smoke/test_iso
48+
smoke/test_list_ids_parameter
49+
smoke/test_loadbalance
50+
smoke/test_login
51+
smoke/test_multipleips_per_nic
52+
smoke/test_network
53+
smoke/test_network_acl
54+
smoke/test_nic
55+
smoke/test_nic_adapter_type
56+
smoke/test_non_contigiousvlan"
57+
58+
- TESTS="smoke/test_outofbandmanagement
59+
smoke/test_over_provisioning
60+
smoke/test_password_server
61+
smoke/test_portable_publicip
62+
smoke/test_primary_storage
63+
smoke/test_privategw_acl
64+
smoke/test_public_ip_range
65+
smoke/test_pvlan
66+
smoke/test_regions
67+
smoke/test_reset_vm_on_reboot
68+
smoke/test_resource_detail
69+
smoke/test_router_dhcphosts
70+
smoke/test_router_dns
71+
smoke/test_routers
72+
smoke/test_routers_iptables_default_policy
73+
smoke/test_routers_network_ops
74+
smoke/test_scale_vm
75+
smoke/test_secondary_storage
76+
smoke/test_service_offerings
77+
smoke/test_snapshots
78+
smoke/test_ssvm
79+
smoke/test_staticroles
80+
smoke/test_templates
81+
smoke/test_usage_events
82+
smoke/test_vm_life_cycle
83+
smoke/test_vm_snapshots
84+
smoke/test_volumes
85+
smoke/test_vpc_redundant
86+
smoke/test_vpc_router_nics
87+
smoke/test_vpc_vpn
88+
smoke/misc/test_deploy_vm
89+
smoke/misc/test_escalations_templates
90+
smoke/misc/test_vm_ha
91+
smoke/misc/test_vm_sync"
92+
93+
- TESTS="component/find_hosts_for_migration
94+
component/test_acl_isolatednetwork_delete
95+
component/test_acl_listsnapshot
96+
component/test_acl_listvm
97+
component/test_acl_listvolume
98+
component/test_acl_sharednetwork
99+
component/test_acl_sharednetwork_deployVM-impersonation"
100+
component/test_cpu_limits"
101+
102+
- TESTS="component/test_cpu_max_limits
103+
component/test_cpu_project_limits
104+
component/test_deploy_vm_userdata_multi_nic
105+
component/test_egress_fw_rules
106+
component/test_invalid_gw_nm
107+
component/test_ip_reservation
108+
component/test_lb_secondary_ip"
109+
110+
- TESTS="component/test_memory_limits
111+
component/test_mm_domain_limits
112+
component/test_mm_max_limits
113+
component/test_mm_project_limits
114+
component/test_network_offering
115+
component/test_non_contiguous_vlan
116+
component/test_persistent_networks"
117+
118+
- TESTS="component/test_projects
119+
component/test_project_configs
120+
component/test_project_limits
121+
component/test_project_usage
122+
component/test_regions
123+
component/test_regions_accounts
124+
component/test_routers
125+
component/test_snapshots"
126+
127+
- TESTS="component/test_resource_limits"
128+
129+
- TESTS="component/test_stopped_vm
130+
component/test_tags
131+
component/test_templates
132+
component/test_update_vm
133+
component/test_usage"
134+
135+
- TESTS="component/test_volumes
136+
component/test_vpc_network
137+
component/test_vpc_offerings
138+
component/test_vpn_users"
139+
140+
# FIXME: fix following tests and include them in Travis
141+
# - TESTS="component/test_affinity_groups_projects"
142+
# - TESTS="component/test_allocation_states"
143+
# - TESTS="component/test_vpc"
144+
# - TESTS="component/test_project_resources"
145+
# - TESTS="component/test_cpu_domain_limits"
146+
# - TESTS="component/test_acl_isolatednetwork"
147+
# - TESTS="component/test_accounts"
148+
# - TESTS="component/test_organization_states"
149+
49150
before_install: travis_wait 30 ./tools/travis/before_install.sh
50151
install: ./tools/travis/install.sh
51152
before_script: travis_wait 30 ./tools/travis/before_script.sh
52153
script:
53-
- travis_wait 30 sleep 30
54-
- ./tools/travis/script.sh ${TESTS}
154+
- travis_wait 40 ./tools/travis/script.sh ${TESTS}
55155
after_success: ./tools/travis/after_success.sh
56156
after_failure: ./tools/travis/after_failure.sh
57157
after_script: ./tools/travis/after_script.sh

‎developer/developer-prefill.sql‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
5252

5353
INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
5454
VALUES ('Advanced', 'DEFAULT', 'management-server',
55-
'account.cleanup.interval', '60');
55+
'account.cleanup.interval', '20');
5656

5757
INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
5858
VALUES ('Advanced', 'DEFAULT', 'management-server',
59-
'expunge.delay', '60');
59+
'expunge.delay', '20');
6060

6161
INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
6262
VALUES ('Advanced', 'DEFAULT', 'management-server',
63-
'expunge.interval', '60');
63+
'expunge.interval', '20');
6464

6565
INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
6666
VALUES ('Advanced', 'DEFAULT', 'management-server',
@@ -84,15 +84,15 @@ INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
8484

8585
INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
8686
VALUES ('Advanced', 'DEFAULT', 'management-server',
87-
'network.gc.wait', '60');
87+
'network.gc.wait', '20');
8888

8989
INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
9090
VALUES ('Advanced', 'DEFAULT', 'management-server',
91-
'network.gc.interval', '60');
91+
'network.gc.interval', '20');
9292

9393
INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
9494
VALUES ('Advanced', 'DEFAULT', 'management-server',
95-
'storage.cleanup.interval', '150');
95+
'storage.cleanup.interval', '40');
9696

9797
INSERT INTO `cloud`.`configuration` (category, instance, component, name, value)
9898
VALUES ('Advanced', 'DEFAULT', 'management-server',

‎setup/dev/advanced.cfg‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,11 @@
150150
"globalConfig": [
151151
{
152152
"name": "network.gc.wait",
153-
"value": "60"
153+
"value": "20"
154154
},
155155
{
156156
"name": "storage.cleanup.interval",
157-
"value": "60"
157+
"value": "40"
158158
},
159159
{
160160
"name": "vm.op.wait.interval",
@@ -166,7 +166,7 @@
166166
},
167167
{
168168
"name": "network.gc.interval",
169-
"value": "60"
169+
"value": "20"
170170
},
171171
{
172172
"name": "instance.name",
@@ -178,23 +178,23 @@
178178
},
179179
{
180180
"name": "account.cleanup.interval",
181-
"value": "60"
181+
"value": "20"
182182
},
183183
{
184184
"name": "guest.domain.suffix",
185185
"value": "sandbox.simulator"
186186
},
187187
{
188188
"name": "expunge.delay",
189-
"value": "60"
189+
"value": "20"
190190
},
191191
{
192192
"name": "vm.allocation.algorithm",
193193
"value": "random"
194194
},
195195
{
196196
"name": "expunge.interval",
197-
"value": "60"
197+
"value": "20"
198198
},
199199
{
200200
"name": "expunge.workers",

0 commit comments

Comments
 (0)