Skip to content

Commit e059631

Browse files
author
Lucas Martins
committed
Merge branch 'main' into add-presets-to-running-vm-usage-type
2 parents 80f34ab + 91ab67c commit e059631

File tree

1,225 files changed

+60251
-6711
lines changed

Some content is hidden

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

1,225 files changed

+60251
-6711
lines changed

.asf.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ github:
5959
- hsato03
6060
- bernardodemarco
6161
- abh1sar
62+
- FelipeM525
6263

6364
protected_branches: ~
6465

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Set up Python
4444
uses: actions/setup-python@v5
4545
with:
46-
python-version: '3.8'
46+
python-version: '3.10'
4747
architecture: 'x64'
4848

4949
- name: Install Build Dependencies

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
fail-fast: false
3636
matrix:
3737
tests: [ "smoke/test_accounts
38+
smoke/test_account_access
3839
smoke/test_affinity_groups
3940
smoke/test_affinity_groups_projects
4041
smoke/test_annotations
@@ -225,7 +226,7 @@ jobs:
225226
- name: Set up Python
226227
uses: actions/setup-python@v5
227228
with:
228-
python-version: '3.8'
229+
python-version: '3.10'
229230
architecture: 'x64'
230231

231232
- name: Install Build Dependencies
@@ -283,7 +284,7 @@ jobs:
283284
284285
- name: Start CloudStack Management Server with Simulator
285286
run: |
286-
export MAVEN_OPTS="-Xmx4096m -XX:MaxPermSize=800m -Djava.security.egd=file:/dev/urandom -javaagent:jacoco/lib/jacocoagent.jar=address=*,port=36320,output=tcpserver"
287+
export MAVEN_OPTS="-Xmx4096m -XX:MaxMetaspaceSize=800m -Djava.security.egd=file:/dev/urandom -javaagent:jacoco/lib/jacocoagent.jar=address=*,port=36320,output=tcpserver --add-opens=java.base/java.lang=ALL-UNNAMED --add-exports=java.base/sun.security.x509=ALL-UNNAMED --add-opens=java.base/jdk.internal.reflect=ALL-UNNAMED"
287288
echo -e "\nStarting simulator"
288289
set +e
289290
mvn -Dsimulator -Dorg.eclipse.jetty.annotations.maxWait=120 -pl :cloud-client-ui jetty:run 2>&1 > /tmp/jetty-log || true &

.github/workflows/codecov.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ jobs:
3636
with:
3737
fetch-depth: 0
3838

39-
- name: Set up JDK11
39+
- name: Set up JDK 17
4040
uses: actions/setup-java@v4
4141
with:
4242
distribution: 'temurin'
43-
java-version: '11'
43+
java-version: '17'
4444
cache: 'maven'
4545

4646
- name: Build CloudStack with Quality Checks

.github/workflows/main-sonar-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ jobs:
3636
with:
3737
fetch-depth: 0
3838

39-
- name: Set up JDK11
39+
- name: Set up JDK17
4040
uses: actions/setup-java@v4
4141
with:
4242
distribution: 'temurin'
43-
java-version: '11'
43+
java-version: '17'
4444
cache: 'maven'
4545

4646
- name: Cache SonarCloud packages

.github/workflows/rat.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ jobs:
3131
runs-on: ubuntu-22.04
3232
steps:
3333
- uses: actions/checkout@v4
34-
- name: Set up JDK 11
34+
- name: Set up JDK 17
3535
uses: actions/setup-java@v4
3636
with:
37-
java-version: '11'
37+
java-version: '17'
3838
distribution: 'adopt'
3939
architecture: x64
4040
cache: maven

.github/workflows/sonar-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ jobs:
3838
ref: "refs/pull/${{ github.event.number }}/merge"
3939
fetch-depth: 0
4040

41-
- name: Set up JDK11
41+
- name: Set up JDK17
4242
uses: actions/setup-java@v4
4343
with:
4444
distribution: 'temurin'
45-
java-version: '11'
45+
java-version: '17'
4646
cache: 'maven'
4747

4848
- name: Cache SonarCloud packages

.github/workflows/ui.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Set up Node
3737
uses: actions/setup-node@v3
3838
with:
39-
node-version: 14
39+
node-version: 16
4040

4141
- name: Env details
4242
run: |

INSTALL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Clear old database (if any) and deploy the database schema:
7878

7979
Export the following variable if you need to run and debug the management server:
8080

81-
$ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=500m -Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"
81+
$ export MAVEN_OPTS="-Xmx1024m -XX:MaxMetaspaceSize=500m -Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"
8282

8383
Start the management server:
8484

agent/conf/log4j-cloud.xml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ under the License.
3030
<Policies>
3131
<TimeBasedTriggeringPolicy/>
3232
</Policies>
33-
<PatternLayout pattern="%d{ISO8601} %-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%ex%n"/>
33+
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%ex%n"/>
3434
</RollingFile>
3535

3636
<!-- ============================== -->

0 commit comments

Comments
 (0)