Skip to content

Commit

Permalink
♻️ [CI] Cleanup
Browse files Browse the repository at this point in the history
Signed-off-by: Alberto Codutti <[email protected]>
  • Loading branch information
Coduz committed Jan 24, 2025
1 parent 0d2ff28 commit 3d876da
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/actions/runTestsTaggedAs/action.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Execute tests tagged in a certain way'
name: 'Execute tests'
description: 'Execute tests suite for tests tagged as specified'
inputs:
tag:
Expand Down
1 change: 1 addition & 0 deletions .github/actions/saveBuiltKapuaArtifacts/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ runs:
mkdir --parents ~/.m2/kapua-repository/org/eclipse/
mv ~/.m2/repository/org/eclipse/kapua ~/.m2/kapua-repository/org/eclipse/kapua
shell: bash

- name: Save built Kapua artifacts
uses: actions/cache/save@v4
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/setUpRunner/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: |
- Setup Java 11
- Setup Node 16
- Install Swagger CLI
- Add entries to /etc/hosts
- Add entries to /etc/hosts for tests
runs:
using: "composite"
steps:
Expand All @@ -15,11 +15,11 @@ runs:
java-version: 11

- name: Setup Node 16
uses: actions/setup-node@v4 # Installs Node and NPM
uses: actions/setup-node@v4
with:
node-version: 16

- name: Install Swagger CLI # Installs Swagger CLI to bundle OpenAPI files
- name: Install Swagger CLI # Required to bundle OpenAPI files
run: 'npm install -g @apidevtools/swagger-cli'
shell: bash

Expand Down
29 changes: 21 additions & 8 deletions .github/workflows/kapua-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,16 @@ jobs:
steps:
- name: Checkout repository # Checks out a copy of the repository on the runner
uses: actions/checkout@v4

- name: Set up runner
uses: ./.github/actions/setUpRunner

- name: Set up Maven caches
uses: ./.github/actions/setUpMavenCaches
with:
kapua-artifact-cache-enabled: 'false'

- name: Maven version
run: mvn --version

- name: Build Kapua project
run: mvn -B -DskipTests clean install -T 1C

- name: Save built Kapua Artifacts
uses: ./.github/actions/saveBuiltKapuaArtifacts

Expand All @@ -41,15 +36,12 @@ jobs:
steps:
- name: Checkout repository # Checks out a copy of the repository on the runner
uses: actions/checkout@v4

- name: Set up runner
uses: ./.github/actions/setUpRunner

- name: Set up Maven caches
uses: ./.github/actions/setUpMavenCaches
with:
kapua-artifact-cache-enabled: 'false'

- name: Build Kapua Javadoc
run: mvn -B -DskipTests install javadoc:jar

Expand Down Expand Up @@ -81,6 +73,7 @@ jobs:
with:
tag: '@brokerAcl'
needs-docker-images: 'true'

test-tag:
needs: build
runs-on: ubuntu-latest
Expand All @@ -94,6 +87,7 @@ jobs:
with:
tag: '@tag'
needs-docker-images: 'false'

test-broker:
needs: build
runs-on: ubuntu-latest
Expand All @@ -107,6 +101,7 @@ jobs:
with:
tag: '@broker'
needs-docker-images: 'true'

test-device:
needs: build
runs-on: ubuntu-latest
Expand All @@ -120,6 +115,7 @@ jobs:
with:
tag: '@device'
needs-docker-images: 'true'

test-device-management:
needs: build
runs-on: ubuntu-latest
Expand All @@ -133,6 +129,7 @@ jobs:
with:
tag: '@deviceManagement'
needs-docker-images: 'true'

test-connection:
needs: build
runs-on: ubuntu-latest
Expand All @@ -146,6 +143,7 @@ jobs:
with:
tag: '@connection'
needs-docker-images: 'true'

test-datastore:
needs: build
runs-on: ubuntu-latest
Expand All @@ -159,6 +157,7 @@ jobs:
with:
tag: '@datastore'
needs-docker-images: 'true'

test-user:
needs: build
runs-on: ubuntu-latest
Expand All @@ -172,6 +171,7 @@ jobs:
with:
tag: '@user'
needs-docker-images: 'false'

test-userIntegrationBase:
needs: build
runs-on: ubuntu-latest
Expand All @@ -185,6 +185,7 @@ jobs:
with:
tag: '@userIntegrationBase'
needs-docker-images: 'true'

test-userIntegration:
needs: build
runs-on: ubuntu-latest
Expand All @@ -198,6 +199,7 @@ jobs:
with:
tag: '@userIntegration'
needs-docker-images: 'true'

test-security:
needs: build
runs-on: ubuntu-latest
Expand All @@ -211,6 +213,7 @@ jobs:
with:
tag: '@security'
needs-docker-images: 'false'

test-jobsAndScheduler:
needs: build
runs-on: ubuntu-latest
Expand All @@ -224,6 +227,7 @@ jobs:
with:
tag: '(@job or @scheduler) and not @it'
needs-docker-images: 'false'

test-job-IT:
needs: build
runs-on: ubuntu-latest
Expand All @@ -237,6 +241,7 @@ jobs:
with:
tag: '@job and @it'
needs-docker-images: 'true'

test-jobEngine-IT:
needs: build
runs-on: ubuntu-latest
Expand All @@ -250,6 +255,7 @@ jobs:
with:
tag: '@jobEngine'
needs-docker-images: 'true'

test-jobsIntegration:
needs: build
runs-on: ubuntu-latest
Expand All @@ -263,6 +269,7 @@ jobs:
with:
tag: '@jobsIntegration'
needs-docker-images: 'true'

test-accountAndTranslator:
needs: build
runs-on: ubuntu-latest
Expand All @@ -276,6 +283,7 @@ jobs:
with:
tag: '@account or @translator'
needs-docker-images: 'false'

test-RoleAndGroup:
needs: build
runs-on: ubuntu-latest
Expand All @@ -289,6 +297,7 @@ jobs:
with:
tag: '@role or @group'
needs-docker-images: 'false'

test-deviceRegistry:
needs: build
runs-on: ubuntu-latest
Expand All @@ -302,6 +311,7 @@ jobs:
with:
tag: '@deviceRegistry'
needs-docker-images: 'true'

test-endpoint:
needs: build
runs-on: ubuntu-latest
Expand All @@ -315,6 +325,7 @@ jobs:
with:
tag: '@endpoint'
needs-docker-images: 'true'

test-api-auth:
needs: build
runs-on: ubuntu-latest
Expand All @@ -329,6 +340,7 @@ jobs:
tag: '@rest_auth'
needs-docker-images: 'true'
needs-api-docker-image: 'true'

test-api-corsfilter:
needs: test-endpoint # test suite dependent on the endpoint service (if it has failings it's useless to perform these tests)
runs-on: ubuntu-latest
Expand All @@ -343,6 +355,7 @@ jobs:
tag: '@rest_cors'
needs-docker-images: 'true'
needs-api-docker-image: 'true'

test-api-parsing:
needs: test-api-auth
runs-on: ubuntu-latest
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/security-scan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ on:
push:
branches:
- 'develop'
- 'release-**'
- 'feat-improvedGitHubActionCaching'

env:
BUILD_OPTS: ""
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/sonarCloud-scan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@ on:
push:
branches:
- 'develop'
- 'release-**'
- 'feat-improvedGitHubActionCaching'
pull_request:
branches:
- 'develop'
- 'release-**'

jobs:
build:
Expand Down

0 comments on commit 3d876da

Please sign in to comment.