Skip to content

Commit fbb0794

Browse files
jbamptonjbampton
committed
Merge
2 parents 5c36bcd + ac3b180 commit fbb0794

File tree

747 files changed

+50790
-36779
lines changed

Some content is hidden

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

747 files changed

+50790
-36779
lines changed

‎.asf.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,12 @@ github:
5959
- abh1sar
6060
- rosi-shapeblue
6161
- sudo87
62+
- erikbocks
6263

6364
protected_branches: ~
6465

6566
notifications:
66-
commits: [email protected]
67-
issues: [email protected]
67+
commits: [email protected]
68+
issues: [email protected]
6869
pullrequests: [email protected]
69-
discussions: [email protected]
70+
discussions: [email protected]

‎.github/linters/.markdown-lint.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
# MD001/heading-increment Heading levels should only increment by one level at a time
1919
MD001: false
2020

21-
# MD003/heading-style Heading style
22-
MD003: false
23-
2421
# MD004/ul-style Unordered list style
2522
MD004: false
2623

‎.github/linters/.yamllint.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
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.
17+
---
18+
extends: relaxed
19+
20+
rules:
21+
line-length:
22+
max: 400 # Very forgiving for GitHub Actions and infrastructure files
23+
indentation: disable # Disable indentation checking for existing files
24+
comments: disable # Disable comment formatting checks
25+
brackets: disable # Disable bracket spacing checks
26+
colons:
27+
max-spaces-after: -1 # Allow any number of spaces after colon
28+
max-spaces-before: 0
29+
document-start: disable # Many files don't have ---
30+
truthy:
31+
allowed-values: ['true', 'false', 'on', 'off', 'yes', 'no']

‎.github/linters/codespell.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,7 @@ propogate
357357
provison
358358
psudo
359359
pyhsical
360+
re-use
360361
readabilty
361362
readd
362363
reccuring
@@ -391,7 +392,6 @@ retriving
391392
retrun
392393
retuned
393394
returing
394-
re-use
395395
rever
396396
rocessor
397397
roperty

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ jobs:
3030
build:
3131
runs-on: ubuntu-22.04
3232
steps:
33-
- uses: actions/checkout@v4
33+
- uses: actions/checkout@v5
3434

3535
- name: Set up JDK 17
36-
uses: actions/setup-java@v4
36+
uses: actions/setup-java@v5
3737
with:
3838
distribution: 'temurin'
3939
java-version: '17'
4040
cache: 'maven'
4141

4242
- name: Set up Python
43-
uses: actions/setup-python@v5
43+
uses: actions/setup-python@v6
4444
with:
4545
python-version: '3.10'
4646
architecture: 'x64'

‎.github/workflows/ci.yml‎

Lines changed: 24 additions & 6 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
@@ -216,27 +216,45 @@ jobs:
216216
smoke/test_list_volumes"]
217217

218218
steps:
219-
- uses: actions/checkout@v4
219+
- uses: actions/checkout@v5
220220
with:
221221
fetch-depth: 0
222222

223223
- name: Set up JDK 17
224-
uses: actions/setup-java@v4
224+
uses: actions/setup-java@v5
225225
with:
226226
distribution: 'temurin'
227227
java-version: '17'
228228
cache: 'maven'
229229

230230
- name: Set up Python
231-
uses: actions/setup-python@v5
231+
uses: actions/setup-python@v6
232232
with:
233233
python-version: '3.10'
234234
architecture: 'x64'
235235

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/codecov.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ jobs:
3232
name: codecov
3333
runs-on: ubuntu-22.04
3434
steps:
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v5
3636
with:
3737
fetch-depth: 0
3838

3939
- name: Set up JDK 17
40-
uses: actions/setup-java@v4
40+
uses: actions/setup-java@v5
4141
with:
4242
distribution: 'temurin'
4343
java-version: '17'

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
language: ["actions"]
3636
steps:
3737
- name: Checkout repository
38-
uses: actions/checkout@v4
38+
uses: actions/checkout@v5
3939
- name: Initialize CodeQL
4040
uses: github/codeql-action/init@v3
4141
with:

‎.github/workflows/docker-cloudstack-simulator.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: Set Docker repository name
4848
run: echo "DOCKER_REPOSITORY=apache" >> $GITHUB_ENV
4949

50-
- uses: actions/checkout@v4
50+
- uses: actions/checkout@v5
5151

5252
- name: Set ACS version
5353
run: echo "ACS_VERSION=$(grep '<version>' pom.xml | head -2 | tail -1 | cut -d'>' -f2 |cut -d'<' -f1)" >> $GITHUB_ENV

‎.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.

0 commit comments

Comments
 (0)