From d32fd3dea40b20ac0721ffabbee0c5cddc5d9c67 Mon Sep 17 00:00:00 2001 From: James Adams Date: Fri, 9 Jan 2026 17:06:56 +0000 Subject: [PATCH] Reuse shared workflows to run tests --- .ci-scripts/indent | 8 --- .ci-scripts/panlint | 8 --- .ci-scripts/test-library | 15 ------ .github/workflows/continuous-integration.yaml | 51 ++----------------- .travis-scripts/test-library | 11 ---- .travis.yml | 6 --- 6 files changed, 3 insertions(+), 96 deletions(-) delete mode 100755 .ci-scripts/indent delete mode 100755 .ci-scripts/panlint delete mode 100755 .ci-scripts/test-library delete mode 100755 .travis-scripts/test-library delete mode 100644 .travis.yml diff --git a/.ci-scripts/indent b/.ci-scripts/indent deleted file mode 100755 index 6524e12..0000000 --- a/.ci-scripts/indent +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -set -e # halt script on error - -rm -f /tmp/indent.py -wget -q https://raw.githubusercontent.com/stfc/Pan-Indenter/master/pan_indent_checker.py -O /tmp/indent.py -chmod u+x /tmp/indent.py - -git diff --name-only --diff-filter=d HEAD^ | grep '\.pan$' | xargs -rn1 /tmp/indent.py check || exit 1 diff --git a/.ci-scripts/panlint b/.ci-scripts/panlint deleted file mode 100755 index fdb53b0..0000000 --- a/.ci-scripts/panlint +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -set -e # halt script on error - -rm -f /tmp/panlint.py -wget -q https://raw.githubusercontent.com/quattor/pan/master/panc/src/main/scripts/panlint/panlint.py -O /tmp/panlint.py -chmod u+x /tmp/panlint.py - -git diff --name-only --diff-filter=d HEAD^ | grep '\.pan$' | xargs -r /tmp/panlint.py || exit 1 diff --git a/.ci-scripts/test-library b/.ci-scripts/test-library deleted file mode 100755 index 794381c..0000000 --- a/.ci-scripts/test-library +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -set -e # halt script on error - -echo GITHUB_REPOSITORY: ${GITHUB_REPOSITORY} -echo GITHUB_BASE_REF: ${GITHUB_BASE_REF} -echo GITHUB_WORKSPACE: ${GITHUB_WORKSPACE} - -# Retrieve last version of create-vanilla-SCDB from GitHub -echo "Downloading create-vanilla-SCDB from GitHub..." -rm -f /tmp/create-vanilla-SCDB.sh -wget -q https://raw.githubusercontent.com/quattor/scdb/master/utils/scdb/create-vanilla-SCDB.sh -O /tmp/create-vanilla-SCDB.sh -chmod u+x /tmp/create-vanilla-SCDB.sh - -/tmp/create-vanilla-SCDB.sh -F --continuous-integration HEAD diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index 22bc397..9cd4037 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -3,52 +3,7 @@ name: Run Tests on: [push, pull_request] jobs: - test-library: - runs-on: ubuntu-latest - container: ghcr.io/quattor/quattor-test-container:latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - - name: Install dependencies - run: dnf -y install subversion - - name: run tests - run: .ci-scripts/test-library - env: - TRAVIS_BUILD_DIR: "$GITHUB_WORKSPACE" - TRAVIS_REPO_SLUG: "$GITHUB_REPOSITORY" - TRAVIS_BRANCH: "${GITHUB_HEAD_REF:-master}" - - panlint: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - # we need the full repo or HEAD^ does not work - fetch-depth: 0 - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: 3 - - name: Install dependencies - run: pip install colorama prettytable six - - name: run panlint - run: .ci-scripts/panlint - - indentation: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - # we need the full repo or HEAD^ does not work - fetch-depth: 0 - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: 3 - - name: Install dependencies - run: pip install colorama - - name: run indent checker - run: .ci-scripts/indent + uses: quattor/release/.github/workflows/vanilla-scdb.yaml@main + standard-pan: + uses: quattor/release/.github/workflows/pan-template-tests.yaml@main diff --git a/.travis-scripts/test-library b/.travis-scripts/test-library deleted file mode 100755 index 6bb5bec..0000000 --- a/.travis-scripts/test-library +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -set -e # halt script on error - -# Retrieve last version of create-vanilla-SCDB from GitHub -echo "Downloading create-vanilla-SCDB from GitHub..." -rm -f /tmp/create-vanilla-SCDB.sh -wget -q https://raw.githubusercontent.com/quattor/scdb/master/utils/scdb/create-vanilla-SCDB.sh -O /tmp/create-vanilla-SCDB.sh -chmod u+x /tmp/create-vanilla-SCDB.sh - -/tmp/create-vanilla-SCDB.sh -F --continuous-integration HEAD diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c4a12de..0000000 --- a/.travis.yml +++ /dev/null @@ -1,6 +0,0 @@ -language: bash - -script: - - ./.travis-scripts/test-library - -sudo: false