Skip to content

Commit 295d8a8

Browse files
jmsperujmsperu
committed
Merge remote-tracking branch 'origin/main' into fix/nasbackup-timeout-spacecheck-trap
# Conflicts: # scripts/vm/hypervisor/kvm/nasbackup.sh
2 parents d64286b + 4f11707 commit 295d8a8

1,324 files changed

Lines changed: 142708 additions & 10632 deletions

File tree

Some content is hidden

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

‎.asf.yaml‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
# under the License.
1717

1818
# https://cwiki.apache.org/confluence/display/INFRA/git+-+.asf.yaml+features
19-
---
2019
github:
2120
description: "Apache CloudStack is an opensource Infrastructure as a Service (IaaS) cloud computing platform"
2221
homepage: https://cloudstack.apache.org/
@@ -55,8 +54,26 @@ github:
5554
- erikbocks
5655
- Imvedansh
5756
- Damans227
57+
- jmsperu
58+
- GaOrtiga
59+
- bhouse-nexthop
5860

59-
protected_branches: ~
61+
rulesets:
62+
- name: "Default Branch Protection"
63+
type: branch
64+
branches:
65+
includes:
66+
- "~DEFAULT_BRANCH"
67+
excludes: []
68+
bypass_teams:
69+
- root
70+
restrict_deletion: true
71+
restrict_force_push: true
72+
73+
copilot_code_review:
74+
enabled: true
75+
review_drafts: true
76+
review_on_push: true
6077

6178
notifications:
6279
commits: commits@cloudstack.apache.org

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
/plugins/storage/volume/linstor @rp-
1919
/plugins/storage/volume/storpool @slavkap
20-
/plugins/storage/volume/ontap @rajiv1 @sandeeplocharla @piyush5 @suryag
20+
/plugins/storage/volume/ontap @rajiv-jain-netapp @sandeeplocharla @piyush5netapp @suryag1201
2121

2222
.pre-commit-config.yaml @jbampton
2323
/.github/linters/ @jbampton

‎.github/actions/install-nonoss/action.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+
name: 'Install CloudStack Non-OSS'
19+
description: 'Clones and installs the shapeblue/cloudstack-nonoss repository.'
20+
21+
runs:
22+
using: "composite"
23+
steps:
24+
- name: Install cloudstack-nonoss
25+
shell: bash
26+
run: |
27+
git clone --depth 1 https://github.com/shapeblue/cloudstack-nonoss.git nonoss
28+
cd nonoss
29+
bash -x install-non-oss.sh
30+
cd ..
31+
rm -fr nonoss

‎.github/actions/setup-env/action.yml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
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+
name: 'Setup CloudStack Environment'
19+
description: 'Sets up JDK (with Maven cache), optionally Python, and optionally APT build dependencies for CloudStack.'
20+
21+
inputs:
22+
java-version:
23+
description: 'The JDK version to use'
24+
required: false
25+
default: '17'
26+
install-python:
27+
description: 'Whether to install Python 3.10'
28+
required: false
29+
default: 'false'
30+
install-apt-deps:
31+
description: 'Whether to install CloudStack APT build dependencies'
32+
required: false
33+
default: 'false'
34+
35+
runs:
36+
using: "composite"
37+
steps:
38+
- name: Set up JDK ${{ inputs.java-version }}
39+
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
40+
with:
41+
java-version: ${{ inputs.java-version }}
42+
distribution: 'adopt'
43+
architecture: x64
44+
cache: 'maven'
45+
46+
- name: Set up Python
47+
if: ${{ inputs.install-python == 'true' }}
48+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
49+
with:
50+
python-version: '3.10'
51+
architecture: x64
52+
53+
- name: Install Build Dependencies
54+
if: ${{ inputs.install-apt-deps == 'true' }}
55+
shell: bash
56+
run: |
57+
sudo apt-get update
58+
sudo apt-get install -y git uuid-runtime genisoimage netcat-openbsd ipmitool build-essential libgcrypt20 libgpg-error-dev libgpg-error0 libopenipmi0 libpython3-dev libssl-dev libffi-dev python3-openssl python3-dev python3-setuptools

‎.github/aw/actions-lock.json‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"entries": {
3+
"actions/github-script@v9.0.0": {
4+
"repo": "actions/github-script",
5+
"version": "v9.0.0",
6+
"sha": "3a2844b7e9c422d3c10d287c895573f7108da1b3"
7+
},
8+
"github/gh-aw-actions/setup@v0.76.1": {
9+
"repo": "github/gh-aw-actions/setup",
10+
"version": "v0.76.1",
11+
"sha": "46d564922b082d0db93244972e8005ea6904ee5f"
12+
}
13+
},
14+
"containers": {
15+
"ghcr.io/github/gh-aw-firewall/agent:0.18.0": {
16+
"image": "ghcr.io/github/gh-aw-firewall/agent:0.18.0",
17+
"digest": "sha256:ab84dfc7f5998cb8cd0c596526dd573b7e7d06c6a740266a1e6df879fa16c866",
18+
"pinned_image": "ghcr.io/github/gh-aw-firewall/agent:0.18.0@sha256:ab84dfc7f5998cb8cd0c596526dd573b7e7d06c6a740266a1e6df879fa16c866"
19+
},
20+
"ghcr.io/github/gh-aw-firewall/agent:0.25.55": {
21+
"image": "ghcr.io/github/gh-aw-firewall/agent:0.25.55",
22+
"digest": "sha256:138c363411decc9a61a5af9b95e8d64c76648b00add0ba06fc7ba786f0e72731",
23+
"pinned_image": "ghcr.io/github/gh-aw-firewall/agent:0.25.55@sha256:138c363411decc9a61a5af9b95e8d64c76648b00add0ba06fc7ba786f0e72731"
24+
},
25+
"ghcr.io/github/gh-aw-firewall/api-proxy:0.25.55": {
26+
"image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.25.55",
27+
"digest": "sha256:4142b873b678cd3279b98dcbe464857d56ea2f2348719b00379cdf35dd843ff3",
28+
"pinned_image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.25.55@sha256:4142b873b678cd3279b98dcbe464857d56ea2f2348719b00379cdf35dd843ff3"
29+
},
30+
"ghcr.io/github/gh-aw-firewall/squid:0.18.0": {
31+
"image": "ghcr.io/github/gh-aw-firewall/squid:0.18.0",
32+
"digest": "sha256:82a5d062a5612a57a43a171a5b79ddbb690a86a8ddda02339cc1675131ae9f8b",
33+
"pinned_image": "ghcr.io/github/gh-aw-firewall/squid:0.18.0@sha256:82a5d062a5612a57a43a171a5b79ddbb690a86a8ddda02339cc1675131ae9f8b"
34+
},
35+
"ghcr.io/github/gh-aw-firewall/squid:0.25.55": {
36+
"image": "ghcr.io/github/gh-aw-firewall/squid:0.25.55",
37+
"digest": "sha256:74084b704d8d3664a363655986664d70bd9cdb4830532d0b35cd784d867aabca",
38+
"pinned_image": "ghcr.io/github/gh-aw-firewall/squid:0.25.55@sha256:74084b704d8d3664a363655986664d70bd9cdb4830532d0b35cd784d867aabca"
39+
},
40+
"ghcr.io/github/gh-aw-mcpg:v0.1.4": {
41+
"image": "ghcr.io/github/gh-aw-mcpg:v0.1.4",
42+
"digest": "sha256:0acf25aa1d409f9c73be9e39ac84f4bd4b90d8bfa1db4dc6d7f47d38ccd58914",
43+
"pinned_image": "ghcr.io/github/gh-aw-mcpg:v0.1.4@sha256:0acf25aa1d409f9c73be9e39ac84f4bd4b90d8bfa1db4dc6d7f47d38ccd58914"
44+
},
45+
"ghcr.io/github/gh-aw-mcpg:v0.3.19": {
46+
"image": "ghcr.io/github/gh-aw-mcpg:v0.3.19",
47+
"digest": "sha256:a6c890d7c24d7190c9ef97b9c954cc4cffaae6b01c371ced1f959f1370b1f68f",
48+
"pinned_image": "ghcr.io/github/gh-aw-mcpg:v0.3.19@sha256:a6c890d7c24d7190c9ef97b9c954cc4cffaae6b01c371ced1f959f1370b1f68f"
49+
},
50+
"ghcr.io/github/github-mcp-server:v0.30.3": {
51+
"image": "ghcr.io/github/github-mcp-server:v0.30.3",
52+
"digest": "sha256:a2b5fb79b1cee851bfc3532dfe480c3dc5736974ca9d93a7a9f68e52ce4b62a0",
53+
"pinned_image": "ghcr.io/github/github-mcp-server:v0.30.3@sha256:a2b5fb79b1cee851bfc3532dfe480c3dc5736974ca9d93a7a9f68e52ce4b62a0"
54+
}
55+
}
56+
}

‎.github/aw/imports/github/gh-aw/94662b1dee8ce96c876ba9f33b3ab8be32de82a4/.github_workflows_shared_reporting.md‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎.github/dependabot.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ updates:
3131
github-actions-dependencies:
3232
patterns:
3333
- "*"
34+
ignore:
35+
- dependency-name: "github/gh-aw-actions/**" # Managed by gh aw compile. Version-locked to the gh-aw compiler; do not bump.
3436
cooldown:
3537
default-days: 7
3638
- package-ecosystem: "maven"

‎.github/workflows/build.yml‎

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,40 +16,31 @@
1616
# under the License.
1717

1818
name: Build
19-
20-
on: [push, pull_request]
21-
19+
on:
20+
push:
21+
branches:
22+
- main
23+
- 4.22
24+
- 4.20
25+
pull_request:
2226
concurrency:
2327
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
24-
cancel-in-progress: true
25-
28+
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
2629
permissions:
2730
contents: read
28-
2931
jobs:
3032
build:
31-
runs-on: ubuntu-22.04
33+
runs-on: ubuntu-24.04
3234
steps:
33-
- uses: actions/checkout@v6
34-
35-
- name: Set up JDK 17
36-
uses: actions/setup-java@v5
35+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3736
with:
38-
distribution: 'temurin'
39-
java-version: '17'
40-
cache: 'maven'
37+
persist-credentials: false
4138

42-
- name: Set up Python
43-
uses: actions/setup-python@v6
39+
- name: Setup Environment
40+
uses: ./.github/actions/setup-env
4441
with:
45-
python-version: '3.10'
46-
architecture: 'x64'
47-
48-
- name: Install Build Dependencies
49-
run: |
50-
sudo apt-get update
51-
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
52-
42+
install-python: 'true'
43+
install-apt-deps: 'true'
5344
- name: Env details
5445
run: |
5546
uname -a
@@ -60,9 +51,8 @@ jobs:
6051
free -m
6152
nproc
6253
git status
63-
54+
- name: Install Non-OSS
55+
uses: ./.github/actions/install-nonoss
6456
- name: Noredist Build
6557
run: |
66-
git clone https://github.com/shapeblue/cloudstack-nonoss.git nonoss && cd nonoss && bash -x install-non-oss.sh && cd ..
67-
rm -fr nonoss
6858
mvn -B -P developer,systemvm -Dsimulator -Dnoredist clean install -T$(nproc)

0 commit comments

Comments
 (0)