From 7818fed947d569bae62a0075424e2342c80f4cc0 Mon Sep 17 00:00:00 2001 From: Enrico Gamberini Date: Thu, 12 Oct 2023 15:27:43 +0200 Subject: [PATCH 01/17] add al9-jobs --- .gitlab-ci.yml | 85 +++++++++++++++++++++++++++++++++++++----- CMakeLists.txt | 2 +- Dockerfile-builder.al9 | 6 +++ cmake/Lint.cmake | 2 +- cmake/Pack.cmake | 2 + 5 files changed, 86 insertions(+), 11 deletions(-) create mode 100644 Dockerfile-builder.al9 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 321ce44..2cd878e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ stages: - package - deploy -docker: +cc7-docker: stage: docker extends: .docker-builder rules: @@ -26,7 +26,19 @@ docker: IMAGE: "$CI_REGISTRY_IMAGE/builder" DOCKERFILE: "Dockerfile-builder" -test: +al9-docker: + stage: docker + extends: .docker-builder + rules: + - if: $CI_PIPELINE_SOURCE == "schedule" + - changes: [ "Dockerfile-builder.al9" ] + - when: manual + allow_failure: true + variables: + IMAGE: "$CI_REGISTRY_IMAGE/builder:al9" + DOCKERFILE: "Dockerfile-builder.al9" + +cc7-test: stage: test extends: .cxx-test rules: @@ -36,7 +48,7 @@ test: - g++ --version | grep -q '(GCC) 7' image: "$CI_REGISTRY_IMAGE/builder" -nodriver: # Compile without any backend +cc7-nodriver: # Compile without any backend stage: test image: "$CI_REGISTRY_IMAGE/builder" rules: @@ -52,7 +64,7 @@ nodriver: # Compile without any backend - cmake3 .. -DSPDEVICES=OFF - make -j4 -sse2: # Compile with SSE enabled +cc7-sse2: # Compile with SSE enabled stage: test image: "$CI_REGISTRY_IMAGE/builder" rules: @@ -66,7 +78,7 @@ sse2: # Compile with SSE enabled - cmake3 .. -DSSE=ON -DOPTIMIZE=ON - make -j4 -package: +cc7-package: stage: package # Package from the basic reference image rules: @@ -111,18 +123,73 @@ package: - build/*.rpm - build/artifact_url.txt +al9-test: + image: "$CI_REGISTRY_IMAGE/builder:al9" + extends: .cxx-test + +al9-nodriver: # Compile without any backend + stage: test + image: "$CI_REGISTRY_IMAGE/builder:al9" + rules: + - allow_failure: false + script: + - yum remove -y libadq0 + + # Build + - mkdir build && cd build + - cmake3 .. -DSPDEVICES=OFF + - make -j4 + +al9-sse2: # Compile with SSE enabled + stage: test + image: "$CI_REGISTRY_IMAGE/builder:al9" + rules: + - allow_failure: false + script: + # Build + - mkdir build && cd build + - cmake3 .. -DSSE=ON -DOPTIMIZE=ON + - make -j4 + +al9-package: + image: gitlab-registry.cern.ch/linuxsupport/alma9-base + stage: package + extends: .cxx-package-rpm + variables: + DEPENDENCIES: 'boost-devel freeipmi-devel numactl-devel readline-devel libblkid-devel pugixml-devel libadq0' + REPOSITORIES: http://ntofci.web.cern.ch/ntofci/distfiles/ntof/cc7/nToF.repo + PKGNAME: 'daqmanager' + before_script: + - dnf install -y epel-release yum-utils + +# Deploy rpm package +cc7-ci-rpm: + extends: .ci-rpm + rules: + - if: $CI_COMMIT_TAG =~ /^v(\d+)(\.\d+){2}\s*$/ + dependencies: [ cc7-package ] + variables: + job: ntof/daq/distfiles + +# Deploy the pages generated to DFS +cc7-ci-artifacts: + extends: .ci-artifacts + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + dependencies: [ cc7-test ] + # Deploy rpm package -ci-rpm: +al9-ci-rpm: extends: .ci-rpm rules: - if: $CI_COMMIT_TAG =~ /^v(\d+)(\.\d+){2}\s*$/ - dependencies: [ package ] + dependencies: [ al9-package ] variables: job: ntof/daq/distfiles # Deploy the pages generated to DFS -ci-artifacts: +.al9-ci-artifacts: extends: .ci-artifacts rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - dependencies: [ test ] + dependencies: [ al9-test ] diff --git a/CMakeLists.txt b/CMakeLists.txt index 42b7d6f..7bf64e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ set(VERSION_PATCH "11") include(Pack) -use_cxx(11) +use_cxx(17) if(CHARACTERIZATION) add_definitions(-DCHARACTERIZATION) diff --git a/Dockerfile-builder.al9 b/Dockerfile-builder.al9 new file mode 100644 index 0000000..1b14c2d --- /dev/null +++ b/Dockerfile-builder.al9 @@ -0,0 +1,6 @@ +FROM gitlab-registry.cern.ch/ntof/daq/builder:al9 + +RUN dnf install -y numactl-devel readline-devel libblkid-devel yum-utils && dnf clean all + +RUN yum-config-manager --add-repo http://ntofci.web.cern.ch/ntofci/distfiles/ntof/cc7/nToF.repo && \ + yum install -y libadq0 && yum clean all diff --git a/cmake/Lint.cmake b/cmake/Lint.cmake index 2f2cb0b..ce66669 100644 --- a/cmake/Lint.cmake +++ b/cmake/Lint.cmake @@ -36,7 +36,7 @@ else(CLANG_FORMAT_EXE) endif(CLANG_FORMAT_EXE) # Clang configuration -find_program(CLANGPP_EXE NAMES clang++ +find_program(CLANGPP_EXE NAMES clang++ clang-tidy PATHS ${CLANGPP_EXE} ENV PATH $ENV{CLANGPP_PATH} CMAKE_FIND_ROOT_PATH_BOTH) if(CLANGPP_EXE) diff --git a/cmake/Pack.cmake b/cmake/Pack.cmake index 0429b8c..9ac57d0 100644 --- a/cmake/Pack.cmake +++ b/cmake/Pack.cmake @@ -9,6 +9,8 @@ set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}") set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}") set(CPACK_PACKAGE_CONTACT "Paul Peronnard ") +set(CPACK_RPM_PACKAGE_RELEASE_DIST ON) +set(CPACK_RPM_FILE_NAME "RPM-DEFAULT") # Generate debug package set(CPACK_RPM_DEBUGINFO_PACKAGE ON) -- GitLab From 73c3519277b1a7ad47960b86fe9587d2ae61a8e8 Mon Sep 17 00:00:00 2001 From: Enrico Gamberini Date: Thu, 12 Oct 2023 15:43:14 +0200 Subject: [PATCH 02/17] fix build in al9 --- CMakeLists.txt | 2 ++ include/CSystemInfo.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bf64e1..b341b37 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,6 +51,8 @@ if(NOT MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual -Wunused-parameter -Wuninitialized") endif(NOT MSVC) +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_LOG_DYN_LINK") + if(NOT DEFINED BUILD_SHARED_LIBS) set(BUILD_SHARED_LIBS ON) endif() diff --git a/include/CSystemInfo.h b/include/CSystemInfo.h index b516071..507b3b6 100644 --- a/include/CSystemInfo.h +++ b/include/CSystemInfo.h @@ -17,7 +17,7 @@ #include "sys/sysinfo.h" #include "sys/times.h" #include "sys/types.h" -#include "sys/vtimes.h" +//#include "sys/vtimes.h" class CSystemInfo { -- GitLab From 34aa03c84eac9cefa3163fd0cfb1792ab3a41535 Mon Sep 17 00:00:00 2001 From: Enrico Gamberini Date: Thu, 12 Oct 2023 15:54:43 +0200 Subject: [PATCH 03/17] remove LOG_LINK --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b341b37..4884ca8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,7 @@ if(NOT MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual -Wunused-parameter -Wuninitialized") endif(NOT MSVC) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_LOG_DYN_LINK") +#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_LOG_DYN_LINK") if(NOT DEFINED BUILD_SHARED_LIBS) set(BUILD_SHARED_LIBS ON) -- GitLab From 331ef09880edea49c38d8098ee6a0a12555750bb Mon Sep 17 00:00:00 2001 From: Enrico Gamberini Date: Thu, 12 Oct 2023 16:04:49 +0200 Subject: [PATCH 04/17] fix build --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4884ca8..3263a61 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ set(VERSION_PATCH "11") include(Pack) -use_cxx(17) +use_cxx(14) if(CHARACTERIZATION) add_definitions(-DCHARACTERIZATION) @@ -51,7 +51,7 @@ if(NOT MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual -Wunused-parameter -Wuninitialized") endif(NOT MSVC) -#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_LOG_DYN_LINK") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_LOG_DYN_LINK") if(NOT DEFINED BUILD_SHARED_LIBS) set(BUILD_SHARED_LIBS ON) -- GitLab From 57ae76278e881e3376eb0d1f0e44b68688a87161 Mon Sep 17 00:00:00 2001 From: Enrico Gamberini Date: Thu, 12 Oct 2023 16:18:56 +0200 Subject: [PATCH 05/17] fix build for cc7 --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3263a61..c9da586 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,11 @@ if(NOT MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual -Wunused-parameter -Wuninitialized") endif(NOT MSVC) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_LOG_DYN_LINK") +if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.3) + ADD_DEFINITIONS(-DBOOST_LOG_DYN_LINK) +endif() + +#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_LOG_DYN_LINK") if(NOT DEFINED BUILD_SHARED_LIBS) set(BUILD_SHARED_LIBS ON) -- GitLab From 0124ccead0ea103a78c1384e2452a4264675d57a Mon Sep 17 00:00:00 2001 From: Enrico Gamberini Date: Thu, 12 Oct 2023 16:22:43 +0200 Subject: [PATCH 06/17] more fix --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c9da586..0800817 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,8 @@ if(NOT MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual -Wunused-parameter -Wuninitialized") endif(NOT MSVC) -if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.3) +if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 11.3) + message("Using BOOST_LOG_DYN_LINK") ADD_DEFINITIONS(-DBOOST_LOG_DYN_LINK) endif() -- GitLab From 77da265a0e4550bd49ccb68958c455a51149e48b Mon Sep 17 00:00:00 2001 From: Martin Farkas Date: Mon, 29 Apr 2024 16:56:47 +0200 Subject: [PATCH 07/17] Remove cc7 rpm generation --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2cd878e..6b2bea5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,7 +78,7 @@ cc7-sse2: # Compile with SSE enabled - cmake3 .. -DSSE=ON -DOPTIMIZE=ON - make -j4 -cc7-package: +.cc7-package: stage: package # Package from the basic reference image rules: @@ -163,7 +163,7 @@ al9-package: - dnf install -y epel-release yum-utils # Deploy rpm package -cc7-ci-rpm: +.cc7-ci-rpm: extends: .ci-rpm rules: - if: $CI_COMMIT_TAG =~ /^v(\d+)(\.\d+){2}\s*$/ @@ -172,7 +172,7 @@ cc7-ci-rpm: job: ntof/daq/distfiles # Deploy the pages generated to DFS -cc7-ci-artifacts: +.cc7-ci-artifacts: extends: .ci-artifacts rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH -- GitLab From 21e33892be6024e76bea86e030be55a40302602b Mon Sep 17 00:00:00 2001 From: Martin Farkas Date: Thu, 2 May 2024 12:00:46 +0200 Subject: [PATCH 08/17] Update of .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b2bea5..d58dd87 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,7 +78,7 @@ cc7-sse2: # Compile with SSE enabled - cmake3 .. -DSSE=ON -DOPTIMIZE=ON - make -j4 -.cc7-package: +cc7-package: stage: package # Package from the basic reference image rules: @@ -188,7 +188,7 @@ al9-ci-rpm: job: ntof/daq/distfiles # Deploy the pages generated to DFS -.al9-ci-artifacts: +al9-ci-artifacts: extends: .ci-artifacts rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH -- GitLab From 3bcc722c5e4b9424158995ad7474f5ee943d3054 Mon Sep 17 00:00:00 2001 From: Enrico Gamberini Date: Fri, 3 May 2024 14:44:28 +0200 Subject: [PATCH 09/17] bump revision --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0800817..9050613 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ include(Lint) include(GitVersion) set(VERSION_MAJOR "7") set(VERSION_MINOR "1") -set(VERSION_PATCH "11") +set(VERSION_PATCH "12") include(Pack) -- GitLab From 8019f3154e88ce71226f791904bcb930abd349af Mon Sep 17 00:00:00 2001 From: Enrico Gamberini Date: Fri, 3 May 2024 15:08:26 +0200 Subject: [PATCH 10/17] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d58dd87..73d02ce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -113,8 +113,8 @@ cc7-package: - make -j4 - make rpm-package - - FILE=$(echo ${CI_COMMIT_TAG}-Linux.rpm| sed 's/^v/daqmanager-/') - - '[ -e "$FILE" ] || { echo "Tag mismatches CMakeLists.txt version"; exit 1; }' + - '[ $(find . -name "*${CI_COMMIT_TAG#*v}*.rpm" | wc -l) -ge 1 -o -z "${CI_COMMIT_TAG}" ] || { echo "Tag mismatches CMakeLists.txt version"; exit 1; }' + - echo "${CI_JOB_URL}/artifacts/download" > artifact_url.txt - cd .. && mv build .. -- GitLab From feb2245a826108b93673b489def4e16f76902eaa Mon Sep 17 00:00:00 2001 From: Enrico Gamberini Date: Thu, 23 May 2024 17:15:41 +0200 Subject: [PATCH 11/17] point to ntof/al9 repo --- .gitlab-ci.yml | 2 +- Dockerfile-builder.al9 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 73d02ce..16d766b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -157,7 +157,7 @@ al9-package: extends: .cxx-package-rpm variables: DEPENDENCIES: 'boost-devel freeipmi-devel numactl-devel readline-devel libblkid-devel pugixml-devel libadq0' - REPOSITORIES: http://ntofci.web.cern.ch/ntofci/distfiles/ntof/cc7/nToF.repo + REPOSITORIES: http://ntofci.web.cern.ch/ntofci/distfiles/ntof/al9/nToF.repo PKGNAME: 'daqmanager' before_script: - dnf install -y epel-release yum-utils diff --git a/Dockerfile-builder.al9 b/Dockerfile-builder.al9 index 1b14c2d..c4f872a 100644 --- a/Dockerfile-builder.al9 +++ b/Dockerfile-builder.al9 @@ -2,5 +2,5 @@ FROM gitlab-registry.cern.ch/ntof/daq/builder:al9 RUN dnf install -y numactl-devel readline-devel libblkid-devel yum-utils && dnf clean all -RUN yum-config-manager --add-repo http://ntofci.web.cern.ch/ntofci/distfiles/ntof/cc7/nToF.repo && \ +RUN yum-config-manager --add-repo http://ntofci.web.cern.ch/ntofci/distfiles/ntof/al7/nToF.repo && \ yum install -y libadq0 && yum clean all -- GitLab From 4caaf032622599ab097adb0c5b4664464fee5cda Mon Sep 17 00:00:00 2001 From: Enrico Gamberini Date: Thu, 23 May 2024 17:18:17 +0200 Subject: [PATCH 12/17] fix typo --- Dockerfile-builder.al9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-builder.al9 b/Dockerfile-builder.al9 index c4f872a..8be8b49 100644 --- a/Dockerfile-builder.al9 +++ b/Dockerfile-builder.al9 @@ -2,5 +2,5 @@ FROM gitlab-registry.cern.ch/ntof/daq/builder:al9 RUN dnf install -y numactl-devel readline-devel libblkid-devel yum-utils && dnf clean all -RUN yum-config-manager --add-repo http://ntofci.web.cern.ch/ntofci/distfiles/ntof/al7/nToF.repo && \ +RUN yum-config-manager --add-repo http://ntofci.web.cern.ch/ntofci/distfiles/ntof/al9/nToF.repo && \ yum install -y libadq0 && yum clean all -- GitLab From fe2a577ebafaf85f1ff7382e13bd61a80e20533b Mon Sep 17 00:00:00 2001 From: Enrico Gamberini Date: Thu, 23 May 2024 17:26:16 +0200 Subject: [PATCH 13/17] fix invalid conversion error --- src/spd/CCardSpd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/spd/CCardSpd.cpp b/src/spd/CCardSpd.cpp index 2855e13..79457ca 100644 --- a/src/spd/CCardSpd.cpp +++ b/src/spd/CCardSpd.cpp @@ -173,7 +173,7 @@ void CCardSpd::FindDevices() adqNumber_ = i + 1; LOG_INFO << "serial number: " + std::string(ADQ_GetBoardSerialNumber(driverInstance_, adqNumber_)); - int *fw_rev = ADQ_GetRevision(driverInstance_, adqNumber_); + uint32_t *fw_rev = ADQ_GetRevision(driverInstance_, adqNumber_); LOG_INFO << "Firmware revision: " + boost::lexical_cast(fw_rev[0]); LOG_INFO << "link rate: " << GetPCIeLinkRate() -- GitLab From aedf763268f47567ffb9b3efe3c6d0120a35a459 Mon Sep 17 00:00:00 2001 From: Enrico Gamberini Date: Thu, 23 May 2024 17:30:36 +0200 Subject: [PATCH 14/17] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 16d766b..af503ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,7 @@ cc7-test: stage: test extends: .cxx-test rules: - - allow_failure: false + - allow_failure: true before_script: - source /opt/rh/devtoolset-7/enable - g++ --version | grep -q '(GCC) 7' @@ -68,7 +68,7 @@ cc7-sse2: # Compile with SSE enabled stage: test image: "$CI_REGISTRY_IMAGE/builder" rules: - - allow_failure: false + - allow_failure: true script: - source /opt/rh/devtoolset-7/enable - g++ --version | grep -q '(GCC) 7' -- GitLab From dea08b107df802ef4fad4841adb646e284afc31d Mon Sep 17 00:00:00 2001 From: Enrico Gamberini Date: Fri, 24 May 2024 08:45:58 +0200 Subject: [PATCH 15/17] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af503ec..5b0fe41 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,6 +83,7 @@ cc7-package: # Package from the basic reference image rules: - if: $CI_COMMIT_TAG =~ /^v(\d+)(\.\d+){2}\s*$/ + - allow_failure: true image: cern/cc7-base script: # Install deps -- GitLab From 455d39ab888d566713f8d0a4eece5acc564e93c5 Mon Sep 17 00:00:00 2001 From: Enrico Gamberini Date: Fri, 24 May 2024 09:07:51 +0200 Subject: [PATCH 16/17] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b0fe41..3a6f4df 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,7 +83,7 @@ cc7-package: # Package from the basic reference image rules: - if: $CI_COMMIT_TAG =~ /^v(\d+)(\.\d+){2}\s*$/ - - allow_failure: true + allow_failure: true image: cern/cc7-base script: # Install deps -- GitLab From b1142a3ebae71023b96ac007029aff2cc20dd41b Mon Sep 17 00:00:00 2001 From: Enrico Gamberini Date: Thu, 8 Aug 2024 17:27:33 +0200 Subject: [PATCH 17/17] remove cc7 jobs, enable al9 style --- .gitlab-ci.yml | 115 --------------------------------------------- Dockerfile-builder | 22 --------- 2 files changed, 137 deletions(-) delete mode 100644 Dockerfile-builder diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a6f4df..03aa534 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,18 +14,6 @@ stages: - package - deploy -cc7-docker: - stage: docker - extends: .docker-builder - rules: - - if: $CI_PIPELINE_SOURCE == "schedule" - - changes: [ "Dockerfile-builder" ] - - when: manual - allow_failure: true - variables: - IMAGE: "$CI_REGISTRY_IMAGE/builder" - DOCKERFILE: "Dockerfile-builder" - al9-docker: stage: docker extends: .docker-builder @@ -38,92 +26,6 @@ al9-docker: IMAGE: "$CI_REGISTRY_IMAGE/builder:al9" DOCKERFILE: "Dockerfile-builder.al9" -cc7-test: - stage: test - extends: .cxx-test - rules: - - allow_failure: true - before_script: - - source /opt/rh/devtoolset-7/enable - - g++ --version | grep -q '(GCC) 7' - image: "$CI_REGISTRY_IMAGE/builder" - -cc7-nodriver: # Compile without any backend - stage: test - image: "$CI_REGISTRY_IMAGE/builder" - rules: - - allow_failure: false - script: - - source /opt/rh/devtoolset-7/enable - - g++ --version | grep -q '(GCC) 7' - - - yum remove -y libadq0 - - # Build - - mkdir build && cd build - - cmake3 .. -DSPDEVICES=OFF - - make -j4 - -cc7-sse2: # Compile with SSE enabled - stage: test - image: "$CI_REGISTRY_IMAGE/builder" - rules: - - allow_failure: true - script: - - source /opt/rh/devtoolset-7/enable - - g++ --version | grep -q '(GCC) 7' - - # Build - - mkdir build && cd build - - cmake3 .. -DSSE=ON -DOPTIMIZE=ON - - make -j4 - -cc7-package: - stage: package - # Package from the basic reference image - rules: - - if: $CI_COMMIT_TAG =~ /^v(\d+)(\.\d+){2}\s*$/ - allow_failure: true - image: cern/cc7-base - script: - # Install deps - - yum install -y cmake3 make gcc-c++ git - - yum install -y freeipmi-devel numactl-devel readline-devel libblkid-devel pugixml-devel - - # Add ntof specific repo - - yum-config-manager --add-repo http://ntofci.web.cern.ch/ntofci/distfiles/ntof/cc7/nToF.repo - - yum install -y libadq0 ntof-boost - - yum install -y rpm-build - - # Install latest compiler and use it - - yum install -y centos-release-scl - - yum install -y devtoolset-7-gcc* - - source /opt/rh/devtoolset-7/enable - - g++ --version | grep -q '(GCC) 7' - - # Won't package on a shallow clone - - '[ ! -e .git/shallow ] || git fetch --unshallow' - - # rpm-build debuginfo workarround, srcdir must be longer than debuginfo path - - git clone . "rpmbuild_usr_src_debug_${PKGNAME}_${CI_COMMIT_TAG}_runtime_src" - - cd "rpmbuild_usr_src_debug_${PKGNAME}_${CI_COMMIT_TAG}_runtime_src" - - # Build - - mkdir build && cd build - - cmake3 .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPTIMIZE=ON - - make -j4 - - make rpm-package - - - '[ $(find . -name "*${CI_COMMIT_TAG#*v}*.rpm" | wc -l) -ge 1 -o -z "${CI_COMMIT_TAG}" ] || { echo "Tag mismatches CMakeLists.txt version"; exit 1; }' - - - - echo "${CI_JOB_URL}/artifacts/download" > artifact_url.txt - - cd .. && mv build .. - artifacts: - paths: - - build/*.rpm - - build/artifact_url.txt - al9-test: image: "$CI_REGISTRY_IMAGE/builder:al9" extends: .cxx-test @@ -135,7 +37,6 @@ al9-nodriver: # Compile without any backend - allow_failure: false script: - yum remove -y libadq0 - # Build - mkdir build && cd build - cmake3 .. -DSPDEVICES=OFF @@ -163,22 +64,6 @@ al9-package: before_script: - dnf install -y epel-release yum-utils -# Deploy rpm package -.cc7-ci-rpm: - extends: .ci-rpm - rules: - - if: $CI_COMMIT_TAG =~ /^v(\d+)(\.\d+){2}\s*$/ - dependencies: [ cc7-package ] - variables: - job: ntof/daq/distfiles - -# Deploy the pages generated to DFS -.cc7-ci-artifacts: - extends: .ci-artifacts - rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - dependencies: [ cc7-test ] - # Deploy rpm package al9-ci-rpm: extends: .ci-rpm diff --git a/Dockerfile-builder b/Dockerfile-builder deleted file mode 100644 index 5225a04..0000000 --- a/Dockerfile-builder +++ /dev/null @@ -1,22 +0,0 @@ -FROM cern/cc7-base - -RUN yum install -y cmake3 make gcc-c++ git \ - freeipmi-devel numactl-devel readline-devel libblkid-devel pugixml-devel \ - clang-analyzer cppcheck cppunit-devel lcov && yum clean all && \ - git config --global user.email 'docker@builder' && \ - git config --global user.name 'docker' - -RUN yum-config-manager --add-repo http://ntofci.web.cern.ch/ntofci/distfiles/cc7/nToF-Common.repo && \ - yum install -y cquery && yum clean all - -RUN yum-config-manager --add-repo http://ntofci.web.cern.ch/ntofci/distfiles/ntof/cc7/nToF.repo && \ - yum install -y libadq0 ntof-boost && yum clean all - -RUN yum install -y centos-release-scl && \ - yum install -y devtoolset-7-gcc* && \ - (source /opt/rh/devtoolset-7/enable && (g++ --version | grep -q '(GCC) 7')) && \ - yum clean all - -# CI uses sh, and won't load profile unless provided in "ENV" -ENV ENV=/etc/profile -RUN echo ". /opt/rh/devtoolset-7/enable" > /etc/profile.d/ntof.sh -- GitLab