Mirror/FairLogger
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairLogger.git synced 2025-10-13 08:41:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: Update envs

Browse Source
This commit is contained in:
Dennis Klein 2021-09-10 16:06:49 +02:00
parent ba7da2f79a
commit 5d3c097fd8
5 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -59,7 +59,9 @@ pipeline{
steps{ steps{
script { script {
def builds = jobMatrix('alfa-ci', 'build', [ def builds = jobMatrix('alfa-ci', 'build', [
[os: 'fedora', ver: '32', arch: 'x86_64', compiler: 'gcc-10'],
[os: 'fedora', ver: '33', arch: 'x86_64', compiler: 'gcc-10'], [os: 'fedora', ver: '33', arch: 'x86_64', compiler: 'gcc-10'],
[os: 'fedora', ver: '34', arch: 'x86_64', compiler: 'gcc-11'],
[os: 'macos', ver: '11', arch: 'x86_64', compiler: 'apple-clang-12'], [os: 'macos', ver: '11', arch: 'x86_64', compiler: 'apple-clang-12'],
]) ])

18
test/ci/CMakeLists.txt
View File

@ -7,24 +7,12 @@
################################################################################ ################################################################################
function(container) function(container)
cmake_parse_arguments(ARGS "" "OS;VERSION;DOCKER_TAG;PACKAGE_SETUP_SCRIPT" "" ${ARGN}) cmake_parse_arguments(ARGS "" "OS;VERSION" "" ${ARGN})
if(ARGS_DOCKER_TAG)
set(DOCKER_TAG ${ARGS_DOCKER_TAG})
else()
set(DOCKER_TAG "${ARGS_OS}:${ARGS_VERSION}")
endif()
if(ARGS_PACKAGE_SETUP_SCRIPT)
set(PACKAGE_SETUP_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/${ARGS_PACKAGE_SETUP_SCRIPT}")
else()
set(PACKAGE_SETUP_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/setup-${ARGS_OS}.sh")
endif()
set(container "${ARGS_OS}.${ARGS_VERSION}") set(container "${ARGS_OS}.${ARGS_VERSION}")
set(def "${container}.def") set(def "${container}.def")
set(log "${container}.log") set(log "${container}.log")
set(target "${container}.fairlogger.sif") set(target "${container}.sif")
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/linux.def.in" ${def} @ONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/linux.def.in" ${def} @ONLY)
@ -41,6 +29,8 @@ function(container)
set(containers ${containers} PARENT_SCOPE) set(containers ${containers} PARENT_SCOPE)
endfunction() endfunction()
container(OS fedora VERSION 32)
container(OS fedora VERSION 33) container(OS fedora VERSION 33)
container(OS fedora VERSION 34)
add_custom_target(all-containers DEPENDS ${containers}) add_custom_target(all-containers DEPENDS ${containers})

6
test/ci/linux.def.in
View File

@ -1,8 +1,8 @@
Bootstrap: docker Bootstrap: docker
From: @DOCKER_TAG@ From: @ARGS_OS@:@ARGS_VERSION@
%files %files
@PACKAGE_SETUP_SCRIPT@ /setup.sh @CMAKE_CURRENT_SOURCE_DIR@/setup-@ARGS_OS@.sh /setup.sh
%post %post
bash /setup.sh bash /setup.sh @ARGS_VERSION@

7
test/ci/setup-fedora.sh
View File

@ -1,8 +1,7 @@
#! /bin/bash #! /bin/bash
dnf -y update dnf -y update
dnf -y groupinstall "C Development Tools and Libraries" dnf -y install https://alfa-ci.gsi.de/packages/rpm/fedora-$1-x86_64/fairsoft-release-dev.rpm
dnf -y install binutils boost-devel cmake ca-certificates coreutils diffutils \ dnf -y install boost-devel ninja-build 'dnf-command(builddep)' libasan liblsan libtsan libubsan clang-tools-extra
findutils fmt-devel gcc-c++ git hostname ninja-build patch procps python \ dnf -y builddep fairlogger
redhat-lsb-core sed tar wget which
dnf -y clean all dnf -y clean all

10
test/ci/slurm-submit.sh
View File

@ -3,18 +3,12 @@
label="$1" label="$1"
jobsh="$2" jobsh="$2"
if [ -z "$ALFACI_SLURM_CPUS" ] ALFACI_SLURM_CPUS=4
then
ALFACI_SLURM_CPUS=32
fi
if [ -z "$ALFACI_SLURM_EXTRA_OPTS" ] if [ -z "$ALFACI_SLURM_EXTRA_OPTS" ]
then then
ALFACI_SLURM_EXTRA_OPTS="--hint=compute_bound" ALFACI_SLURM_EXTRA_OPTS="--hint=compute_bound"
fi fi
if [ -z "$ALFACI_SLURM_TIMEOUT" ] ALFACI_SLURM_TIMEOUT=10
then
ALFACI_SLURM_TIMEOUT=30
fi
if [ -z "$ALFACI_SLURM_QUEUE" ] if [ -z "$ALFACI_SLURM_QUEUE" ]
then then
ALFACI_SLURM_QUEUE=main ALFACI_SLURM_QUEUE=main