Skip to content

Commit 81cf973

Browse files
eflumerfeflumerf
committed
Add Spack v1.1 build scripts. Make Dockerfiles work for both AL9 and AL10
1 parent 05e9cf5 commit 81cf973

16 files changed

+308
-108
lines changed

‎build_scripts/update_cvmfs_art_v1.sh‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
cd /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1
2+
3+
git config --global --add safe.directory '*'
4+
5+
artVer=${artVer:-s132}
6+
force=${force:-0}
7+
8+
function cleanup() {
9+
(
10+
echo "Cleaning build area"
11+
source setup-env.sh
12+
spack reindex
13+
rm -rf daqlogs daqdata CMakeLists.txt* fonts* log qms-log run_records Data databases script_log DAQInterface Data.bak*
14+
)
15+
}
16+
17+
if [ $force -eq 1 ] || ! [ -d /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/art-suite-$artVer ];then
18+
echo "Building art-suite-$artVer"
19+
mkdir art-suite-$artVer;cd art-suite-$artVer
20+
touch .cvmfscatalog
21+
rm art-suite-spack-start_v1.sh;wget https://raw.githubusercontent.com/art-daq/artdaq_demo/refs/heads/develop/tools/art-suite-spack-start_v1.sh && chmod +x art-suite-spack-start_v1.sh
22+
./art-suite-spack-start_v1.sh --padding --no-view -s ${artVer:1} --arch linux-almalinux9-x86_64_v3
23+
cleanup
24+
fi
25+
26+
git config --global --unset-all safe.directory

‎build_scripts/update_cvmfs_artdaq.sh‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ git config --global --add safe.directory '*'
55
artVer=${artVer:-s132}
66
artdaqVer=${artdaqVer:-v4_00_00}
77
force=${force:-0}
8-
develop=${develop:-0}
98

109
function cleanup() {
1110
(
@@ -27,16 +26,4 @@ if [ $force -eq 1 ] || ! [ -d /cvmfs/fermilab.opensciencegrid.org/products/artda
2726
cleanup
2827
fi
2928

30-
if [ $develop -eq 1 ];then
31-
echo "Building artdaq-develop"
32-
cd /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_areas
33-
mkdir artdaq-develop;cd artdaq-develop
34-
touch .cvmfscatalog
35-
rm quick-spack-start.sh*;wget https://raw.githubusercontent.com/art-daq/artdaq_demo/refs/heads/develop/tools/quick-spack-start.sh && chmod +x quick-spack-start.sh
36-
./quick-spack-start.sh --develop --no-kmod --arch linux-almalinux9-x86_64_v3 \
37-
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_areas/artdaq-$artdaqVer \
38-
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_areas/art-suite-$artVer
39-
cleanup
40-
fi
41-
4229
git config --global --unset-all safe.directory

‎build_scripts/update_cvmfs_artdaq_v1.sh‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
cd /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1
2+
3+
git config --global --add safe.directory '*'
4+
5+
artVer=${artVer:-s132.1}
6+
artdaqVer=${artdaqVer:-v4_05_00}
7+
force=${force:-0}
8+
9+
function cleanup() {
10+
(
11+
echo "Cleaning build area"
12+
source setup-env.sh
13+
spack reindex
14+
rm -rf daqlogs daqdata CMakeLists.txt* fonts* log qms-log run_records Data databases script_log DAQInterface Data.bak*
15+
)
16+
}
17+
18+
if [ $force -eq 1 ] || ! [ -d /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/artdaq-$artdaqVer ];then
19+
echo "Building artdaq-$artdaqVer"
20+
cd /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1
21+
mkdir artdaq-$artdaqVer;cd artdaq-$artdaqVer
22+
touch .cvmfscatalog
23+
rm quick-spack-start_v1.sh*;wget https://raw.githubusercontent.com/art-daq/artdaq_demo/refs/heads/develop/tools/quick-spack-start_v1.sh && chmod +x quick-spack-start_v1.sh
24+
./quick-spack-start_v1.sh --tag $artdaqVer --padding --no-kmod --no-view --arch linux-almalinux9-x86_64_v3 \
25+
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/art-suite-$artVer
26+
cleanup
27+
fi
28+
29+
git config --global --unset-all safe.directory

‎build_scripts/update_cvmfs_mu2e.sh‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ artdaqVer=${artdaqVer:-v4_00_00}
88
otsVer=${otsVer:-v3_00_00}
99
mu2eVer=${mu2eVer:-v3_04_00}
1010
force=${force:-0}
11-
develop=${develop:-0}
1211

1312
function cleanup() {
1413
(
@@ -32,18 +31,4 @@ if [ $force -eq 1 ] || ! [ -d /cvmfs/fermilab.opensciencegrid.org/products/artda
3231
cleanup
3332
fi
3433

35-
if [ $develop -eq 1 ];then
36-
echo "Building mu2e-tdaq-develop"
37-
cd /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_areas
38-
mkdir mu2e-tdaq-develop;cd mu2e-tdaq-develop
39-
touch .cvmfscatalog
40-
rm mu2e-quick-spack-start.sh*;wget https://raw.githubusercontent.com/Mu2e/otsdaq_mu2e/refs/heads/develop/tools/mu2e-quick-spack-start.sh && chmod +x mu2e-quick-spack-start.sh
41-
./mu2e-quick-spack-start.sh --padding --no-kmod --no-emacs --arch linux-almalinux9-x86_64_v3 --develop --trigger \
42-
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_areas/mu2e-tdaq-$mu2eVer \
43-
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_areas/ots-$otsVer \
44-
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_areas/artdaq-$artdaqVer \
45-
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_areas/art-suite-$artVer
46-
cleanup
47-
fi
48-
4934
git config --global --unset-all safe.directory

‎build_scripts/update_cvmfs_mu2e_v1.sh‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
2+
cd /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1
3+
4+
git config --global --add safe.directory '*'
5+
6+
artVer=${artVer:-s132}
7+
artdaqVer=${artdaqVer:-v4_00_00}
8+
otsVer=${otsVer:-v3_00_00}
9+
mu2eVer=${mu2eVer:-v3_04_00}
10+
force=${force:-0}
11+
12+
function cleanup() {
13+
(
14+
echo "Cleaning build area"
15+
source setup-env.sh
16+
spack reindex
17+
rm -rf daqlogs daqdata CMakeLists.txt* fonts* log qms-log run_records Data databases script_log DAQInterface Data.bak*
18+
)
19+
}
20+
21+
if [ $force -eq 1 ] || ! [ -d /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/mu2e-tdaq-$mu2eVer ];then
22+
echo "Building mu2e-tdaq-$mu2eVer"
23+
cd /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1
24+
mkdir mu2e-tdaq-$mu2eVer;cd mu2e-tdaq-$mu2eVer
25+
touch .cvmfscatalog
26+
rm mu2e-quick-spack-start_v1.sh*;wget https://raw.githubusercontent.com/Mu2e/otsdaq_mu2e/refs/heads/develop/tools/mu2e-quick-spack-start_v1.sh && chmod +x mu2e-quick-spack-start_v1.sh
27+
./mu2e-quick-spack-start_v1.sh --padding --no-kmod --no-emacs --no-view --arch linux-almalinux9-x86_64_v3 --tag $mu2eVer \
28+
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/ots-$otsVer \
29+
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/artdaq-$artdaqVer \
30+
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/art-suite-$artVer
31+
cleanup
32+
fi
33+
34+
git config --global --unset-all safe.directory

‎build_scripts/update_cvmfs_ots.sh‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ artVer=${artVer:-s132}
77
artdaqVer=${artdaqVer:-v4_00_00}
88
otsVer=${otsVer:-v3_00_00}
99
force=${force:-0}
10-
develop=${develop:-0}
1110

1211
function cleanup() {
1312
(
@@ -30,17 +29,4 @@ if [ $force -eq 1 ] || ! [ -d /cvmfs/fermilab.opensciencegrid.org/products/artda
3029
cleanup
3130
fi
3231

33-
if [ $develop -eq 1 ];then
34-
echo "Building ots-develop"
35-
cd /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_areas
36-
mkdir ots-develop;cd ots-develop
37-
touch .cvmfscatalog
38-
rm ots-quick-spack-start.sh*;wget https://raw.githubusercontent.com/art-daq/otsdaq_demo/refs/heads/develop/tools/ots-quick-spack-start.sh && chmod +x ots-quick-spack-start.sh
39-
./ots-quick-spack-start.sh --develop --no-kmod --arch linux-almalinux9-x86_64_v3 \
40-
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_areas/ots-$otsVer \
41-
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_areas/artdaq-$artdaqVer \
42-
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_areas/art-suite-$artVer
43-
cleanup
44-
fi
45-
4632
git config --global --unset-all safe.directory

‎build_scripts/update_cvmfs_ots_v1.sh‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
2+
cd /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1
3+
4+
git config --global --add safe.directory '*'
5+
6+
artVer=${artVer:-s132}
7+
artdaqVer=${artdaqVer:-v4_00_00}
8+
otsVer=${otsVer:-v3_00_00}
9+
force=${force:-0}
10+
11+
function cleanup() {
12+
(
13+
echo "Cleaning build area"
14+
source setup-env.sh
15+
spack reindex
16+
rm -rf daqlogs daqdata CMakeLists.txt* fonts* log qms-log run_records Data databases script_log DAQInterface Data.bak*
17+
)
18+
}
19+
20+
if [ $force -eq 1 ] || ! [ -d /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/ots-$otsVer ];then
21+
echo "Building ots-$otsVer"
22+
cd /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1
23+
mkdir ots-$otsVer;cd ots-$otsVer
24+
touch .cvmfscatalog
25+
rm ots-quick-spack-start_v1.sh*;wget https://raw.githubusercontent.com/art-daq/otsdaq_demo/refs/heads/develop/tools/ots-quick-spack-start_v1.sh && chmod +x ots-quick-spack-start_v1.sh
26+
./ots-quick-spack-start_v1.sh --padding --no-kmod --no-view --arch linux-almalinux9-x86_64_v3 --tag $otsVer \
27+
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/artdaq-$artdaqVer \
28+
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/art-suite-$artVer
29+
cleanup
30+
fi
31+
32+
git config --global --unset-all safe.directory

‎dockerfiles/artdaq-spack-1.1.dockerfile‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# This Dockerfile is used to create an artdaq build area for Github Actions CI
2+
3+
SHELL ["/bin/bash", "-c"]
4+
5+
ARG ARTDAQ_AREA=artdaq-v4_05_00
6+
ARG ART_AREA=art-suite-s132.1
7+
ARG BASE_IMAGE=eflumerf/alma9-spack:latest
8+
9+
FROM $BASE_IMAGE AS intermediate
10+
11+
WORKDIR /opt/artdaq
12+
13+
ADD https://raw.githubusercontent.com/art-daq/artdaq_demo/develop/tools/quick-spack-start_v1.sh /opt/artdaq/quick-spack-start_v1.sh
14+
15+
RUN mkdir -p /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/$ART_AREA
16+
COPY spack_v1.1/$ART_AREA /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/$ART_AREA
17+
18+
RUN mkdir -p /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/$ARTDAQ_AREA
19+
COPY spack_v1.1/$ARTDAQ_AREA /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/$ARTDAQ_AREA
20+
21+
RUN chmod +x /opt/artdaq/quick-spack-start_v1.sh && \
22+
./quick-spack-start_v1.sh --develop --dev-only --no-kmod --arch linux-almalinux9-x86_64_v3 \
23+
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/$ARTDAQ_AREA \
24+
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/$ART_AREA
25+
26+
# Create artdaq_demo_rte.sh
27+
RUN source setupARTDAQDEMO && spack clean -a
28+
29+
RUN rm -rf /cvmfs/fermilab.opensciencegrid.org/products
30+
31+
FROM $BASE_IMAGE
32+
33+
COPY --from=intermediate /opt/artdaq /opt/artdaq
34+
35+
ENTRYPOINT ["/bin/bash", "-l", "-c" ]

‎dockerfiles/artdaq-spack.dockerfile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
# This Dockerfile is used to build an headles vnc image based on Centos
2-
3-
FROM eflumerf/alma9-spack:latest AS intermediate
1+
# This Dockerfile is used to create an artdaq build area for Github Actions CI
42

53
SHELL ["/bin/bash", "-c"]
64

75
ARG ARTDAQ_AREA=artdaq-v4_00_00
86
ARG ART_AREA=art-suite-s132
7+
ARG BASE_IMAGE=eflumerf/alma9-spack:latest
8+
9+
FROM $BASE_IMAGE AS intermediate
910

1011
WORKDIR /opt/artdaq
1112

@@ -27,7 +28,7 @@ RUN source setupARTDAQDEMO && spack clean -a
2728

2829
RUN rm -rf /cvmfs/fermilab.opensciencegrid.org/products
2930

30-
FROM eflumerf/alma9-spack:latest
31+
FROM $BASE_IMAGE
3132

3233
COPY --from=intermediate /opt/artdaq /opt/artdaq
3334

‎dockerfiles/otsdaq-spack-1.1.dockerfile‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# This Dockerfile is used to create an otsdaq build area for Github Actions CI
2+
3+
SHELL ["/bin/bash", "-c"]
4+
5+
ARG OTS_AREA=ots-v3_05_00
6+
ARG ARTDAQ_AREA=artdaq-v4_05_00
7+
ARG ART_AREA=art-suite-s132.1
8+
ARG BASE_IMAGE=eflumerf/alma9-spack:latest
9+
10+
FROM $BASE_IMAGE AS intermediate
11+
12+
WORKDIR /opt/otsdaq
13+
14+
ADD https://raw.githubusercontent.com/art-daq/otsdaq_demo/develop/tools/ots-quick-spack-start_v1.sh /opt/otsdaq/ots-quick-spack-start_v1.sh
15+
16+
RUN mkdir -p /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/$ART_AREA
17+
COPY spack_v1.1/$ART_AREA /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/$ART_AREA
18+
19+
RUN mkdir -p /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/$ARTDAQ_AREA
20+
COPY spack_v1.1/$ARTDAQ_AREA /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/$ARTDAQ_AREA
21+
22+
RUN mkdir -p /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/$OTS_AREA
23+
COPY spack_v1.1/$OTS_AREA /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/$OTS_AREA
24+
25+
RUN chmod +x /opt/otsdaq/ots-quick-spack-start_v1.sh && \
26+
./ots-quick-spack-start_v1.sh --develop --dev-only --no-kmod --arch linux-almalinux9-x86_64_v3 \
27+
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/$OTS_AREA \
28+
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/$ARTDAQ_AREA \
29+
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_v1.1/$ART_AREA
30+
31+
# Create setup_ots_rte.sh
32+
RUN rm setup_ots_rte.sh && source setup_ots.sh && spack clean -a
33+
34+
RUN rm -rf /cvmfs/fermilab.opensciencegrid.org/products
35+
36+
FROM $BASE_IMAGE
37+
38+
COPY --from=intermediate /opt/otsdaq /opt/otsdaq
39+
40+
ENTRYPOINT ["/bin/bash", "-l", "-c" ]

0 commit comments

Comments
 (0)