From e8b29f92909abe61d5663fdabd5d0e5d9f6a078d Mon Sep 17 00:00:00 2001 From: Giles Knap Date: Sun, 28 Jan 2024 20:16:27 +0000 Subject: [PATCH] first restructure --- {services => apps/epics--pvcs}/README.md | 0 {services => apps/epics--pvcs}/install-pvcs.sh | 0 {services => apps/epics-opis}/install-opis.sh | 0 {beamline-chart => apps/iocs/__chart}/Chart.yaml | 0 {beamline-chart => apps/iocs/__chart}/README.md | 0 {beamline-chart => apps/iocs/__chart}/templates/ioc.yaml | 0 {beamline-chart => apps/iocs/__chart}/values.yaml | 0 .../iocs}/bl47p-ea-dcam-01/config/bl47p-ea-dcam-01.yaml | 0 {iocs => apps/iocs}/bl47p-ea-dcam-01/values.yaml | 0 .../iocs}/bl47p-ea-dcam-02/config/bl47p-ea-dcam-02.yaml | 0 {iocs => apps/iocs}/bl47p-ea-dcam-02/values.yaml | 0 {iocs => apps/iocs}/bl47p-ea-panda-01/config/liveness.sh | 0 {iocs => apps/iocs}/bl47p-ea-panda-01/config/start.sh | 0 {iocs => apps/iocs}/bl47p-ea-panda-01/config/stop.sh | 0 {iocs => apps/iocs}/bl47p-ea-panda-01/values.yaml | 0 .../iocs}/bl47p-ea-test-01/config/bl47p-ea-test-01.yaml | 0 {iocs => apps/iocs}/bl47p-ea-test-01/values.yaml | 0 {iocs => apps/iocs}/bl47p-mo-ioc-01/config/bl47p-mo-ioc-01.yaml | 0 {iocs => apps/iocs}/bl47p-mo-ioc-01/values.yaml | 0 ci_verify.sh | 2 +- 20 files changed, 1 insertion(+), 1 deletion(-) rename {services => apps/epics--pvcs}/README.md (100%) rename {services => apps/epics--pvcs}/install-pvcs.sh (100%) rename {services => apps/epics-opis}/install-opis.sh (100%) rename {beamline-chart => apps/iocs/__chart}/Chart.yaml (100%) rename {beamline-chart => apps/iocs/__chart}/README.md (100%) rename {beamline-chart => apps/iocs/__chart}/templates/ioc.yaml (100%) rename {beamline-chart => apps/iocs/__chart}/values.yaml (100%) rename {iocs => apps/iocs}/bl47p-ea-dcam-01/config/bl47p-ea-dcam-01.yaml (100%) rename {iocs => apps/iocs}/bl47p-ea-dcam-01/values.yaml (100%) rename {iocs => apps/iocs}/bl47p-ea-dcam-02/config/bl47p-ea-dcam-02.yaml (100%) rename {iocs => apps/iocs}/bl47p-ea-dcam-02/values.yaml (100%) rename {iocs => apps/iocs}/bl47p-ea-panda-01/config/liveness.sh (100%) rename {iocs => apps/iocs}/bl47p-ea-panda-01/config/start.sh (100%) rename {iocs => apps/iocs}/bl47p-ea-panda-01/config/stop.sh (100%) rename {iocs => apps/iocs}/bl47p-ea-panda-01/values.yaml (100%) rename {iocs => apps/iocs}/bl47p-ea-test-01/config/bl47p-ea-test-01.yaml (100%) rename {iocs => apps/iocs}/bl47p-ea-test-01/values.yaml (100%) rename {iocs => apps/iocs}/bl47p-mo-ioc-01/config/bl47p-mo-ioc-01.yaml (100%) rename {iocs => apps/iocs}/bl47p-mo-ioc-01/values.yaml (100%) diff --git a/services/README.md b/apps/epics--pvcs/README.md similarity index 100% rename from services/README.md rename to apps/epics--pvcs/README.md diff --git a/services/install-pvcs.sh b/apps/epics--pvcs/install-pvcs.sh similarity index 100% rename from services/install-pvcs.sh rename to apps/epics--pvcs/install-pvcs.sh diff --git a/services/install-opis.sh b/apps/epics-opis/install-opis.sh similarity index 100% rename from services/install-opis.sh rename to apps/epics-opis/install-opis.sh diff --git a/beamline-chart/Chart.yaml b/apps/iocs/__chart/Chart.yaml similarity index 100% rename from beamline-chart/Chart.yaml rename to apps/iocs/__chart/Chart.yaml diff --git a/beamline-chart/README.md b/apps/iocs/__chart/README.md similarity index 100% rename from beamline-chart/README.md rename to apps/iocs/__chart/README.md diff --git a/beamline-chart/templates/ioc.yaml b/apps/iocs/__chart/templates/ioc.yaml similarity index 100% rename from beamline-chart/templates/ioc.yaml rename to apps/iocs/__chart/templates/ioc.yaml diff --git a/beamline-chart/values.yaml b/apps/iocs/__chart/values.yaml similarity index 100% rename from beamline-chart/values.yaml rename to apps/iocs/__chart/values.yaml diff --git a/iocs/bl47p-ea-dcam-01/config/bl47p-ea-dcam-01.yaml b/apps/iocs/bl47p-ea-dcam-01/config/bl47p-ea-dcam-01.yaml similarity index 100% rename from iocs/bl47p-ea-dcam-01/config/bl47p-ea-dcam-01.yaml rename to apps/iocs/bl47p-ea-dcam-01/config/bl47p-ea-dcam-01.yaml diff --git a/iocs/bl47p-ea-dcam-01/values.yaml b/apps/iocs/bl47p-ea-dcam-01/values.yaml similarity index 100% rename from iocs/bl47p-ea-dcam-01/values.yaml rename to apps/iocs/bl47p-ea-dcam-01/values.yaml diff --git a/iocs/bl47p-ea-dcam-02/config/bl47p-ea-dcam-02.yaml b/apps/iocs/bl47p-ea-dcam-02/config/bl47p-ea-dcam-02.yaml similarity index 100% rename from iocs/bl47p-ea-dcam-02/config/bl47p-ea-dcam-02.yaml rename to apps/iocs/bl47p-ea-dcam-02/config/bl47p-ea-dcam-02.yaml diff --git a/iocs/bl47p-ea-dcam-02/values.yaml b/apps/iocs/bl47p-ea-dcam-02/values.yaml similarity index 100% rename from iocs/bl47p-ea-dcam-02/values.yaml rename to apps/iocs/bl47p-ea-dcam-02/values.yaml diff --git a/iocs/bl47p-ea-panda-01/config/liveness.sh b/apps/iocs/bl47p-ea-panda-01/config/liveness.sh similarity index 100% rename from iocs/bl47p-ea-panda-01/config/liveness.sh rename to apps/iocs/bl47p-ea-panda-01/config/liveness.sh diff --git a/iocs/bl47p-ea-panda-01/config/start.sh b/apps/iocs/bl47p-ea-panda-01/config/start.sh similarity index 100% rename from iocs/bl47p-ea-panda-01/config/start.sh rename to apps/iocs/bl47p-ea-panda-01/config/start.sh diff --git a/iocs/bl47p-ea-panda-01/config/stop.sh b/apps/iocs/bl47p-ea-panda-01/config/stop.sh similarity index 100% rename from iocs/bl47p-ea-panda-01/config/stop.sh rename to apps/iocs/bl47p-ea-panda-01/config/stop.sh diff --git a/iocs/bl47p-ea-panda-01/values.yaml b/apps/iocs/bl47p-ea-panda-01/values.yaml similarity index 100% rename from iocs/bl47p-ea-panda-01/values.yaml rename to apps/iocs/bl47p-ea-panda-01/values.yaml diff --git a/iocs/bl47p-ea-test-01/config/bl47p-ea-test-01.yaml b/apps/iocs/bl47p-ea-test-01/config/bl47p-ea-test-01.yaml similarity index 100% rename from iocs/bl47p-ea-test-01/config/bl47p-ea-test-01.yaml rename to apps/iocs/bl47p-ea-test-01/config/bl47p-ea-test-01.yaml diff --git a/iocs/bl47p-ea-test-01/values.yaml b/apps/iocs/bl47p-ea-test-01/values.yaml similarity index 100% rename from iocs/bl47p-ea-test-01/values.yaml rename to apps/iocs/bl47p-ea-test-01/values.yaml diff --git a/iocs/bl47p-mo-ioc-01/config/bl47p-mo-ioc-01.yaml b/apps/iocs/bl47p-mo-ioc-01/config/bl47p-mo-ioc-01.yaml similarity index 100% rename from iocs/bl47p-mo-ioc-01/config/bl47p-mo-ioc-01.yaml rename to apps/iocs/bl47p-mo-ioc-01/config/bl47p-mo-ioc-01.yaml diff --git a/iocs/bl47p-mo-ioc-01/values.yaml b/apps/iocs/bl47p-mo-ioc-01/values.yaml similarity index 100% rename from iocs/bl47p-mo-ioc-01/values.yaml rename to apps/iocs/bl47p-mo-ioc-01/values.yaml diff --git a/ci_verify.sh b/ci_verify.sh index 60463d1..2b99be5 100755 --- a/ci_verify.sh +++ b/ci_verify.sh @@ -8,7 +8,7 @@ set -e for ioc in ${THIS_DIR}/iocs/* do - # Skip if subfolder is not an IOC definition + # Skip if subfolder has no config to validate if [ ! -d "${ioc}/config" ]; then continue fi