Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/atex-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
- name: Install test dependencies
run: |
dnf -y install python3-pip git rsync
pip install fmf git+https://github.com/RHSecurityCompliance/atex.git
pip install fmf atex

- name: Run tests on Testing Farm
env:
Expand All @@ -114,7 +114,7 @@ jobs:
with:
name: test-results-centos-stream${{ matrix.centos_stream_major }}
path: |
results-centos-stream-${{ matrix.centos_stream_major }}-x86_64.json.gz
results-centos-stream-${{ matrix.centos_stream_major }}-x86_64.json.xz
files-centos-stream-${{ matrix.centos_stream_major }}-x86_64/
atex_debug.log.gz
retention-days: ${{ env.ARTIFACT_RETENTION_DAYS }}
Expand All @@ -135,7 +135,7 @@ jobs:
if: always()
run: |
dnf -y install python3-pip git rsync
pip install fmf git+https://github.com/RHSecurityCompliance/atex.git
pip install fmf atex

- name: Checkout ATEX results repository
if: always()
Expand Down Expand Up @@ -212,20 +212,20 @@ jobs:

# Process and merge results for all CentOS Stream versions
for version in 8 9 10; do
results_file="test-results/cs${version}/results-centos-stream-${version}-x86_64.json.gz"
results_file="test-results/cs${version}/results-centos-stream-${version}-x86_64.json.xz"
files_dir="test-results/cs${version}/files-centos-stream-${version}-x86_64"

if [ -f "${results_file}" ]; then
cat "${results_file}"
rm -f "${results_file}"
[ -d "${files_dir}" ] && cp -r "${files_dir}"/* atex-results-testing-farm/files_dir/
fi
done > results.json.gz
done > results.json.xz

- name: Convert results to SQLite database
if: always()
run: |
python atex-html/json2db.py results.json.gz atex-results-testing-farm/results.sqlite.gz
python atex-html/json2db.py results.json.xz atex-results-testing-farm/results.sqlite.gz

- name: Prepare HTML results viewer
if: always()
Expand Down
6 changes: 3 additions & 3 deletions tests/run_tests_testingfarm.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

from atex.provisioner.testingfarm import TestingFarmProvisioner
from atex.orchestrator.contest import ContestOrchestrator
from atex.aggregator.json import JSONAggregator
from atex.aggregator.json import LZMAJSONAggregator
from atex.fmf import FMFTests

logger = logging.getLogger("ATEX")
Expand Down Expand Up @@ -87,10 +87,10 @@ def main():
logger.info(f" {test}")

# Setup result aggregator
output_results = f"results-centos-stream-{args.os_major_version}-{args.arch}.json.gz"
output_results = f"results-centos-stream-{args.os_major_version}-{args.arch}.json.xz"
output_files = f"files-centos-stream-{args.os_major_version}-{args.arch}"
partial_runs = Path(output_files) / "old_runs"
aggregator = JSONAggregator(output_results, output_files)
aggregator = LZMAJSONAggregator(output_results, output_files)
stack.enter_context(aggregator)

partial_runs.mkdir(parents=True, exist_ok=True)
Expand Down
Loading