Skip to content

Commit d64adb4

Browse files
committed
Scope DEVELOCITY_ACCESS_KEY to the Maven steps
Signed-off-by: Gasper Kojek <gkojek@gradle.com>
1 parent e8d7b4c commit d64adb4

5 files changed

Lines changed: 18 additions & 10 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ concurrency:
2828
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
2929
permissions:
3030
contents: read
31-
env:
32-
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3331
jobs:
3432
build:
3533
runs-on: ubuntu-24.04
@@ -56,5 +54,7 @@ jobs:
5654
- name: Install Non-OSS
5755
uses: ./.github/actions/install-nonoss
5856
- name: Noredist Build
57+
env:
58+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5959
run: |
6060
mvn -B -P developer,systemvm -Dsimulator -Dnoredist clean install -T$(nproc)

‎.github/workflows/ci.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ concurrency:
2828
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
2929
permissions:
3030
contents: read
31-
env:
32-
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3331
jobs:
3432
build:
3533
if: github.repository == 'apache/cloudstack'
@@ -56,6 +54,8 @@ jobs:
5654
git status
5755
ipmitool -V
5856
- name: Build with Maven
57+
env:
58+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5959
run: |
6060
mvn -B -P developer,systemvm -Dsimulator clean install -DskipTests=true -T$(nproc)
6161
- name: Archive artifacts
@@ -309,6 +309,8 @@ jobs:
309309
mkdir -p ~/.m2/repository
310310
tar -xzf /tmp/artifacts/m2-cloudstack.tar.gz -C ~/.m2/repository
311311
- name: Setup Simulator Prerequisites
312+
env:
313+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
312314
run: |
313315
sudo python3 -m pip install --upgrade netaddr mysql-connector-python
314316
python3 -m pip install --user --upgrade tools/marvin/dist/[mM]arvin-*.tar.gz
@@ -321,6 +323,8 @@ jobs:
321323
find . | grep "src/main/java" | sed 's/\/java\//\/java /g' | awk '{print "--sourcefiles", $1, "\\"}' | sort | uniq >> jacoco-report.sh
322324
echo "--xml jacoco-coverage.xml" >> jacoco-report.sh
323325
- name: Start CloudStack Management Server with Simulator
326+
env:
327+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
324328
run: |
325329
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"
326330
echo -e "\nStarting simulator"
@@ -331,6 +335,8 @@ jobs:
331335
echo -e "\nStarting Advanced Zone DataCenter deployment"
332336
python3 tools/marvin/marvin/deployDataCenter.py -i setup/dev/advdualzone.cfg 2>&1 || true
333337
- name: Run Integration Tests with Simulator
338+
env:
339+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
334340
run: |
335341
mkdir -p integration-test-results/smoke/misc
336342
mkdir -p integration-test-results/component

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ on:
2525
concurrency:
2626
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
2727
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
28-
env:
29-
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3028
jobs:
3129
build:
3230
if: github.repository == 'apache/cloudstack'
@@ -51,9 +49,12 @@ jobs:
5149
- name: Install Non-OSS
5250
uses: ./.github/actions/install-nonoss
5351
- name: Run Build and Tests with Coverage
52+
env:
53+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5454
run: mvn -B -T$(nproc) -P developer,systemvm,quality -Dsimulator -Dnoredist clean install
5555
- name: Upload to SonarQube
5656
env:
57+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5758
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5859
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
5960
run: mvn -B -P quality org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=apache_cloudstack -Dsonar.branch.name=${{ github.ref_name }}

‎.github/workflows/rat.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ concurrency:
2828
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
2929
permissions:
3030
contents: read
31-
env:
32-
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
3331
jobs:
3432
build:
3533
runs-on: ubuntu-24.04
@@ -42,6 +40,8 @@ jobs:
4240
- name: Install Non-OSS
4341
uses: ./.github/actions/install-nonoss
4442
- name: RAT licence checks
43+
env:
44+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
4545
run: |
4646
mvn -P developer,systemvm -Dsimulator -Dnoredist -pl . org.apache.rat:apache-rat-plugin:0.12:check
4747
- name: Rat Report

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ on:
2424
concurrency:
2525
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
2626
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
27-
env:
28-
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
2927
jobs:
3028
build:
3129
name: Sonar JaCoCo Coverage
@@ -49,10 +47,13 @@ jobs:
4947
- name: Install Non-OSS
5048
uses: ./.github/actions/install-nonoss
5149
- name: Run Build and Tests with Coverage
50+
env:
51+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5252
run: mvn -B -T$(nproc) -P developer,systemvm,quality -Dsimulator -Dnoredist clean install
5353
- name: Upload to SonarQube
5454
if: github.repository == 'apache/cloudstack' && github.event.pull_request.head.repo.full_name == github.repository
5555
env:
56+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
5657
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5758
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
5859
PR_ID: ${{ github.event.pull_request.number }}

0 commit comments

Comments
 (0)