From fce87177c9809de67a8c87d1cbf71a86c27bd65c Mon Sep 17 00:00:00 2001
From: LHCbDIRAC Bot <dirac.bot@cern.ch>
Date: Mon, 14 Sep 2020 18:01:22 +0200
Subject: [PATCH] Update versions and changelog for release of v10r0p16
---
CHANGELOG/v10r0 | 6 ++++++
LHCbDIRAC/__init__.py | 2 +-
LHCbDIRAC/releases.cfg | 7 +++++++
container/lhcbdirac/Dockerfile | 2 +-
4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG/v10r0 b/CHANGELOG/v10r0
index 0f6ce3507..7816fb738 100644
--- a/CHANGELOG/v10r0
+++ b/CHANGELOG/v10r0
@@ -1,3 +1,9 @@
+v10r0p16
+Based on DIRAC v10r0p12
+LHCbWebDIRAC v5r1p8
+LHCbDIRACOS v1r9
+
+
v10r0p15
Based on DIRAC v10r0p12
LHCbWebDIRAC v5r1p8
diff --git a/LHCbDIRAC/__init__.py b/LHCbDIRAC/__init__.py
index 3f36711c5..e99b6e5e9 100644
--- a/LHCbDIRAC/__init__.py
+++ b/LHCbDIRAC/__init__.py
@@ -29,7 +29,7 @@ rootPath = os.path.dirname(os.path.realpath(__path__[0]))
majorVersion = 10
minorVersion = 0
-patchLevel = 15
+patchLevel = 16
preVersion = 0
version = "v%sr%s" % (majorVersion, minorVersion)
diff --git a/LHCbDIRAC/releases.cfg b/LHCbDIRAC/releases.cfg
index c1b36390c..c5d24507f 100644
--- a/LHCbDIRAC/releases.cfg
+++ b/LHCbDIRAC/releases.cfg
@@ -21,6 +21,13 @@ Releases
DIRACOS = LHCb:master
}
+ v10r0p16
+ {
+ Modules = LHCbDIRAC:v10r0p16, LHCbWebDIRAC:v5r1p8
+ Depends = DIRAC:v10r0p12
+ DIRACOS = LHCb:v1r9
+ }
+
v10r0p15
{
Modules = LHCbDIRAC:v10r0p15, LHCbWebDIRAC:v5r1p8
diff --git a/container/lhcbdirac/Dockerfile b/container/lhcbdirac/Dockerfile
index 12cae8ccc..a582eb906 100644
--- a/container/lhcbdirac/Dockerfile
+++ b/container/lhcbdirac/Dockerfile
@@ -18,7 +18,7 @@ RUN chmod 755 /opt/dirac/dockerEntrypoint.sh
ENTRYPOINT [ "/opt/dirac/dockerEntrypoint.sh" ]
# Specify the version
-ENV LHCB_DIRAC_VERSION v10r0p15
+ENV LHCB_DIRAC_VERSION v10r0p16
RUN \
curl -L -o dirac-install https://raw.githubusercontent.com/DIRACGrid/DIRAC/integration/Core/scripts/dirac-install.py && \
--
GitLab