diff --git a/README.md b/README.md index 413ac05..979f422 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,7 @@ Jobs are submitted to the queue by `batch-launcher.sh`. Currently this is: * One build-and-test cycle for each supported operating system * One build-and-test cycle on Ubuntu LTS with asan and ubsan enabled * cppcheck and clang-analyzer static analysis on Ubuntu LTS +* Tarball generation on debian-stable Each job is submitted to a SLURM partition corresponding to the desired runner type. Partitions all have a single SLURM node in them, with the exception of ubuntu-lts which has two. diff --git a/batch-launcher.sh b/batch-launcher.sh index 902ae04..642b4e2 100755 --- a/batch-launcher.sh +++ b/batch-launcher.sh @@ -44,11 +44,15 @@ sbatch-wrapper.sh -L rikers:1 -p ubuntu-lts run-task job-ubuntu-analyze.sh 2>&1 JOB7=`sbatch-wrapper.sh -L macmini:1 -p macos run-task-macos job-macos.sh` JOB8=`sbatch-wrapper.sh -L macmini:1 -p debian-stable-aarch64 run-task job-debian.sh` +######################################################################################################################## +#Tarball generation shouldn't use any real resources, so not requesting license for it +JOB9=`sbatch-wrapper.sh -p debian-stable run-task job-tarball.sh` + ######################################################################################################################## # When all jobs that can generate artifacts have finished, run a job that processes their results # This job uses negligible CPU so while it runs on sanquentin doesn't request a vCPU license sbatch-wrapper.sh \ -p postprocess \ - --dependency=$JOB0,$JOB1,$JOB2,$JOB3,$JOB4,$JOB5,$JOB6,$JOB7,$JOB8 \ - /home/ci/scopehal-ci-scripts/postprocess.sh $JOB0 $JOB1 $JOB2 $JOB3 $JOB4 $JOB5 $JOB6 $JOB7 $JOB8 + --dependency=$JOB0,$JOB1,$JOB2,$JOB3,$JOB4,$JOB5,$JOB6,$JOB7,$JOB8,$JOB9 \ + /home/ci/scopehal-ci-scripts/postprocess.sh $JOB0 $JOB1 $JOB2 $JOB3 $JOB4 $JOB5 $JOB6 $JOB7 $JOB8 $JOB9 diff --git a/ci-jobs/job-tarball.sh b/ci-jobs/job-tarball.sh new file mode 100644 index 0000000..f622b68 --- /dev/null +++ b/ci-jobs/job-tarball.sh @@ -0,0 +1,8 @@ +#!/bin/bash +export BRANCH=$1 +export COMMIT=$2 + +git clone --recursive https://github.com/ngscopeclient/scopehal-apps +cd scopehal-apps +git checkout $COMMIT +./test-scripts/test-driver-create-tarballs.sh