From 8523d9bae52d7f390b08101bb9fefbb43e46a5e8 Mon Sep 17 00:00:00 2001 From: James Adams Date: Fri, 9 Jan 2026 18:38:00 +0000 Subject: [PATCH] Reuse shared workflows to run tests --- .github/workflows/continuous-integration.yaml | 35 ++++--------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index 9f54be7..eaa52f7 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -3,32 +3,9 @@ name: Run Tests on: [push, pull_request] jobs: - runtests: - runs-on: ubuntu-latest - container: - image: ghcr.io/quattor/quattor-test-container:latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - - name: Determine hash for caching key - id: cachekeystep - run: echo "pomcachekey=${{ hashFiles('**/pom.xml') }}" >> $GITHUB_ENV - - name: Cache Maven packages - uses: actions/cache@v4 - with: - path: /tmp/m2 - key: ${{ runner.os }}-m2-${{ env.pomcachekey }} - restore-keys: ${{ runner.os }}-m2- - - name: set up dependencies - run: | - dnf -y install perl-Config-General - - name: run tests - run: | - # make sure it exists before chown - mkdir -p /tmp/m2 - chown -R quattortest:quattortest . /tmp/m2 - # we have to run as a non-root user to pass the spma tests - # secondly, we first download all maven dependencies and then run the tests because it fails with hanging downloads otherwise. - 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 - env: - MVN_ARGS: -Dmaven.repo.local=/tmp/m2 + standard-maven: + uses: quattor/release/.github/workflows/maven-tests.yaml@main + with: + dependencies: perl-Config-General + standard-pan: + uses: quattor/release/.github/workflows/pan-template-tests.yaml@main