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 37ef9453ec2f22eb57282f7c8cff3ebf61fe78b7..88073033158d1406166be155bd4e10b49c143261 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 6133ca5969a0227fe3dd0f7fbe2bb3ff481d3072..67f581f4d7abe0679e5e1136f1bbb43818f3126a 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 6a0704c6faedb7d95c002f08124be7031fb47959..788e67c6ebf9c1613fbb206ce36e3323dd998c1f 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 acce785f5ddffd5f15bd0e6473fddf292f6ec2f0..2837b35b3ec5f0cd9d6b8549e88ba2dd9e88e29a 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 2c7b54bfcd744432c9313927d3b64154077cbc72..67a349300e2e8f0f3fe3c2560e72b8748c56d3a3 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 a129df3550c2b6383d8a49046888a67a6674127a..61425f35a4e4ca0ef967ce5d941d12a4fd1c8595 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 5088c7224a8c9843d60e60f7084f77eedd553483..8c0ff38b7a8979aa3b685d6d8bfa194c63f2eac6 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 8f3fb3621117e49b0d997789e99cadfa92de823e..35e091866117edcbe73031746e84a8072798e744 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 07c0ed88c8b33d8cd2c5cb1c02fb4c20a6424def..4226ebfcf80417554519bc0d68723961608e1854 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 e1b47139d582a613b26764b5d672e0e4b5eaeacf..160b1a3587176c32a47e4c9792efce98f3bbfa26 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