Skip to content

Commit 6e1938c

Browse files
authored
Merge pull request #1849 from jrha/reuse_workflows
Reuse shared workflow to run all standard tests
2 parents 4d4b350 + 3d41fd0 commit 6e1938c

File tree

3 files changed

+4
-77
lines changed

3 files changed

+4
-77
lines changed

.ci-scripts/indent

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

.ci-scripts/panlint

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

.github/workflows/continuous-integration.yaml

Lines changed: 4 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -3,64 +3,7 @@ name: Run Tests
33
on: [push, pull_request]
44

55
jobs:
6-
runtests:
7-
runs-on: ubuntu-latest
8-
container:
9-
image: ghcr.io/quattor/quattor-test-container:latest
10-
steps:
11-
- name: Checkout code
12-
uses: actions/checkout@v4
13-
- name: Determine hash for caching key
14-
id: cachekeystep
15-
run: echo "pomcachekey=${{ hashFiles('**/pom.xml') }}" >> $GITHUB_ENV
16-
- name: Cache Maven packages
17-
uses: actions/cache@v4
18-
with:
19-
path: /tmp/m2
20-
key: ${{ runner.os }}-m2-${{ env.pomcachekey }}
21-
restore-keys: ${{ runner.os }}-m2-
22-
- name: run tests
23-
run: |
24-
# make sure it exists before chown
25-
mkdir -p /tmp/m2
26-
chown -R quattortest:quattortest . /tmp/m2
27-
# we have to run as a non-root user to pass the spma tests
28-
# secondly, we first download all maven dependencies and then run the tests because it fails with hanging downloads otherwise.
29-
runuser --shell /bin/bash --preserve-environment --command "source /usr/bin/mvn_test.sh && mvn_run \"dependency:resolve-plugins dependency:go-offline $MVN_ARGS\" && mvn_test" quattortest
30-
env:
31-
MVN_ARGS: -Dmaven.repo.local=/tmp/m2
32-
33-
panlint:
34-
runs-on: ubuntu-latest
35-
steps:
36-
- name: Checkout code
37-
uses: actions/checkout@v4
38-
with:
39-
# we need the full repo or HEAD^ does not work
40-
fetch-depth: 0
41-
- name: Set up Python
42-
uses: actions/setup-python@v5
43-
with:
44-
python-version: 3
45-
- name: Install dependencies
46-
run: pip install colorama prettytable six
47-
- name: run panlint
48-
run: .ci-scripts/panlint
49-
50-
indentation:
51-
runs-on: ubuntu-latest
52-
steps:
53-
- name: Checkout code
54-
uses: actions/checkout@v4
55-
with:
56-
# we need the full repo or HEAD^ does not work
57-
fetch-depth: 0
58-
- name: Set up Python
59-
uses: actions/setup-python@v5
60-
with:
61-
python-version: 3
62-
- name: Install dependencies
63-
run: pip install colorama
64-
- name: run indent checker
65-
run: .ci-scripts/indent
66-
6+
standard-maven:
7+
uses: quattor/release/.github/workflows/maven-tests.yaml@main
8+
standard-pan:
9+
uses: quattor/release/.github/workflows/pan-template-tests.yaml@main

0 commit comments

Comments
 (0)