From 5c78e636753044e1cd39b06fb154556e090591a3 Mon Sep 17 00:00:00 2001 From: Adam Israel Date: Wed, 14 Nov 2018 11:30:40 -0500 Subject: [PATCH] Rename juju-charms -> charms Per discussion at the previous F2F, we are renaming "juju-charms" to simply be "charms". This makes the necessary changes across the devops repo. Signed-off-by: Adam Israel Change-Id: I95651dbdbb29f9c3f9425db551642778625ea9a4 --- {juju-charms => charms}/.gitignore | 0 {juju-charms => charms}/Dockerfile | 0 {juju-charms => charms}/Makefile | 0 {juju-charms => charms}/README.md | 0 {juju-charms => charms}/juju-env.sh | 0 {juju-charms => charms}/layers/ansible-charm/LICENSE | 0 {juju-charms => charms}/layers/ansible-charm/README.md | 0 {juju-charms => charms}/layers/ansible-charm/actions.yaml | 2 +- .../layers/ansible-charm/actions/ansible-playbook | 2 +- {juju-charms => charms}/layers/ansible-charm/icon.svg | 0 {juju-charms => charms}/layers/ansible-charm/layer.yaml | 4 ++-- .../layers/ansible-charm/metadata.yaml | 2 +- .../layers/ansible-charm/playbook/playbook.yaml | 2 +- .../layers/ansible-charm/reactive/ansible_charm.py | 2 +- .../layers/ansible-charm/tests/00-setup | 2 +- .../layers/ansible-charm/tests/10-deploy | 4 ++-- {juju-charms => charms}/layers/netutils/LICENSE | 0 {juju-charms => charms}/layers/netutils/README.md | 0 {juju-charms => charms}/layers/netutils/actions.yaml | 0 {juju-charms => charms}/layers/netutils/actions/dig | 0 {juju-charms => charms}/layers/netutils/actions/iperf | 0 {juju-charms => charms}/layers/netutils/actions/nmap | 0 {juju-charms => charms}/layers/netutils/actions/ping | 0 .../layers/netutils/actions/traceroute | 0 {juju-charms => charms}/layers/netutils/config.yaml | 0 {juju-charms => charms}/layers/netutils/icon.svg | 0 {juju-charms => charms}/layers/netutils/layer.yaml | 0 {juju-charms => charms}/layers/netutils/metadata.yaml | 0 .../layers/netutils/reactive/layer_netutils.py | 0 {juju-charms => charms}/layers/netutils/tests/00-setup | 0 {juju-charms => charms}/layers/netutils/tests/10-deploy | 0 {juju-charms => charms}/layers/pingpong/README.md | 0 {juju-charms => charms}/layers/pingpong/actions.yaml | 0 {juju-charms => charms}/layers/pingpong/actions/get-rate | 0 .../layers/pingpong/actions/get-server | 0 {juju-charms => charms}/layers/pingpong/actions/get-state | 0 {juju-charms => charms}/layers/pingpong/actions/get-stats | 0 {juju-charms => charms}/layers/pingpong/actions/set-rate | 0 .../layers/pingpong/actions/set-server | 0 .../layers/pingpong/actions/start-traffic | 0 .../layers/pingpong/actions/stop-traffic | 0 {juju-charms => charms}/layers/pingpong/config.yaml | 0 {juju-charms => charms}/layers/pingpong/icon.svg | 0 {juju-charms => charms}/layers/pingpong/layer.yaml | 0 {juju-charms => charms}/layers/pingpong/metadata.yaml | 0 .../layers/pingpong/reactive/pingpong.py | 0 {juju-charms => charms}/layers/pingpong/tests/00-setup | 0 {juju-charms => charms}/layers/pingpong/tests/10-deploy | 0 {juju-charms => charms}/layers/simple/README.md | 0 {juju-charms => charms}/layers/simple/actions.yaml | 0 {juju-charms => charms}/layers/simple/actions/touch | 0 {juju-charms => charms}/layers/simple/config.yaml | 0 {juju-charms => charms}/layers/simple/icon.svg | 0 {juju-charms => charms}/layers/simple/layer.yaml | 0 {juju-charms => charms}/layers/simple/metadata.yaml | 0 {juju-charms => charms}/layers/simple/metrics.yaml | 0 {juju-charms => charms}/layers/simple/reactive/simple.py | 0 {juju-charms => charms}/layers/simple/tests/00-setup | 0 {juju-charms => charms}/layers/simple/tests/10-deploy | 0 {juju-charms => charms}/layers/vyos-proxy/Makefile | 0 {juju-charms => charms}/layers/vyos-proxy/README.md | 0 {juju-charms => charms}/layers/vyos-proxy/actions.yaml | 0 {juju-charms => charms}/layers/vyos-proxy/actions/ping | 0 {juju-charms => charms}/layers/vyos-proxy/config.yaml | 0 {juju-charms => charms}/layers/vyos-proxy/copyright | 0 {juju-charms => charms}/layers/vyos-proxy/icon.svg | 0 {juju-charms => charms}/layers/vyos-proxy/layer.yaml | 0 {juju-charms => charms}/layers/vyos-proxy/metadata.yaml | 0 .../layers/vyos-proxy/reactive/__init__.py | 0 .../layers/vyos-proxy/reactive/vyos_proxy.py | 0 .../layers/vyos-proxy/requirements.txt | 0 {juju-charms => charms}/layers/vyos-proxy/revision | 0 {juju-charms => charms}/layers/vyos-proxy/tox.ini | 0 {juju-charms => charms}/layers/vyos-proxy/wheelhouse.txt | 0 descriptor-packages/mk/pkg.mk | 8 ++++---- devops-stages/stage-archive.sh | 4 ++-- 76 files changed, 16 insertions(+), 16 deletions(-) rename {juju-charms => charms}/.gitignore (100%) rename {juju-charms => charms}/Dockerfile (100%) rename {juju-charms => charms}/Makefile (100%) rename {juju-charms => charms}/README.md (100%) rename {juju-charms => charms}/juju-env.sh (100%) rename {juju-charms => charms}/layers/ansible-charm/LICENSE (100%) rename {juju-charms => charms}/layers/ansible-charm/README.md (100%) rename {juju-charms => charms}/layers/ansible-charm/actions.yaml (92%) rename {juju-charms => charms}/layers/ansible-charm/actions/ansible-playbook (94%) rename {juju-charms => charms}/layers/ansible-charm/icon.svg (100%) rename {juju-charms => charms}/layers/ansible-charm/layer.yaml (84%) rename {juju-charms => charms}/layers/ansible-charm/metadata.yaml (93%) rename {juju-charms => charms}/layers/ansible-charm/playbook/playbook.yaml (92%) rename {juju-charms => charms}/layers/ansible-charm/reactive/ansible_charm.py (97%) rename {juju-charms => charms}/layers/ansible-charm/tests/00-setup (92%) rename {juju-charms => charms}/layers/ansible-charm/tests/10-deploy (96%) rename {juju-charms => charms}/layers/netutils/LICENSE (100%) rename {juju-charms => charms}/layers/netutils/README.md (100%) rename {juju-charms => charms}/layers/netutils/actions.yaml (100%) rename {juju-charms => charms}/layers/netutils/actions/dig (100%) rename {juju-charms => charms}/layers/netutils/actions/iperf (100%) rename {juju-charms => charms}/layers/netutils/actions/nmap (100%) rename {juju-charms => charms}/layers/netutils/actions/ping (100%) rename {juju-charms => charms}/layers/netutils/actions/traceroute (100%) rename {juju-charms => charms}/layers/netutils/config.yaml (100%) rename {juju-charms => charms}/layers/netutils/icon.svg (100%) rename {juju-charms => charms}/layers/netutils/layer.yaml (100%) rename {juju-charms => charms}/layers/netutils/metadata.yaml (100%) rename {juju-charms => charms}/layers/netutils/reactive/layer_netutils.py (100%) rename {juju-charms => charms}/layers/netutils/tests/00-setup (100%) rename {juju-charms => charms}/layers/netutils/tests/10-deploy (100%) rename {juju-charms => charms}/layers/pingpong/README.md (100%) rename {juju-charms => charms}/layers/pingpong/actions.yaml (100%) rename {juju-charms => charms}/layers/pingpong/actions/get-rate (100%) rename {juju-charms => charms}/layers/pingpong/actions/get-server (100%) rename {juju-charms => charms}/layers/pingpong/actions/get-state (100%) rename {juju-charms => charms}/layers/pingpong/actions/get-stats (100%) rename {juju-charms => charms}/layers/pingpong/actions/set-rate (100%) rename {juju-charms => charms}/layers/pingpong/actions/set-server (100%) rename {juju-charms => charms}/layers/pingpong/actions/start-traffic (100%) rename {juju-charms => charms}/layers/pingpong/actions/stop-traffic (100%) rename {juju-charms => charms}/layers/pingpong/config.yaml (100%) rename {juju-charms => charms}/layers/pingpong/icon.svg (100%) rename {juju-charms => charms}/layers/pingpong/layer.yaml (100%) rename {juju-charms => charms}/layers/pingpong/metadata.yaml (100%) rename {juju-charms => charms}/layers/pingpong/reactive/pingpong.py (100%) rename {juju-charms => charms}/layers/pingpong/tests/00-setup (100%) rename {juju-charms => charms}/layers/pingpong/tests/10-deploy (100%) rename {juju-charms => charms}/layers/simple/README.md (100%) rename {juju-charms => charms}/layers/simple/actions.yaml (100%) rename {juju-charms => charms}/layers/simple/actions/touch (100%) rename {juju-charms => charms}/layers/simple/config.yaml (100%) rename {juju-charms => charms}/layers/simple/icon.svg (100%) rename {juju-charms => charms}/layers/simple/layer.yaml (100%) rename {juju-charms => charms}/layers/simple/metadata.yaml (100%) rename {juju-charms => charms}/layers/simple/metrics.yaml (100%) rename {juju-charms => charms}/layers/simple/reactive/simple.py (100%) rename {juju-charms => charms}/layers/simple/tests/00-setup (100%) rename {juju-charms => charms}/layers/simple/tests/10-deploy (100%) rename {juju-charms => charms}/layers/vyos-proxy/Makefile (100%) rename {juju-charms => charms}/layers/vyos-proxy/README.md (100%) rename {juju-charms => charms}/layers/vyos-proxy/actions.yaml (100%) rename {juju-charms => charms}/layers/vyos-proxy/actions/ping (100%) rename {juju-charms => charms}/layers/vyos-proxy/config.yaml (100%) rename {juju-charms => charms}/layers/vyos-proxy/copyright (100%) rename {juju-charms => charms}/layers/vyos-proxy/icon.svg (100%) rename {juju-charms => charms}/layers/vyos-proxy/layer.yaml (100%) rename {juju-charms => charms}/layers/vyos-proxy/metadata.yaml (100%) rename {juju-charms => charms}/layers/vyos-proxy/reactive/__init__.py (100%) rename {juju-charms => charms}/layers/vyos-proxy/reactive/vyos_proxy.py (100%) rename {juju-charms => charms}/layers/vyos-proxy/requirements.txt (100%) rename {juju-charms => charms}/layers/vyos-proxy/revision (100%) rename {juju-charms => charms}/layers/vyos-proxy/tox.ini (100%) rename {juju-charms => charms}/layers/vyos-proxy/wheelhouse.txt (100%) diff --git a/juju-charms/.gitignore b/charms/.gitignore similarity index 100% rename from juju-charms/.gitignore rename to charms/.gitignore diff --git a/juju-charms/Dockerfile b/charms/Dockerfile similarity index 100% rename from juju-charms/Dockerfile rename to charms/Dockerfile diff --git a/juju-charms/Makefile b/charms/Makefile similarity index 100% rename from juju-charms/Makefile rename to charms/Makefile diff --git a/juju-charms/README.md b/charms/README.md similarity index 100% rename from juju-charms/README.md rename to charms/README.md diff --git a/juju-charms/juju-env.sh b/charms/juju-env.sh similarity index 100% rename from juju-charms/juju-env.sh rename to charms/juju-env.sh diff --git a/juju-charms/layers/ansible-charm/LICENSE b/charms/layers/ansible-charm/LICENSE similarity index 100% rename from juju-charms/layers/ansible-charm/LICENSE rename to charms/layers/ansible-charm/LICENSE diff --git a/juju-charms/layers/ansible-charm/README.md b/charms/layers/ansible-charm/README.md similarity index 100% rename from juju-charms/layers/ansible-charm/README.md rename to charms/layers/ansible-charm/README.md diff --git a/juju-charms/layers/ansible-charm/actions.yaml b/charms/layers/ansible-charm/actions.yaml similarity index 92% rename from juju-charms/layers/ansible-charm/actions.yaml rename to charms/layers/ansible-charm/actions.yaml index 37ef9453..88073033 100755 --- a/juju-charms/layers/ansible-charm/actions.yaml +++ b/charms/layers/ansible-charm/actions.yaml @@ -1,5 +1,5 @@ # -# OSM devops/juju-charms - Ansible charm inside OSM devops +# OSM devops/charms - Ansible charm inside OSM devops # # Copyright 2017-2018 Universidad Carlos III de Madrid # diff --git a/juju-charms/layers/ansible-charm/actions/ansible-playbook b/charms/layers/ansible-charm/actions/ansible-playbook similarity index 94% rename from juju-charms/layers/ansible-charm/actions/ansible-playbook rename to charms/layers/ansible-charm/actions/ansible-playbook index 6133ca59..67f581f4 100755 --- a/juju-charms/layers/ansible-charm/actions/ansible-playbook +++ b/charms/layers/ansible-charm/actions/ansible-playbook @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# OSM devops/juju-charms - Ansible charm inside OSM devops +# OSM devops/charms - Ansible charm inside OSM devops # # Copyright 2017-2018 Universidad Carlos III de Madrid # diff --git a/juju-charms/layers/ansible-charm/icon.svg b/charms/layers/ansible-charm/icon.svg similarity index 100% rename from juju-charms/layers/ansible-charm/icon.svg rename to charms/layers/ansible-charm/icon.svg diff --git a/juju-charms/layers/ansible-charm/layer.yaml b/charms/layers/ansible-charm/layer.yaml similarity index 84% rename from juju-charms/layers/ansible-charm/layer.yaml rename to charms/layers/ansible-charm/layer.yaml index 6a0704c6..788e67c6 100755 --- a/juju-charms/layers/ansible-charm/layer.yaml +++ b/charms/layers/ansible-charm/layer.yaml @@ -1,5 +1,5 @@ # -# OSM devops/juju-charms - Ansible charm inside OSM devops +# OSM devops/charms - Ansible charm inside OSM devops # # Copyright 2017-2018 Universidad Carlos III de Madrid # @@ -16,4 +16,4 @@ # limitations under the License. # -includes: ['layer:ansible-base', 'layer:vnfproxy'] +includes: ['layer:ansible-base', 'layer:vnfproxy'] diff --git a/juju-charms/layers/ansible-charm/metadata.yaml b/charms/layers/ansible-charm/metadata.yaml similarity index 93% rename from juju-charms/layers/ansible-charm/metadata.yaml rename to charms/layers/ansible-charm/metadata.yaml index acce785f..2837b35b 100755 --- a/juju-charms/layers/ansible-charm/metadata.yaml +++ b/charms/layers/ansible-charm/metadata.yaml @@ -1,5 +1,5 @@ # -# OSM devops/juju-charms - Ansible charm inside OSM devops +# OSM devops/charms - Ansible charm inside OSM devops # # Copyright 2017-2018 Universidad Carlos III de Madrid # diff --git a/juju-charms/layers/ansible-charm/playbook/playbook.yaml b/charms/layers/ansible-charm/playbook/playbook.yaml similarity index 92% rename from juju-charms/layers/ansible-charm/playbook/playbook.yaml rename to charms/layers/ansible-charm/playbook/playbook.yaml index 2c7b54bf..67a34930 100755 --- a/juju-charms/layers/ansible-charm/playbook/playbook.yaml +++ b/charms/layers/ansible-charm/playbook/playbook.yaml @@ -1,5 +1,5 @@ # -# OSM devops/juju-charms - Ansible charm inside OSM devops +# OSM devops/charms - Ansible charm inside OSM devops # # Copyright 2017-2018 Universidad Carlos III de Madrid # diff --git a/juju-charms/layers/ansible-charm/reactive/ansible_charm.py b/charms/layers/ansible-charm/reactive/ansible_charm.py similarity index 97% rename from juju-charms/layers/ansible-charm/reactive/ansible_charm.py rename to charms/layers/ansible-charm/reactive/ansible_charm.py index a129df35..61425f35 100755 --- a/juju-charms/layers/ansible-charm/reactive/ansible_charm.py +++ b/charms/layers/ansible-charm/reactive/ansible_charm.py @@ -1,4 +1,4 @@ -# OSM devops/juju-charms - Ansible charm inside OSM devops +# OSM devops/charms - Ansible charm inside OSM devops # # Copyright 2017-2018 Universidad Carlos III de Madrid # Copyright 2018 Altran diff --git a/juju-charms/layers/ansible-charm/tests/00-setup b/charms/layers/ansible-charm/tests/00-setup similarity index 92% rename from juju-charms/layers/ansible-charm/tests/00-setup rename to charms/layers/ansible-charm/tests/00-setup index 5088c722..8c0ff38b 100755 --- a/juju-charms/layers/ansible-charm/tests/00-setup +++ b/charms/layers/ansible-charm/tests/00-setup @@ -1,6 +1,6 @@ #!/bin/bash # -# OSM devops/juju-charms - Ansible charm inside OSM devops +# OSM devops/charms - Ansible charm inside OSM devops # # Copyright 2017-2018 Universidad Carlos III de Madrid # diff --git a/juju-charms/layers/ansible-charm/tests/10-deploy b/charms/layers/ansible-charm/tests/10-deploy similarity index 96% rename from juju-charms/layers/ansible-charm/tests/10-deploy rename to charms/layers/ansible-charm/tests/10-deploy index 8f3fb362..35e09186 100755 --- a/juju-charms/layers/ansible-charm/tests/10-deploy +++ b/charms/layers/ansible-charm/tests/10-deploy @@ -1,6 +1,6 @@ #!/usr/bin/python3 # -# OSM devops/juju-charms - Ansible charm inside OSM devops +# OSM devops/charms - Ansible charm inside OSM devops # # Copyright 2017-2018 Universidad Carlos III de Madrid # @@ -47,6 +47,6 @@ class TestCharm(unittest.TestCase): # - .directory_contents(PATH) - List files and folders in PATH on that unit # - .relation(relation, service:rel) - Get relation data from return service - + if __name__ == '__main__': unittest.main() diff --git a/juju-charms/layers/netutils/LICENSE b/charms/layers/netutils/LICENSE similarity index 100% rename from juju-charms/layers/netutils/LICENSE rename to charms/layers/netutils/LICENSE diff --git a/juju-charms/layers/netutils/README.md b/charms/layers/netutils/README.md similarity index 100% rename from juju-charms/layers/netutils/README.md rename to charms/layers/netutils/README.md diff --git a/juju-charms/layers/netutils/actions.yaml b/charms/layers/netutils/actions.yaml similarity index 100% rename from juju-charms/layers/netutils/actions.yaml rename to charms/layers/netutils/actions.yaml diff --git a/juju-charms/layers/netutils/actions/dig b/charms/layers/netutils/actions/dig similarity index 100% rename from juju-charms/layers/netutils/actions/dig rename to charms/layers/netutils/actions/dig diff --git a/juju-charms/layers/netutils/actions/iperf b/charms/layers/netutils/actions/iperf similarity index 100% rename from juju-charms/layers/netutils/actions/iperf rename to charms/layers/netutils/actions/iperf diff --git a/juju-charms/layers/netutils/actions/nmap b/charms/layers/netutils/actions/nmap similarity index 100% rename from juju-charms/layers/netutils/actions/nmap rename to charms/layers/netutils/actions/nmap diff --git a/juju-charms/layers/netutils/actions/ping b/charms/layers/netutils/actions/ping similarity index 100% rename from juju-charms/layers/netutils/actions/ping rename to charms/layers/netutils/actions/ping diff --git a/juju-charms/layers/netutils/actions/traceroute b/charms/layers/netutils/actions/traceroute similarity index 100% rename from juju-charms/layers/netutils/actions/traceroute rename to charms/layers/netutils/actions/traceroute diff --git a/juju-charms/layers/netutils/config.yaml b/charms/layers/netutils/config.yaml similarity index 100% rename from juju-charms/layers/netutils/config.yaml rename to charms/layers/netutils/config.yaml diff --git a/juju-charms/layers/netutils/icon.svg b/charms/layers/netutils/icon.svg similarity index 100% rename from juju-charms/layers/netutils/icon.svg rename to charms/layers/netutils/icon.svg diff --git a/juju-charms/layers/netutils/layer.yaml b/charms/layers/netutils/layer.yaml similarity index 100% rename from juju-charms/layers/netutils/layer.yaml rename to charms/layers/netutils/layer.yaml diff --git a/juju-charms/layers/netutils/metadata.yaml b/charms/layers/netutils/metadata.yaml similarity index 100% rename from juju-charms/layers/netutils/metadata.yaml rename to charms/layers/netutils/metadata.yaml diff --git a/juju-charms/layers/netutils/reactive/layer_netutils.py b/charms/layers/netutils/reactive/layer_netutils.py similarity index 100% rename from juju-charms/layers/netutils/reactive/layer_netutils.py rename to charms/layers/netutils/reactive/layer_netutils.py diff --git a/juju-charms/layers/netutils/tests/00-setup b/charms/layers/netutils/tests/00-setup similarity index 100% rename from juju-charms/layers/netutils/tests/00-setup rename to charms/layers/netutils/tests/00-setup diff --git a/juju-charms/layers/netutils/tests/10-deploy b/charms/layers/netutils/tests/10-deploy similarity index 100% rename from juju-charms/layers/netutils/tests/10-deploy rename to charms/layers/netutils/tests/10-deploy diff --git a/juju-charms/layers/pingpong/README.md b/charms/layers/pingpong/README.md similarity index 100% rename from juju-charms/layers/pingpong/README.md rename to charms/layers/pingpong/README.md diff --git a/juju-charms/layers/pingpong/actions.yaml b/charms/layers/pingpong/actions.yaml similarity index 100% rename from juju-charms/layers/pingpong/actions.yaml rename to charms/layers/pingpong/actions.yaml diff --git a/juju-charms/layers/pingpong/actions/get-rate b/charms/layers/pingpong/actions/get-rate similarity index 100% rename from juju-charms/layers/pingpong/actions/get-rate rename to charms/layers/pingpong/actions/get-rate diff --git a/juju-charms/layers/pingpong/actions/get-server b/charms/layers/pingpong/actions/get-server similarity index 100% rename from juju-charms/layers/pingpong/actions/get-server rename to charms/layers/pingpong/actions/get-server diff --git a/juju-charms/layers/pingpong/actions/get-state b/charms/layers/pingpong/actions/get-state similarity index 100% rename from juju-charms/layers/pingpong/actions/get-state rename to charms/layers/pingpong/actions/get-state diff --git a/juju-charms/layers/pingpong/actions/get-stats b/charms/layers/pingpong/actions/get-stats similarity index 100% rename from juju-charms/layers/pingpong/actions/get-stats rename to charms/layers/pingpong/actions/get-stats diff --git a/juju-charms/layers/pingpong/actions/set-rate b/charms/layers/pingpong/actions/set-rate similarity index 100% rename from juju-charms/layers/pingpong/actions/set-rate rename to charms/layers/pingpong/actions/set-rate diff --git a/juju-charms/layers/pingpong/actions/set-server b/charms/layers/pingpong/actions/set-server similarity index 100% rename from juju-charms/layers/pingpong/actions/set-server rename to charms/layers/pingpong/actions/set-server diff --git a/juju-charms/layers/pingpong/actions/start-traffic b/charms/layers/pingpong/actions/start-traffic similarity index 100% rename from juju-charms/layers/pingpong/actions/start-traffic rename to charms/layers/pingpong/actions/start-traffic diff --git a/juju-charms/layers/pingpong/actions/stop-traffic b/charms/layers/pingpong/actions/stop-traffic similarity index 100% rename from juju-charms/layers/pingpong/actions/stop-traffic rename to charms/layers/pingpong/actions/stop-traffic diff --git a/juju-charms/layers/pingpong/config.yaml b/charms/layers/pingpong/config.yaml similarity index 100% rename from juju-charms/layers/pingpong/config.yaml rename to charms/layers/pingpong/config.yaml diff --git a/juju-charms/layers/pingpong/icon.svg b/charms/layers/pingpong/icon.svg similarity index 100% rename from juju-charms/layers/pingpong/icon.svg rename to charms/layers/pingpong/icon.svg diff --git a/juju-charms/layers/pingpong/layer.yaml b/charms/layers/pingpong/layer.yaml similarity index 100% rename from juju-charms/layers/pingpong/layer.yaml rename to charms/layers/pingpong/layer.yaml diff --git a/juju-charms/layers/pingpong/metadata.yaml b/charms/layers/pingpong/metadata.yaml similarity index 100% rename from juju-charms/layers/pingpong/metadata.yaml rename to charms/layers/pingpong/metadata.yaml diff --git a/juju-charms/layers/pingpong/reactive/pingpong.py b/charms/layers/pingpong/reactive/pingpong.py similarity index 100% rename from juju-charms/layers/pingpong/reactive/pingpong.py rename to charms/layers/pingpong/reactive/pingpong.py diff --git a/juju-charms/layers/pingpong/tests/00-setup b/charms/layers/pingpong/tests/00-setup similarity index 100% rename from juju-charms/layers/pingpong/tests/00-setup rename to charms/layers/pingpong/tests/00-setup diff --git a/juju-charms/layers/pingpong/tests/10-deploy b/charms/layers/pingpong/tests/10-deploy similarity index 100% rename from juju-charms/layers/pingpong/tests/10-deploy rename to charms/layers/pingpong/tests/10-deploy diff --git a/juju-charms/layers/simple/README.md b/charms/layers/simple/README.md similarity index 100% rename from juju-charms/layers/simple/README.md rename to charms/layers/simple/README.md diff --git a/juju-charms/layers/simple/actions.yaml b/charms/layers/simple/actions.yaml similarity index 100% rename from juju-charms/layers/simple/actions.yaml rename to charms/layers/simple/actions.yaml diff --git a/juju-charms/layers/simple/actions/touch b/charms/layers/simple/actions/touch similarity index 100% rename from juju-charms/layers/simple/actions/touch rename to charms/layers/simple/actions/touch diff --git a/juju-charms/layers/simple/config.yaml b/charms/layers/simple/config.yaml similarity index 100% rename from juju-charms/layers/simple/config.yaml rename to charms/layers/simple/config.yaml diff --git a/juju-charms/layers/simple/icon.svg b/charms/layers/simple/icon.svg similarity index 100% rename from juju-charms/layers/simple/icon.svg rename to charms/layers/simple/icon.svg diff --git a/juju-charms/layers/simple/layer.yaml b/charms/layers/simple/layer.yaml similarity index 100% rename from juju-charms/layers/simple/layer.yaml rename to charms/layers/simple/layer.yaml diff --git a/juju-charms/layers/simple/metadata.yaml b/charms/layers/simple/metadata.yaml similarity index 100% rename from juju-charms/layers/simple/metadata.yaml rename to charms/layers/simple/metadata.yaml diff --git a/juju-charms/layers/simple/metrics.yaml b/charms/layers/simple/metrics.yaml similarity index 100% rename from juju-charms/layers/simple/metrics.yaml rename to charms/layers/simple/metrics.yaml diff --git a/juju-charms/layers/simple/reactive/simple.py b/charms/layers/simple/reactive/simple.py similarity index 100% rename from juju-charms/layers/simple/reactive/simple.py rename to charms/layers/simple/reactive/simple.py diff --git a/juju-charms/layers/simple/tests/00-setup b/charms/layers/simple/tests/00-setup similarity index 100% rename from juju-charms/layers/simple/tests/00-setup rename to charms/layers/simple/tests/00-setup diff --git a/juju-charms/layers/simple/tests/10-deploy b/charms/layers/simple/tests/10-deploy similarity index 100% rename from juju-charms/layers/simple/tests/10-deploy rename to charms/layers/simple/tests/10-deploy diff --git a/juju-charms/layers/vyos-proxy/Makefile b/charms/layers/vyos-proxy/Makefile similarity index 100% rename from juju-charms/layers/vyos-proxy/Makefile rename to charms/layers/vyos-proxy/Makefile diff --git a/juju-charms/layers/vyos-proxy/README.md b/charms/layers/vyos-proxy/README.md similarity index 100% rename from juju-charms/layers/vyos-proxy/README.md rename to charms/layers/vyos-proxy/README.md diff --git a/juju-charms/layers/vyos-proxy/actions.yaml b/charms/layers/vyos-proxy/actions.yaml similarity index 100% rename from juju-charms/layers/vyos-proxy/actions.yaml rename to charms/layers/vyos-proxy/actions.yaml diff --git a/juju-charms/layers/vyos-proxy/actions/ping b/charms/layers/vyos-proxy/actions/ping similarity index 100% rename from juju-charms/layers/vyos-proxy/actions/ping rename to charms/layers/vyos-proxy/actions/ping diff --git a/juju-charms/layers/vyos-proxy/config.yaml b/charms/layers/vyos-proxy/config.yaml similarity index 100% rename from juju-charms/layers/vyos-proxy/config.yaml rename to charms/layers/vyos-proxy/config.yaml diff --git a/juju-charms/layers/vyos-proxy/copyright b/charms/layers/vyos-proxy/copyright similarity index 100% rename from juju-charms/layers/vyos-proxy/copyright rename to charms/layers/vyos-proxy/copyright diff --git a/juju-charms/layers/vyos-proxy/icon.svg b/charms/layers/vyos-proxy/icon.svg similarity index 100% rename from juju-charms/layers/vyos-proxy/icon.svg rename to charms/layers/vyos-proxy/icon.svg diff --git a/juju-charms/layers/vyos-proxy/layer.yaml b/charms/layers/vyos-proxy/layer.yaml similarity index 100% rename from juju-charms/layers/vyos-proxy/layer.yaml rename to charms/layers/vyos-proxy/layer.yaml diff --git a/juju-charms/layers/vyos-proxy/metadata.yaml b/charms/layers/vyos-proxy/metadata.yaml similarity index 100% rename from juju-charms/layers/vyos-proxy/metadata.yaml rename to charms/layers/vyos-proxy/metadata.yaml diff --git a/juju-charms/layers/vyos-proxy/reactive/__init__.py b/charms/layers/vyos-proxy/reactive/__init__.py similarity index 100% rename from juju-charms/layers/vyos-proxy/reactive/__init__.py rename to charms/layers/vyos-proxy/reactive/__init__.py diff --git a/juju-charms/layers/vyos-proxy/reactive/vyos_proxy.py b/charms/layers/vyos-proxy/reactive/vyos_proxy.py similarity index 100% rename from juju-charms/layers/vyos-proxy/reactive/vyos_proxy.py rename to charms/layers/vyos-proxy/reactive/vyos_proxy.py diff --git a/juju-charms/layers/vyos-proxy/requirements.txt b/charms/layers/vyos-proxy/requirements.txt similarity index 100% rename from juju-charms/layers/vyos-proxy/requirements.txt rename to charms/layers/vyos-proxy/requirements.txt diff --git a/juju-charms/layers/vyos-proxy/revision b/charms/layers/vyos-proxy/revision similarity index 100% rename from juju-charms/layers/vyos-proxy/revision rename to charms/layers/vyos-proxy/revision diff --git a/juju-charms/layers/vyos-proxy/tox.ini b/charms/layers/vyos-proxy/tox.ini similarity index 100% rename from juju-charms/layers/vyos-proxy/tox.ini rename to charms/layers/vyos-proxy/tox.ini diff --git a/juju-charms/layers/vyos-proxy/wheelhouse.txt b/charms/layers/vyos-proxy/wheelhouse.txt similarity index 100% rename from juju-charms/layers/vyos-proxy/wheelhouse.txt rename to charms/layers/vyos-proxy/wheelhouse.txt diff --git a/descriptor-packages/mk/pkg.mk b/descriptor-packages/mk/pkg.mk index 07c0ed88..4226ebfc 100644 --- a/descriptor-packages/mk/pkg.mk +++ b/descriptor-packages/mk/pkg.mk @@ -20,7 +20,7 @@ TOOLS_DIR := $(TOPDIR)/descriptor-packages/tools PKG_BASE_NAME := $(shell basename $(shell pwd)) PKG_NAME := $(addsuffix .tar.gz, $(PKG_BASE_NAME)) -CHARM_DIR := $(TOPDIR)/juju-charms +CHARM_DIR := $(TOPDIR)/charms CHARM_SRC_DIR := $(CHARM_DIR)/layers CHARM_DOCKER_TAG := charm-tools CHARM_BUILD_DIR := $(CHARM_DIR)/builds @@ -69,14 +69,14 @@ else $(CHARM_BUILD_DIR)/%: $(CHARM_SRC_DIR)/% $(Q)charm build -o $(CHARM_DIR) $< endif - + clean: $(Q)rm -rf $(BUILD_DIR) $(Q)rm -rf $(CHARM_BUILD_DIR) test: - $(Q)echo -n testing $(shell readlink -f src/*.yaml) " " + $(Q)echo -n testing $(shell readlink -f src/*.yaml) " " $(Q)$(TEST_PKG) src/*.yaml $(Q)echo OK - + .DEFAULT_GOAL := all diff --git a/devops-stages/stage-archive.sh b/devops-stages/stage-archive.sh index e1b47139..160b1a35 100755 --- a/devops-stages/stage-archive.sh +++ b/devops-stages/stage-archive.sh @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -PKG_DIRECTORIES="jenkins installers systest juju-charms descriptor-packages tools docker" +PKG_DIRECTORIES="jenkins installers systest charms descriptor-packages tools docker" MDG_NAME=devops DEB_INSTALL=debian/osm-$MDG_NAME.install export DEBEMAIL="mmarchetti@sandvine.com" @@ -45,7 +45,7 @@ cp -R debian $PKG_DIR/. cd $PKG_DIR dh_make -y --indep --createorig --a -c apache -dpkg-buildpackage -uc -us -tc -rfakeroot +dpkg-buildpackage -uc -us -tc -rfakeroot cd - rm -rf pool -- 2.25.1