Merge branch 'develop' of https://github.com/DUNE-DAQ/daq-release int…

…o develop
DUNE-DAQ · Jun 11, 2024 · 38872fa · 38872fa
2 parents fb27a64 + 08cac4b
commit 38872fa
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 35 deletions.
diff --git a/configs/coredaq/coredaq-develop/release.yaml b/configs/coredaq/coredaq-develop/release.yaml
@@ -229,10 +229,10 @@
         - name: oksdalgen
           version: "develop"
           commit: null
-        - name: coredal
+        - name: confmodel
           version: "develop"
           commit: null
-        - name: appdal
+        - name: appmodel
           version: "develop"
           commit: null
         - name: dbe

diff --git a/configs/fddaq/fddaq-develop/dbt-build-order.cmake b/configs/fddaq/fddaq-develop/dbt-build-order.cmake
@@ -26,8 +26,8 @@ set(build_order "daq-cmake"
 		"oksdalgen"
 		"oksutils"
 		"dal"
-		"coredal"
-                "appdal"
+		"confmodel"
+                "appmodel"
 		"oksconflibs"
 		"dbe"
         "oksconfgen"

diff --git a/configs/fddaq/fddaq-production_v4/release.yaml b/configs/fddaq/fddaq-production_v4/release.yaml
@@ -235,7 +235,7 @@
           version: 2.0.0
           source:  pypi
         - name: nanorc
-          version: 5.2.4
+          version: 5.2.5
           source:  github_DUNE-DAQ
         - name: networkx
           version: 2.6.3

diff --git a/configs/nddaq/nddaq-develop/dbt-build-order.cmake b/configs/nddaq/nddaq-develop/dbt-build-order.cmake
@@ -26,8 +26,8 @@ set(build_order "daq-cmake"
 		"oksdalgen"
 		"oksutils"
 		"dal"
-		"coredal"
-                "appdal"
+		"confmodel"
+                "appmodel"
 		"oksconflibs"
 		"dbe"
                 "appfwk"

diff --git a/docs/README.md b/docs/README.md
@@ -29,15 +29,13 @@ This is a repo containing DUNE DAQ release making tools, configuration files, an
 
 # Single-Repo CI Build Status
 
-_JCF, Mar-3-2024: since near detector packages have been dropped from nightlies of both the production/v4 and v5 lines of development, their builds against the nightly are not guaranteed to work_
-
-appdal: [![appdal](https://github.com/DUNE-DAQ/appdal/actions/workflows/dunedaq-develop-cpp-ci.yml/badge.svg)](https://github.com/DUNE-DAQ/appdal/actions/workflows/dunedaq-develop-cpp-ci.yml)
+appmodel: [![appmodel](https://github.com/DUNE-DAQ/appmodel/actions/workflows/dunedaq-develop-cpp-ci.yml/badge.svg)](https://github.com/DUNE-DAQ/appmodel/actions/workflows/dunedaq-develop-cpp-ci.yml)
 
 appfwk: [![appfwk](https://github.com/DUNE-DAQ/appfwk/actions/workflows/dunedaq-v4-cpp-ci.yml/badge.svg)](https://github.com/DUNE-DAQ/appfwk/actions/workflows/dunedaq-v4-cpp-ci.yml)
 
 cmdlib: [![cmdlib](https://github.com/DUNE-DAQ/cmdlib/actions/workflows/dunedaq-v4-cpp-ci.yml/badge.svg)](https://github.com/DUNE-DAQ/cmdlib/actions/workflows/dunedaq-v4-cpp-ci.yml)
 
-coredal: [![coredal](https://github.com/DUNE-DAQ/coredal/actions/workflows/dunedaq-develop-cpp-ci.yml/badge.svg)](https://github.com/DUNE-DAQ/coredal/actions/workflows/dunedaq-develop-cpp-ci.yml)
+confmodel: [![confmodel](https://github.com/DUNE-DAQ/confmodel/actions/workflows/dunedaq-develop-cpp-ci.yml/badge.svg)](https://github.com/DUNE-DAQ/confmodel/actions/workflows/dunedaq-develop-cpp-ci.yml)
 
 ctbmodules: [![ctbmodules](https://github.com/DUNE-DAQ/ctbmodules/actions/workflows/dunedaq-v4-cpp-ci.yml/badge.svg)](https://github.com/DUNE-DAQ/ctbmodules/actions/workflows/dunedaq-v4-cpp-ci.yml)
 
@@ -89,20 +87,10 @@ ipm: [![ipm](https://github.com/DUNE-DAQ/ipm/actions/workflows/dunedaq-v4-cpp-ci
 
 kafkaopmon: [![kafkaopmon](https://github.com/DUNE-DAQ/kafkaopmon/actions/workflows/dunedaq-v4-cpp-ci.yml/badge.svg)](https://github.com/DUNE-DAQ/kafkaopmon/actions/workflows/dunedaq-v4-cpp-ci.yml)
 
-lbrulibs: [![lbrulibs](https://github.com/DUNE-DAQ/lbrulibs/actions/workflows/dunedaq-develop-cpp-ci.yml/badge.svg)](https://github.com/DUNE-DAQ/lbrulibs/actions/workflows/dunedaq-develop-cpp-ci.yml)
-
 listrev: [![listrev](https://github.com/DUNE-DAQ/listrev/actions/workflows/dunedaq-v4-cpp-ci.yml/badge.svg)](https://github.com/DUNE-DAQ/listrev/actions/workflows/dunedaq-v4-cpp-ci.yml)
 
 logging: [![logging](https://github.com/DUNE-DAQ/logging/actions/workflows/dunedaq-v4-cpp-ci.yml/badge.svg)](https://github.com/DUNE-DAQ/logging/actions/workflows/dunedaq-v4-cpp-ci.yml)
 
-nddaqconf: [![nddaqconf](https://github.com/DUNE-DAQ/nddaqconf/actions/workflows/dunedaq-develop-cpp-ci.yml/badge.svg)](https://github.com/DUNE-DAQ/nddaqconf/actions/workflows/dunedaq-develop-cpp-ci.yml)
-
-nddetdataformats: [![nddetdataformats](https://github.com/DUNE-DAQ/nddetdataformats/actions/workflows/dunedaq-develop-cpp-ci.yml/badge.svg)](https://github.com/DUNE-DAQ/nddetdataformats/actions/workflows/dunedaq-develop-cpp-ci.yml)
-
-ndreadoutlibs: [![ndreadoutlibs](https://github.com/DUNE-DAQ/ndreadoutlibs/actions/workflows/dunedaq-develop-cpp-ci.yml/badge.svg)](https://github.com/DUNE-DAQ/ndreadoutlibs/actions/workflows/dunedaq-develop-cpp-ci.yml)
-
-ndreadoutmodules: [![ndreadoutmodules](https://github.com/DUNE-DAQ/ndreadoutmodules/actions/workflows/dunedaq-develop-cpp-ci.yml/badge.svg)](https://github.com/DUNE-DAQ/ndreadoutmodules/actions/workflows/dunedaq-develop-cpp-ci.yml)
-
 oks: [![oks](https://github.com/DUNE-DAQ/oks/actions/workflows/dunedaq-develop-cpp-ci.yml/badge.svg)](https://github.com/DUNE-DAQ/oks/actions/workflows/dunedaq-develop-cpp-ci.yml)
 
 opmonlib: [![opmonlib](https://github.com/DUNE-DAQ/opmonlib/actions/workflows/dunedaq-v4-cpp-ci.yml/badge.svg)](https://github.com/DUNE-DAQ/opmonlib/actions/workflows/dunedaq-v4-cpp-ci.yml)

diff --git a/docs/team_repos.md b/docs/team_repos.md
@@ -4,11 +4,11 @@
 ## ccm
 * **People to contact**: Pierre Lasorak, Alex Tapper
 * **Repositories with write access**:
-    * appdal
+    * appmodel
     * appfwk
     * cmdlib
     * connectivityserver
-    * coredal
+    * confmodel
     * dal
     * daqconf
     * daqsystemtest

diff --git a/scripts/spack/build-release.sh b/scripts/spack/build-release.sh
@@ -144,13 +144,7 @@ if [[ "$DET" == "fd" || "$DET" == "nd" ]]; then
 
 fi
 
-
-ln -s $( basename $OLD_SUBDIR ) default
-
 echo "Files in $SPACK_AREA :"
 ls -ltr $SPACK_AREA
 
-echo "Files in $OLD_SUBDIR :"
-ls -ltr $OLD_SUBDIR
-
 spack clean -a
diff --git a/...-repo-template/packages/appdal/package.py → ...epo-template/packages/appmodel/package.py b/...-repo-template/packages/appdal/package.py → ...epo-template/packages/appmodel/package.py
@@ -7,11 +7,11 @@
 from spack import *
 
 
-class Appdal(CMakePackage):
+class Appmodel(CMakePackage):
     """Run Control related"""
 
-    homepage = "https://github.com/DUNE-DAQ/appdal"
-    git =      "https://github.com/DUNE-DAQ/appdal.git"
+    homepage = "https://github.com/DUNE-DAQ/appmodel"
+    git =      "https://github.com/DUNE-DAQ/appmodel.git"
 
     maintainers = ["jcfreeman2"]
 

diff --git a/...repo-template/packages/coredal/package.py → ...po-template/packages/confmodel/package.py b/...repo-template/packages/coredal/package.py → ...po-template/packages/confmodel/package.py
@@ -7,11 +7,11 @@
 from spack import *
 
 
-class Coredal(CMakePackage):
+class Confmodel(CMakePackage):
     """Run Control related"""
 
-    homepage = "https://dune-daq-sw.readthedocs.io/en/latest/packages/coredal/"
-    git =      "https://github.com/DUNE-DAQ/coredal.git"
+    homepage = "https://dune-daq-sw.readthedocs.io/en/latest/packages/confmodel/"
+    git =      "https://github.com/DUNE-DAQ/confmodel.git"
 
     maintainers = ["jcfreeman2"]