Merge branch 't32734-reorganize-files' into 'master'

See merge request mediaserver/envsetup!19

.devcontainer/Dockerfile

@@ -63,7 +63,7 @@ RUN \
     && \
     :
 
-COPY requirements.dev.txt .
+COPY ansible/requirements.dev.txt .
 RUN \
     # ansible & co
     pip install -r requirements.dev.txt && \

.devcontainer/devcontainer.json

@@ -16,8 +16,8 @@
     ],
     "settings": {
         "files.associations": {
-            "**/requirements.in/*.txt": "pip-requirements",
-            "requirements.*.txt": "pip-requirements",
+            "**/ansible/requirements.in/*.txt": "pip-requirements",
+            "ansible/requirements.*.txt": "pip-requirements",
             "**/defaults/**/*": "ansible",
             "**/tasks/**/*.yml": "ansible",
             "**/handler/*.yml": "ansible",

.flake8

@@ -6,8 +6,5 @@ ignore =
     W503
     W505
 
-per-file-ignores =
-    roles/elastic.elasticsearch/*:E713
-    roles/manager/files/set_site_url.py:E402
-    library/*:E402
-    library/nmcli.py:E402,F401
+#per-file-ignores =
+#    ansible/roles/elastic.elasticsearch/*:E713

.gitignore

@@ -6,12 +6,14 @@ __pycache__/
 *.pyc
 
 # ansible
-inventories/_*
-inventories/local*/host_vars/localhost.yml
-inventories/offline*/host_vars/localhost.yml
-playbooks/_*
-roles/_*
-roles/elastic.elasticsearch
+ansible/inventories/_*
+ansible/inventories/local*/host_vars/localhost.yml
+ansible/inventories/offline*/host_vars/localhost.yml
+ansible/playbooks/_*
+ansible/roles/_*
+ansible/roles/elastic.elasticsearch
+
+# logs
 ./logs/
 log/
 
@@ -39,5 +41,5 @@ packer/*.json
 conf*.sh
 auto-generated-conf.sh*
 log*.txt
-tests/ms-testing-suite
+tests/scripts/ms-testing-suite
 *.log

.gitlab-ci.yml

@@ -19,7 +19,7 @@ docker:build:
     - if: '$CI_PIPELINE_SOURCE == "push"'
       changes:
         - .devcontainer/Dockerfile
-        - requirements.dev.txt
+        - ansible/requirements.dev.txt
   before_script:
     - apk add bash make
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.ubicast.net

Makefile

@@ -28,8 +28,8 @@ venv:
 	-@command -v apt-get >/dev/null && apt-get update && apt-get install -y python3-venv
 	@command -v $(PIP_BIN) > /dev/null || python3 -m venv $(VENV)
 
-## requirements.txt: Update requirements and their dependencies
-## requirements.dev.txt: Update development requirements and their dependencies
+## ansible/requirements.txt: Update requirements and their dependencies
+## ansible/requirements.dev.txt: Update development requirements and their dependencies
 %.txt: %.in
 	$(PIP_COMPILE_BIN) -U $^ -o $@
 	chmod 644 $@
@@ -38,14 +38,14 @@ venv:
 ## install: Install requirements
 install: venv
 	$(PIP_BIN) install -U pip wheel
-	$(PIP_BIN) install -r requirements.txt
-	$(ANSIBLE_GALAXY_BIN) install -r requirements.yml
+	$(PIP_BIN) install -r ansible/requirements.txt
+	$(ANSIBLE_GALAXY_BIN) install -r ansible/requirements.yml
 
 
 .PHONY: install-dev
 ## install-dev: Install development requirements
 install-dev: install
-	$(PIP_BIN) install -r requirements.dev.txt
+	$(PIP_BIN) install -r ansible/requirements.dev.txt
 	[ -d .git/hooks ] || mkdir .git/hooks
 	ln -sfv .githooks/pre-commit .git/hooks/ || echo "Failed to create pre-commit link"
 
@@ -54,7 +54,7 @@ install-dev: install
 lint:
 	$(FLAKE8_BIN) .
 	$(YAMLLINT_BIN) .
-	$(ANSIBLE_LINT_BIN) site.yml
+	$(ANSIBLE_LINT_BIN) ansible/playbooks/site.yml
 
 .PHONY: test
 ## test: Run development tests on the project : debug=1, keep=1, SKYREACH_SYSTEM_KEY=<xxx>
@@ -77,7 +77,7 @@ ifndef t
 	$(eval t=all)
 endif
 	$(ANSIBLE_BIN) -i $(i) -l $(l) -m ping all
-	$(ANSIBLE_PLAYBOOK_BIN) -i $(i) site.yml -e conf_update=true -l $(l) -t $(t)
+	$(ANSIBLE_PLAYBOOK_BIN) -i $(i) ansible/playbooks/site.yml -e conf_update=true -l $(l) -t $(t)
 
 .PHONY: image-validate
 ## image-validate: Check that Packer image is valid : build=<path-to-packer-file>