Skip to content

Commit 88bc381

Browse files
jbamptonjbampton
committed
Merge
2 parents bb6ec27 + dc8f465 commit 88bc381

File tree

298 files changed

+1702
-332
lines changed

Some content is hidden

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

298 files changed

+1702
-332
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ permissions:
2929
jobs:
3030
build:
3131
if: github.repository == 'apache/cloudstack'
32-
runs-on: ubuntu-22.04
32+
runs-on: ubuntu-24.04
3333

3434
strategy:
3535
fail-fast: false
@@ -236,7 +236,25 @@ jobs:
236236
- name: Install Build Dependencies
237237
run: |
238238
sudo apt-get update
239-
sudo apt-get install -y git uuid-runtime genisoimage netcat ipmitool build-essential libgcrypt20 libgpg-error-dev libgpg-error0 libopenipmi0 ipmitool libpython3-dev libssl-dev libffi-dev python3-openssl python3-dev python3-setuptools
239+
sudo apt-get install -y git uuid-runtime genisoimage netcat-openbsd ipmitool build-essential libgcrypt20 libgpg-error-dev libgpg-error0 libopenipmi0 ipmitool libpython3-dev libssl-dev libffi-dev python3-openssl python3-dev python3-setuptools
240+
241+
- name: Setup IPMI Tool for CloudStack
242+
run: |
243+
# Create cloudstack-common directory if it doesn't exist
244+
sudo mkdir -p /usr/share/cloudstack-common
245+
246+
# Copy ipmitool to cloudstack-common directory if it doesn't exist
247+
if [ ! -f /usr/share/cloudstack-common/ipmitool ]; then
248+
sudo cp /usr/bin/ipmitool /usr/share/cloudstack-common/ipmitool
249+
sudo chmod 755 /usr/share/cloudstack-common/ipmitool
250+
fi
251+
252+
# Create ipmitool-C3 wrapper script
253+
sudo tee /usr/bin/ipmitool > /dev/null << 'EOF'
254+
#!/bin/bash
255+
/usr/share/cloudstack-common/ipmitool -C3 $@
256+
EOF
257+
sudo chmod 755 /usr/bin/ipmitool
240258
241259
- name: Install Python dependencies
242260
run: |
@@ -275,7 +293,7 @@ jobs:
275293
- name: Setup Simulator Prerequisites
276294
run: |
277295
sudo python3 -m pip install --upgrade netaddr mysql-connector-python
278-
python3 -m pip install --user --upgrade tools/marvin/dist/Marvin-*.tar.gz
296+
python3 -m pip install --user --upgrade tools/marvin/dist/[mM]arvin-*.tar.gz
279297
mvn -q -Pdeveloper -pl developer -Ddeploydb
280298
mvn -q -Pdeveloper -pl developer -Ddeploydb-simulator
281299

‎.github/workflows/license-templates/LICENSE.txt‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
Licensed to the Apache Software Foundation (ASF) under one
2+
or more contributor license agreements. See the NOTICE file
3+
distributed with this work for additional information
4+
regarding copyright ownership. The ASF licenses this file
5+
to you under the Apache License, Version 2.0 (the
6+
"License"); you may not use this file except in compliance
7+
with the License. You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing,
12+
software distributed under the License is distributed on an
13+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
KIND, either express or implied. See the License for the
15+
specific language governing permissions and limitations
16+
under the License.

‎.github/workflows/linter.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,5 @@ jobs:
4545
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
4646
- name: Run pre-commit
4747
run: pre-commit run --all-files
48+
- name: Run manual pre-commit hooks
49+
run: pre-commit run --all-files --hook-stage manual

‎.pre-commit-config.yaml‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,32 @@ repos:
3131
- id: doctoc
3232
name: Add TOC for Markdown files
3333
files: ^CONTRIBUTING\.md$|^INSTALL\.md$|^README\.md$
34+
- repo: https://github.com/oxipng/oxipng
35+
rev: v9.1.5
36+
hooks:
37+
- id: oxipng
38+
name: run oxipng
39+
description: optimize PNG images with lossless compression
40+
args: ['-o', '4', '--strip', 'safe', '--alpha']
3441
- repo: https://github.com/gitleaks/gitleaks
3542
rev: v8.27.2
3643
hooks:
3744
- id: gitleaks
3845
name: run gitleaks
3946
description: detect hardcoded secrets
47+
- repo: https://github.com/Lucas-C/pre-commit-hooks
48+
rev: v1.5.5
49+
hooks:
50+
- id: insert-license
51+
name: add license for all Markdown files
52+
files: \.md$
53+
args:
54+
- --comment-style
55+
- '<!--|| -->'
56+
- --license-filepath
57+
- .github/workflows/license-templates/LICENSE.txt
58+
- --fuzzy-match-generates-todo
59+
exclude: ^(CHANGES|ISSUE_TEMPLATE|PULL_REQUEST_TEMPLATE)\.md$|^ui/docs/(full|smoke)-test-plan\.template\.md$
4060
- repo: https://github.com/pre-commit/pre-commit-hooks
4161
rev: v6.0.0
4262
hooks:
@@ -70,7 +90,7 @@ repos:
7090
^systemvm/agent/certs/realhostip\.key$|
7191
^test/integration/smoke/test_ssl_offloading\.py$
7292
- id: end-of-file-fixer
73-
exclude: \.vhd$
93+
exclude: \.vhd$|\.svg$
7494
- id: file-contents-sorter
7595
args: [--unique]
7696
files: ^\.github/linters/codespell\.txt$
@@ -103,6 +123,14 @@ repos:
103123
args: [--config=.github/linters/.markdown-lint.yml]
104124
types: [markdown]
105125
files: \.(md|mdown|markdown)$
126+
- repo: https://github.com/Lucas-C/pre-commit-hooks
127+
rev: v1.5.5
128+
hooks:
129+
- id: chmod
130+
name: set file permissions
131+
args: ['644']
132+
files: \.md$
133+
stages: [manual]
106134
- repo: https://github.com/adrienverge/yamllint
107135
rev: v1.37.1
108136
hooks:

‎CONTRIBUTING.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
120
# Contributing to Apache CloudStack (ACS)
221

322
## Summary

‎INSTALL.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
120
# Apache CloudStack Installation basics
221

322
This document describes how to develop, build, package and install Apache

‎PRE-COMMIT.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
120
# pre-commit
221

322
We run [pre-commit](https://pre-commit.com/) with

‎README.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
120
# Apache CloudStack
221

322
[![Build Status](https://github.com/apache/cloudstack/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/apache/cloudstack/actions/workflows/build.yml)

‎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.22.0.0-SNAPSHOT</version>
27+
<version>4.23.0.0-SNAPSHOT</version>
2828
</parent>
2929
<dependencies>
3030
<dependency>

‎api/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.22.0.0-SNAPSHOT</version>
27+
<version>4.23.0.0-SNAPSHOT</version>
2828
</parent>
2929
<dependencies>
3030
<dependency>

0 commit comments

Comments
 (0)