Skip to content

Commit 8cfcdce

Browse files
winterhazelwinterhazel
committed
Merge main
2 parents eaf7446 + 9b18243 commit 8cfcdce

File tree

2,536 files changed

+28806
-25047
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,536 files changed

+28806
-25047
lines changed

‎.asf.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ github:
5353
- acs-robot
5454
- kiranchavala
5555
- rajujith
56-
- alexandremattioli
5756
- vishesh92
5857
- GaOrtiga
5958
- SadiJr

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
cache: maven
4242

4343
- name: Set up Python
44-
uses: actions/setup-python@v4
44+
uses: actions/setup-python@v5
4545
with:
4646
python-version: '3.8'
4747
architecture: 'x64'

‎.github/workflows/ci.yml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,15 @@ jobs:
194194
component/test_vpc_network
195195
component/test_vpc_offerings
196196
component/test_vpc_routers
197-
component/test_vpn_users",
198-
"component/test_vpc_network_lbrules" ]
197+
component/test_vpn_users
198+
component/test_vpc_network_lbrules",
199+
"smoke/test_list_accounts
200+
smoke/test_list_disk_offerings
201+
smoke/test_list_domains
202+
smoke/test_list_hosts
203+
smoke/test_list_service_offerings
204+
smoke/test_list_storage_pools
205+
smoke/test_list_volumes"]
199206

200207
steps:
201208
- uses: actions/checkout@v4
@@ -211,7 +218,7 @@ jobs:
211218
cache: maven
212219

213220
- name: Set up Python
214-
uses: actions/setup-python@v4
221+
uses: actions/setup-python@v5
215222
with:
216223
python-version: '3.8'
217224
architecture: 'x64'
@@ -278,7 +285,7 @@ jobs:
278285
while ! nc -vzw 5 localhost 8096 2>&1 > /dev/null; do grep Exception /tmp/jetty-log; sleep 10; done
279286
set -e
280287
echo -e "\nStarting Advanced Zone DataCenter deployment"
281-
python3 tools/marvin/marvin/deployDataCenter.py -i setup/dev/advanced.cfg 2>&1 || true
288+
python3 tools/marvin/marvin/deployDataCenter.py -i setup/dev/advdualzone.cfg 2>&1 || true
282289
283290
- name: Run Integration Tests with Simulator
284291
run: |
@@ -291,7 +298,7 @@ jobs:
291298
TESTS=($(echo $TESTS | tr -d '\n' | tr -s ' '))
292299
for suite in "${TESTS[@]}" ; do
293300
echo -e "Currently running test: $suite\n"
294-
time nosetests-3.4 --with-xunit --xunit-file=integration-test-results/$suite.xml --with-marvin --marvin-config=setup/dev/advanced.cfg test/integration/$suite.py -s -a tags=advanced,required_hardware=false --zone=Sandbox-simulator --hypervisor=simulator || true ;
301+
time nosetests-3.4 --with-xunit --xunit-file=integration-test-results/$suite.xml --with-marvin --marvin-config=setup/dev/advdualzone.cfg test/integration/$suite.py -s -a tags=advanced,required_hardware=false --zone=zim1 --hypervisor=simulator || true ;
295302
done
296303
297304
echo -e "Stopping Simulator, integration tests run completed\n"

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Apache CloudStack [![Build Status](https://github.com/apache/cloudstack/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/apache/cloudstack/actions/workflows/build.yml) [![UI Build](https://github.com/apache/cloudstack/actions/workflows/ui.yml/badge.svg)](https://github.com/apache/cloudstack/actions/workflows/ui.yml) [![License Check](https://github.com/apache/cloudstack/actions/workflows/rat.yml/badge.svg?branch=main)](https://github.com/apache/cloudstack/actions/workflows/rat.yml) [![Simulator CI](https://github.com/apache/cloudstack/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/apache/cloudstack/actions/workflows/ci.yml) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=apache_cloudstack&metric=alert_status)](https://sonarcloud.io/dashboard?id=apache_cloudstack) [![codecov](https://codecov.io/gh/apache/cloudstack/branch/main/graph/badge.svg)](https://codecov.io/gh/apache/cloudstack)
22

3-
[![Apache CloudStack](tools/logo/acsxmas.jpg)](https://cloudstack.apache.org/)
3+
[![Apache CloudStack](tools/logo/apache_cloudstack.png)](https://cloudstack.apache.org/)
44

55
Apache CloudStack is open source software designed to deploy and manage large
66
networks of virtual machines, as a highly available, highly scalable

‎agent/conf/agent.properties‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# to you under the Apache License, Version 2.0 (the
66
# "License"); you may not use this file except in compliance
77
# with the License. You may obtain a copy of the License at
8-
#
8+
#
99
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
10+
#
1111
# Unless required by applicable law or agreed to in writing,
1212
# software distributed under the License is distributed on an
1313
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -378,6 +378,10 @@ iscsi.session.cleanup.enabled=false
378378
# If the time is exceeded shutdown will be forced.
379379
#stop.script.timeout=120
380380

381+
# Time (in seconds) to wait for scripts to complete.
382+
# This is currently used only while checking if the host supports UEFI.
383+
#agent.script.timeout=60
384+
381385
# Definition of VMs video model type.
382386
#vm.video.hardware=
383387

‎agent/conf/log4j-cloud.xml.in‎

Lines changed: 57 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -17,91 +17,60 @@ KIND, either express or implied. See the License for the
1717
specific language governing permissions and limitations
1818
under the License.
1919
-->
20-
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
21-
22-
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
23-
24-
<!-- ================================= -->
25-
<!-- Preserve messages in a local file -->
26-
<!-- ================================= -->
27-
28-
<!-- A time/date based rolling appender -->
29-
<appender name="FILE" class="org.apache.log4j.rolling.RollingFileAppender">
30-
<param name="Append" value="true"/>
31-
<param name="Threshold" value="INFO"/>
32-
<rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
33-
<param name="FileNamePattern" value="@AGENTLOG@.%d{yyyy-MM-dd}.gz"/>
34-
<param name="ActiveFileName" value="@AGENTLOG@"/>
35-
</rollingPolicy>
36-
<layout class="org.apache.log4j.EnhancedPatternLayout">
37-
<param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%n"/>
38-
</layout>
39-
</appender>
40-
41-
<!-- ============================== -->
42-
<!-- Append messages to the console -->
43-
<!-- ============================== -->
44-
45-
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
46-
<param name="Target" value="System.out"/>
47-
<param name="Threshold" value="INFO"/>
48-
49-
<layout class="org.apache.log4j.PatternLayout">
50-
<param name="ConversionPattern" value="%-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%n"/>
51-
</layout>
52-
</appender>
53-
54-
<!-- ================ -->
55-
<!-- Limit categories -->
56-
<!-- ================ -->
57-
58-
<category name="com.cloud">
59-
<priority value="INFO"/>
60-
</category>
61-
62-
<category name="com.cloud.agent.metrics">
63-
<priority value="INFO"/>
64-
</category>
65-
66-
<category name="com.cloud.agent.resource.computing.ComputingResource$StorageMonitorTask">
67-
<priority value="INFO"/>
68-
</category>
69-
70-
<!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
71-
<category name="org.apache">
72-
<priority value="INFO"/>
73-
</category>
74-
75-
<category name="org">
76-
<priority value="INFO"/>
77-
</category>
78-
79-
<category name="net">
80-
<priority value="INFO"/>
81-
</category>
82-
83-
<!-- Limit the com.amazonaws category to INFO as its DEBUG is verbose -->
84-
<category name="com.amazonaws">
85-
<priority value="INFO"/>
86-
</category>
87-
88-
<!-- Limit the httpclient.wire category to INFO as its DEBUG is verbose -->
89-
<category name="httpclient.wire">
90-
<priority value="INFO"/>
91-
</category>
92-
93-
<category name="org.apache.http.wire">
94-
<priority value="INFO"/>
95-
</category>
96-
97-
<!-- ======================= -->
98-
<!-- Setup the Root category -->
99-
<!-- ======================= -->
100-
101-
<root>
102-
<level value="INFO"/>
103-
<appender-ref ref="CONSOLE"/>
104-
<appender-ref ref="FILE"/>
105-
</root>
106-
107-
</log4j:configuration>
20+
<Configuration monitorInterval="60">
21+
<Appenders>
22+
23+
<!-- ================================= -->
24+
<!-- Preserve messages in a local file -->
25+
<!-- ================================= -->
26+
27+
<!-- A time/date based rolling appender -->
28+
<RollingFile name="FILE" append="true" fileName="@AGENTLOG@" filePattern="@AGENTLOG@.%d{yyyy-MM-dd}.gz">
29+
<ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
30+
<Policies>
31+
<TimeBasedTriggeringPolicy/>
32+
</Policies>
33+
<PatternLayout pattern="%d{ISO8601} %-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%ex%n"/>
34+
</RollingFile>
35+
36+
<!-- ============================== -->
37+
<!-- Append messages to the console -->
38+
<!-- ============================== -->
39+
40+
<Console name="CONSOLE" target="SYSTEM_OUT">
41+
<ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
42+
<PatternLayout pattern="%-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%ex%n"/>
43+
</Console>
44+
</Appenders>
45+
46+
<Loggers>
47+
48+
<!-- ================ -->
49+
<!-- Limit categories -->
50+
<!-- ================ -->
51+
52+
<Logger name="com.cloud" level="INFO"/>
53+
54+
<Logger name="org.apache" level="INFO"/>
55+
56+
<Logger name="org" level="INFO"/>
57+
58+
<Logger name="net" level="INFO"/>
59+
60+
<Logger name="com.amazonaws" level="INFO"/>
61+
62+
<Logger name="httpclient.wire" level="INFO"/>
63+
64+
<Logger name="org.apache.http.wire" level="INFO"/>
65+
66+
<!-- ======================= -->
67+
<!-- Setup the Root category -->
68+
<!-- ======================= -->
69+
70+
<Root level="INFO">
71+
<AppenderRef ref="CONSOLE"/>
72+
<AppenderRef ref="FILE"/>
73+
</Root>
74+
75+
</Loggers>
76+
</Configuration>

‎agent/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.cloudstack</groupId>
2626
<artifactId>cloudstack</artifactId>
27-
<version>4.19.0.0-SNAPSHOT</version>
27+
<version>4.20.0.0-SNAPSHOT</version>
2828
</parent>
2929
<dependencies>
3030
<dependency>

0 commit comments

Comments
 (0)