Skip to content

Commit e9fd76f

Browse files
abh1sarabh1sar
authored
Merge branch 'main' into forwarded-ip-accesslog
2 parents cad2aa4 + 2dbc86a commit e9fd76f

File tree

97 files changed

+694
-66
lines changed

Some content is hidden

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

97 files changed

+694
-66
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: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,32 @@ repos:
2525
hooks:
2626
- id: identity
2727
- id: check-hooks-apply
28+
- repo: https://github.com/oxipng/oxipng
29+
rev: v9.1.5
30+
hooks:
31+
- id: oxipng
32+
name: run oxipng
33+
description: optimize PNG images with lossless compression
34+
args: ['-o', '4', '--strip', 'safe', '--alpha']
2835
- repo: https://github.com/gitleaks/gitleaks
2936
rev: v8.27.2
3037
hooks:
3138
- id: gitleaks
3239
name: run gitleaks
3340
description: detect hardcoded secrets
41+
- repo: https://github.com/Lucas-C/pre-commit-hooks
42+
rev: v1.5.5
43+
hooks:
44+
- id: insert-license
45+
name: add license for all Markdown files
46+
files: \.md$
47+
args:
48+
- --comment-style
49+
- '<!--|| -->'
50+
- --license-filepath
51+
- .github/workflows/license-templates/LICENSE.txt
52+
- --fuzzy-match-generates-todo
53+
exclude: ^(CHANGES|ISSUE_TEMPLATE|PULL_REQUEST_TEMPLATE)\.md$|^ui/docs/(full|smoke)-test-plan\.template\.md$
3454
- repo: https://github.com/pre-commit/pre-commit-hooks
3555
rev: v6.0.0
3656
hooks:
@@ -97,6 +117,14 @@ repos:
97117
args: [--config=.github/linters/.markdown-lint.yml]
98118
types: [markdown]
99119
files: \.(md|mdown|markdown)$
120+
- repo: https://github.com/Lucas-C/pre-commit-hooks
121+
rev: v1.5.5
122+
hooks:
123+
- id: chmod
124+
name: set file permissions
125+
args: ['644']
126+
files: \.md$
127+
stages: [manual]
100128
- repo: https://github.com/adrienverge/yamllint
101129
rev: v1.37.1
102130
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)

‎api/src/main/java/org/apache/cloudstack/api/response/UpgradeRouterTemplateResponse.java‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,10 @@
1616
// under the License.
1717
package org.apache.cloudstack.api.response;
1818

19-
import com.google.gson.annotations.SerializedName;
20-
21-
import org.apache.cloudstack.api.ApiConstants;
2219
import org.apache.cloudstack.api.BaseResponse;
2320
import org.apache.cloudstack.api.EntityReference;
2421
import org.apache.cloudstack.jobs.JobInfo;
2522

26-
import com.cloud.serializer.Param;
27-
2823
@EntityReference(value = JobInfo.class)
29-
@SuppressWarnings("unused")
3024
public class UpgradeRouterTemplateResponse extends BaseResponse {
31-
@SerializedName(ApiConstants.JOB_ID)
32-
@Param(description = "the id of AsyncJob")
33-
private String asyncJobId;
34-
35-
public String getAsyncJobId() {
36-
return asyncJobId;
37-
}
38-
39-
public void setAsyncJobId(String asyncJobId) {
40-
this.asyncJobId = asyncJobId;
41-
}
4225
}

‎packaging/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
# CloudStack RPM and DEB packaging
221
This directory contains all the required scripts and tools needed to build RPM and DEB packages for Apache CloudStack.
322

0 commit comments

Comments
 (0)