Skip to content
Snippets Groups Projects

cleanup + temporary fix of CI

Merged cleanup + temporary fix of CI
bugfix/CI into migration
Merged Patrick Louis S Connor requested to merge bugfix/CI into migration
Compare
and
1 file
+ 38
− 83
Compare changes
  • Side-by-side
  • Inline
.gitlab-ci.yml
+ 38
− 83
image: gitlab-registry.cern.ch/ci-tools/ci-worker:cc7
before_script:
- source /cvmfs/cms.cern.ch/cmsset_default.sh
- shopt -s expand_aliases # allows aliases like cmsenv to be used
- yum install -y openssl-devel python3 zsh
- yum install -y cmake python3 zsh which libtirpc libicu libglvnd-glx pcre2-utf16 libXrender libSM glibc-devel zlib-devel git-lfs
- source /cvmfs/sft.cern.ch/lcg/views/LCG_104/x86_64-el9-gcc13-opt/setup.sh
installation_cmake:
installation:
stage: build
variables:
GIT_STRATEGY: none # Will be checked out by the installer
@@ -15,12 +12,12 @@ installation_cmake:
paths:
- Installer/
script:
- source /cvmfs/sft.cern.ch/lcg/views/LCG_104/x86_64-centos7-gcc12-opt/setup.sh
# Get the installer
- git clone https://gitlab.cern.ch/lmoureau/Darwin.git -b feature/cmake Installer # TODO
# Compile everything (with ninja!)
- cmake Installer -B build -G Ninja -DCORE_GIT_REPOSITORY="$CI_REPOSITORY_URL" -DCORE_GIT_TAG="$CI_COMMIT_REF_NAME"
# Compile everything
- cmake Installer -B build -DCORE_GIT_REPOSITORY="$CI_REPOSITORY_URL" -DCORE_GIT_TAG="$CI_COMMIT_REF_NAME"
- cmake --build build --target install -j
# TODO: doxygen
test_cmake:
stage: test
@@ -31,52 +28,17 @@ test_cmake:
artifacts:
when: always
paths:
- Installer/Core.build/bin/printDarwinSoftwareVersion
- Installer/Core.build/test_report.xml
- Installer/Core.build/Testing/Temporary/LastTest.log
reports:
junit: Installer/Core.build/test_report.xml
script:
- source /cvmfs/sft.cern.ch/lcg/views/LCG_104/x86_64-centos7-gcc12-opt/setup.sh
- cd Installer/Core.build
- cd Installer
- source tools/setup.sh
- printDarwinSoftwareVersion
- cd Core.build
- ctest --output-junit test_report.xml -j$(nproc)
installation:
stage: build
variables:
GIT_STRATEGY: clone
tags:
- cvmfs
artifacts:
paths:
- DAS/
script:
- yum install -y cmake3
# All the cd and mv gymnastics below is there to make sure install.sh
# picks up the version of Core we want to test.
# We start within a copy of the right version of Core. Rename it so we
# can move it more easily later.
- REPO=$PWD
- cd ..
- mv $REPO $REPO.bak
# Create an empty dir with the same name so GitLab copies artifacts.
- mkdir $REPO
- cd $REPO
# Now get the installer and run it.
- git clone https://gitlab.cern.ch/cms-analysis/general/DasAnalysisSystem/gitlab-profile.git DAS
- cd DAS
- ./install.sh
- cd CMSSW_*; cmsenv; cd ..
# Delete the Core fetched by the installer and replace it with our own.
- rm -rf CMSSW_*/src/Core
- mv $REPO.bak CMSSW_12_4_0/src/Core
# Finally compile everything.
- cd CMSSW_*
- scram b -j$(nproc)
# And generate the docs.
- src/Core/CommonTools/doc/mkDoc
clang-format:
stage: test
variables:
@@ -85,39 +47,37 @@ clang-format:
- cvmfs
allow_failure: true
script:
- cd DAS/CMSSW_*
- cmsenv
- echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
- echo $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
- git-clang-format --diff $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
- git-clang-format --diff $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
- "[[ -z \"$(git-clang-format -q --diff $CI_MERGE_REQUEST_TARGET_BRANCH_NAME)\" ]]"
analysis:
retry: 2
stage: test
variables:
GIT_STRATEGY: none
tags:
- cvmfs
allow_failure: true
artifacts:
when: on_failure
paths:
- _test
script:
- TEST_FOLDER=$PWD/_test
- |
(cd DAS/CMSSW_*/src/Core/Ntupliser/test
cmsenv
./mkFastSimTestSample.sh $TEST_FOLDER
./mkNtuple.sh $TEST_FOLDER/mc $TEST_FOLDER/MINIAODSIMv2-DYToLL_M-50_13TeV_pythia8_cff-UL18.root yes
./mkNtuple.sh $TEST_FOLDER/data $TEST_FOLDER/MINIAODv2-DYToLL_M-50_13TeV_pythia8_cff-UL18.root no)
- find $TEST_FOLDER
- source /cvmfs/sft.cern.ch/lcg/views/LCG_104/x86_64-centos7-gcc12-opt/setup.sh
- source Installer/tools/setup.sh
- Installer/Core/Ntupliser/test/runAnalysis.sh $TEST_FOLDER/mc $TEST_FOLDER/mc/ntuple.root yes
- Installer/Core/Ntupliser/test/runAnalysis.sh $TEST_FOLDER/data $TEST_FOLDER/data/ntuple.root no
# TODO: first solve https://gitlab.cern.ch/cms-analysis/general/DasAnalysisSystem/Core/-/merge_requests/170
#analysis:
# retry: 2
# stage: test
# variables:
# GIT_STRATEGY: none
# tags:
# - cvmfs
# allow_failure: true
# artifacts:
# when: on_failure
# paths:
# - _test
# script:
# - TEST_FOLDER=$PWD/_test
# - |
# (cd DAS/CMSSW_*/src/Core/Ntupliser/test
# cmsenv
# ./mkFastSimTestSample.sh $TEST_FOLDER
# ./mkNtuple.sh $TEST_FOLDER/mc $TEST_FOLDER/MINIAODSIMv2-DYToLL_M-50_13TeV_pythia8_cff-UL18.root yes
# ./mkNtuple.sh $TEST_FOLDER/data $TEST_FOLDER/MINIAODv2-DYToLL_M-50_13TeV_pythia8_cff-UL18.root no)
# - find $TEST_FOLDER
# - source Installer/tools/setup.sh
# - Installer/Core/Ntupliser/test/runAnalysis.sh $TEST_FOLDER/mc $TEST_FOLDER/mc/ntuple.root yes
# - Installer/Core/Ntupliser/test/runAnalysis.sh $TEST_FOLDER/data $TEST_FOLDER/data/ntuple.root no
pages:
stage: deploy
@@ -132,17 +92,12 @@ pages:
- if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
tags:
- cvmfs
before_script:
- yum install -y zsh ghostscript
script:
- source /cvmfs/sft.cern.ch/lcg/releases/gcc/9.3.0-467e1/x86_64-centos7/setup.sh
- source /cvmfs/sft.cern.ch/lcg/views/LCG_100/x86_64-centos7-gcc9-opt/setup.sh
script: # TODO: first solve https://gitlab.cern.ch/cms-analysis/general/DasAnalysisSystem/Core/-/merge_requests/152
- yum install -y ghostscript
- export PATH=/cvmfs/sft.cern.ch/lcg/external/texlive/latest/bin/x86_64-linux:$PATH
- doxygen --version
- cd DAS/CMSSW_*
- VERSION=$CI_COMMIT_SHA
CMSSW_BASE=$PWD
doxygen src/Core/CommonTools/doc/Doxyfile
doxygen Core/CommonTools/doc/Doxyfile
- mv doc/html $OLDPWD/public
- make -C doc/latex || cat doc/latex/refman.log
- mv doc/latex/ $OLDPWD