From c87441f97042897d0ab2069acdf0e63b13a5cc38 Mon Sep 17 00:00:00 2001 From: Benjamin Bolling <benjamin.bolling@ess.eu> Date: Thu, 29 Feb 2024 12:33:24 +0000 Subject: [PATCH] Maintainer rules added/updated. Clarified regarding renaming and deletion - this is regarding the PV names. --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e84c5b5..d4f5416 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Here is the list of current archiver appliances for wave form cluster: **ALL WaveForm have to be archived at 1Hz** (see Archive File Format below). -**Rename and Delete not supported** - see the [Archiver FAQ](https://confluence.esss.lu.se/display/SW/Archiver+FAQ#expand-Howtopauserenameordeleteapv) for more information. +**PV Rename and Delete not supported** - see the [Archiver FAQ](https://confluence.esss.lu.se/display/SW/Archiver+FAQ#expand-Howtopauserenameordeleteapv) for more information. ## Archive File format @@ -52,9 +52,7 @@ When pushing to master, the PVs are automatically added to the archiver. The `process_archives.py` script looks at files that changed since last commit. All the PVs from those files are sent to the proper appliance for archiving. -PV deletion is currently not supported by the scripts, which includes changing names of PVs. - ### Maintainer rules -- If configuration files have PV namechanges or deletions, the merge request shall have the name of the [INFRA-ticket-number] for the PVs changing names or being deleted. +- If configuration files have PV namechanges or deletions, the merge request shall have the name of the [INFRA-ticket-number] for the PVs changing names and being deleted. - If there are merge conflicts, the developer requesting the merge request shall resolve the conflicts on their end (preferably by re-basing to master followed by re-applying the changes from the merge request). -- GitLab