From d1d6e1e2de58d1dbb035d30a868e456f8ab21d3f Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 12:46:11 +0100 Subject: [PATCH 01/28] Adding the submodule for the 'test' role --- .gitlab-ci.yml | 293 +++++++++--------- .gitmodules | 3 + ci-cd/{ => playbooks}/01_test.yml | 0 ci-cd/{ => playbooks}/02_dependencies.yml | 0 .../{ => playbooks}/03_clone_repositories.yml | 0 ci-cd/{ => playbooks}/04_docker_images.yml | 0 .../{ => playbooks}/05_docker_containers.yml | 0 ci-cd/{ => playbooks}/06_oh_my_bash.yml | 0 roles/c3infodesk-deployment-role-test | 1 + roles/test/README.md | 61 ---- roles/test/defaults/main.yml | 5 - roles/test/molecule/default/converge.yml | 7 - roles/test/molecule/default/molecule.yml | 66 ---- roles/test/molecule/default/verify.yml | 59 ---- roles/test/tasks/main.yml | 33 -- roles/test/vars/main.yml | 5 - 16 files changed, 152 insertions(+), 381 deletions(-) create mode 100644 .gitmodules rename ci-cd/{ => playbooks}/01_test.yml (100%) rename ci-cd/{ => playbooks}/02_dependencies.yml (100%) rename ci-cd/{ => playbooks}/03_clone_repositories.yml (100%) rename ci-cd/{ => playbooks}/04_docker_images.yml (100%) rename ci-cd/{ => playbooks}/05_docker_containers.yml (100%) rename ci-cd/{ => playbooks}/06_oh_my_bash.yml (100%) create mode 160000 roles/c3infodesk-deployment-role-test delete mode 100644 roles/test/README.md delete mode 100644 roles/test/defaults/main.yml delete mode 100644 roles/test/molecule/default/converge.yml delete mode 100644 roles/test/molecule/default/molecule.yml delete mode 100644 roles/test/molecule/default/verify.yml delete mode 100644 roles/test/tasks/main.yml delete mode 100644 roles/test/vars/main.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7111d1b..e201c7d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,5 @@ +--- + # image: python:3.10.15-bullseye ### @@ -44,153 +46,154 @@ stages: ### ### STAGE-SYNTAX-CHECK ### -syntax-test: - stage: syntax-check - image: $IMAGE_NAME_SYNTAX - variables: - ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_TEST - before_script: - - *before_syntax_n_lint - script: - - echo "Running ansible-playbook --syntax-check tests at the role-> 'test'" - - *run_syntax_check - allow_failure: false - -syntax-dependencies: - stage: syntax-check - image: $IMAGE_NAME_SYNTAX - variables: - ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DEPENDENCIES - before_script: - - *before_syntax_n_lint - script: - - echo "Running ansible-playbook --syntax-check tests at the role-> 'dependencies'" - - *run_syntax_check - allow_failure: false - -syntax-clone-repositories: - stage: syntax-check - image: $IMAGE_NAME_SYNTAX - variables: - ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_CLONE_REPOSITORIES - before_script: - - *before_syntax_n_lint - script: - - echo "Running ansible-playbook --syntax-check tests at the role-> 'clone_repositories'" - - *run_syntax_check - allow_failure: false - -syntax-docker-images: - stage: syntax-check - image: $IMAGE_NAME_SYNTAX - variables: - ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DOCKER_IMAGES - before_script: - - *before_syntax_n_lint - script: - - echo "Running ansible-playbook --syntax-check tests at the role-> 'docker_images'" - - *run_syntax_check - allow_failure: false - -syntax-docker-containers: - stage: syntax-check - image: $IMAGE_NAME_SYNTAX - variables: - ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DOCKER_CONTAINERS - before_script: - - *before_syntax_n_lint - script: - - echo "Running ansible-playbook --syntax-check tests at the role-> 'docker_containers'" - - *run_syntax_check - allow_failure: false - -syntax-oh-my-bash: - stage: syntax-check - image: $IMAGE_NAME_SYNTAX - variables: - ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_OH_MY_BASH - before_script: - - *before_syntax_n_lint - script: - - echo "Running ansible-playbook --syntax-check tests at the role-> 'docker_containers'" - - *run_syntax_check - allow_failure: false +# syntax-test: +# stage: syntax-check +# image: $IMAGE_NAME_SYNTAX +# variables: +# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_TEST +# before_script: +# - *before_syntax_n_lint +# script: +# - echo "Running ansible-playbook --syntax-check tests at the role-> 'test'" +# - *run_syntax_check +# only: +# changes: +# - roles/test + +# syntax-dependencies: +# stage: syntax-check +# image: $IMAGE_NAME_SYNTAX +# variables: +# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DEPENDENCIES +# before_script: +# - *before_syntax_n_lint +# script: +# - echo "Running ansible-playbook --syntax-check tests at the role-> 'dependencies'" +# - *run_syntax_check +# allow_failure: false -### -### STAGE-LINT-TESTS -### -lint-test: - stage: lint-tests - image: $IMAGE_NAME_LINT - variables: - ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_TEST - before_script: - - *before_syntax_n_lint - script: - - echo "Running ansible-lint tests at the role-> 'test'" - - *run_lint - allow_failure: false - -lint-dependencies: - stage: lint-tests - image: $IMAGE_NAME_LINT - variables: - ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DEPENDENCIES - before_script: - - *before_syntax_n_lint - script: - - echo "Running ansible-lint tests at the role-> 'dependencies'" - - *run_lint - allow_failure: false - -lint-clone-repositories: - stage: lint-tests - image: $IMAGE_NAME_LINT - variables: - ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_CLONE_REPOSITORIES - before_script: - - *before_syntax_n_lint - script: - - echo "Running ansible-lint tests at the role-> 'clone_repositories'" - - *run_lint - allow_failure: false - -lint-docker-images: - stage: lint-tests - image: $IMAGE_NAME_LINT - variables: - ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DOCKER_IMAGES - before_script: - - *before_syntax_n_lint - script: - - echo "Running ansible-lint tests at the role-> 'docker_images'" - - *run_lint - allow_failure: false - -lint-docker-containers: - stage: lint-tests - image: $IMAGE_NAME_LINT - variables: - ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DOCKER_CONTAINERS - before_script: - - *before_syntax_n_lint - script: - - echo "Running ansible-lint tests at the role-> 'docker_containers'" - - *run_lint - allow_failure: false - -lint-oh-my-bash: - stage: lint-tests - image: $IMAGE_NAME_LINT - variables: - ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_OH_MY_BASH - before_script: - - *before_syntax_n_lint - script: - - echo "Running ansible-lint tests at the role-> 'docker_containers'" - - *run_lint - allow_failure: false +# syntax-clone-repositories: +# stage: syntax-check +# image: $IMAGE_NAME_SYNTAX +# variables: +# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_CLONE_REPOSITORIES +# before_script: +# - *before_syntax_n_lint +# script: +# - echo "Running ansible-playbook --syntax-check tests at the role-> 'clone_repositories'" +# - *run_syntax_check +# allow_failure: false + +# syntax-docker-images: +# stage: syntax-check +# image: $IMAGE_NAME_SYNTAX +# variables: +# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DOCKER_IMAGES +# before_script: +# - *before_syntax_n_lint +# script: +# - echo "Running ansible-playbook --syntax-check tests at the role-> 'docker_images'" +# - *run_syntax_check +# allow_failure: false + +# syntax-docker-containers: +# stage: syntax-check +# image: $IMAGE_NAME_SYNTAX +# variables: +# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DOCKER_CONTAINERS +# before_script: +# - *before_syntax_n_lint +# script: +# - echo "Running ansible-playbook --syntax-check tests at the role-> 'docker_containers'" +# - *run_syntax_check +# allow_failure: false + +# syntax-oh-my-bash: +# stage: syntax-check +# image: $IMAGE_NAME_SYNTAX +# variables: +# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_OH_MY_BASH +# before_script: +# - *before_syntax_n_lint +# script: +# - echo "Running ansible-playbook --syntax-check tests at the role-> 'docker_containers'" +# - *run_syntax_check +# allow_failure: false +# ### +# ### STAGE-LINT-TESTS +# ### +# lint-test: +# stage: lint-tests +# image: $IMAGE_NAME_LINT +# variables: +# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_TEST +# before_script: +# - *before_syntax_n_lint +# script: +# - echo "Running ansible-lint tests at the role-> 'test'" +# - *run_lint +# allow_failure: false + +# lint-dependencies: +# stage: lint-tests +# image: $IMAGE_NAME_LINT +# variables: +# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DEPENDENCIES +# before_script: +# - *before_syntax_n_lint +# script: +# - echo "Running ansible-lint tests at the role-> 'dependencies'" +# - *run_lint +# allow_failure: false + +# lint-clone-repositories: +# stage: lint-tests +# image: $IMAGE_NAME_LINT +# variables: +# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_CLONE_REPOSITORIES +# before_script: +# - *before_syntax_n_lint +# script: +# - echo "Running ansible-lint tests at the role-> 'clone_repositories'" +# - *run_lint +# allow_failure: false + +# lint-docker-images: +# stage: lint-tests +# image: $IMAGE_NAME_LINT +# variables: +# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DOCKER_IMAGES +# before_script: +# - *before_syntax_n_lint +# script: +# - echo "Running ansible-lint tests at the role-> 'docker_images'" +# - *run_lint +# allow_failure: false + +# lint-docker-containers: +# stage: lint-tests +# image: $IMAGE_NAME_LINT +# variables: +# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DOCKER_CONTAINERS +# before_script: +# - *before_syntax_n_lint +# script: +# - echo "Running ansible-lint tests at the role-> 'docker_containers'" +# - *run_lint +# allow_failure: false + +# lint-oh-my-bash: +# stage: lint-tests +# image: $IMAGE_NAME_LINT +# variables: +# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_OH_MY_BASH +# before_script: +# - *before_syntax_n_lint +# script: +# - echo "Running ansible-lint tests at the role-> 'docker_containers'" +# - *run_lint +# allow_failure: false ### ### STAGE-MOLECULE --> At the moment, running DIND (docker in docker) at this instance is disable :( diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..bff688b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "roles/c3infodesk-deployment-role-test"] + path = roles/c3infodesk-deployment-role-test + url = git@git.cccv.de:fejao/c3infodesk-deployment-role-test.git diff --git a/ci-cd/01_test.yml b/ci-cd/playbooks/01_test.yml similarity index 100% rename from ci-cd/01_test.yml rename to ci-cd/playbooks/01_test.yml diff --git a/ci-cd/02_dependencies.yml b/ci-cd/playbooks/02_dependencies.yml similarity index 100% rename from ci-cd/02_dependencies.yml rename to ci-cd/playbooks/02_dependencies.yml diff --git a/ci-cd/03_clone_repositories.yml b/ci-cd/playbooks/03_clone_repositories.yml similarity index 100% rename from ci-cd/03_clone_repositories.yml rename to ci-cd/playbooks/03_clone_repositories.yml diff --git a/ci-cd/04_docker_images.yml b/ci-cd/playbooks/04_docker_images.yml similarity index 100% rename from ci-cd/04_docker_images.yml rename to ci-cd/playbooks/04_docker_images.yml diff --git a/ci-cd/05_docker_containers.yml b/ci-cd/playbooks/05_docker_containers.yml similarity index 100% rename from ci-cd/05_docker_containers.yml rename to ci-cd/playbooks/05_docker_containers.yml diff --git a/ci-cd/06_oh_my_bash.yml b/ci-cd/playbooks/06_oh_my_bash.yml similarity index 100% rename from ci-cd/06_oh_my_bash.yml rename to ci-cd/playbooks/06_oh_my_bash.yml diff --git a/roles/c3infodesk-deployment-role-test b/roles/c3infodesk-deployment-role-test new file mode 160000 index 0000000..ce19a15 --- /dev/null +++ b/roles/c3infodesk-deployment-role-test @@ -0,0 +1 @@ +Subproject commit ce19a154fc535322f1cff231cb827c89518fdd78 diff --git a/roles/test/README.md b/roles/test/README.md deleted file mode 100644 index f2cf0d1..0000000 --- a/roles/test/README.md +++ /dev/null @@ -1,61 +0,0 @@ -# test role -This is a ansible-role for testing your installed ansible. - - -## Requirements -To have ansible installed at your system. - - -## Role Variables -You should look around where the variables are setted. And figure it out from where the ouput comes - - -## Dependencies -This role have no dependency from any another role. - - -## Example Playbook -Here is an example for adding this role for your playbook for **restarting** the **c3infodesk-printer**. containers: - -```yaml -- hosts: - - example_servers_group - roles: - - test -``` - -And call the playbook as: - -```bash -ansible-playbook -i <INVENTORY> <PLAYBOOK_NAME>.yml -``` - -## Tests -Here are the tests made at **CI-CD** for this role. - -The tests shuold be runned at the root directory from the repository. - -### Syntax -```bash -ansible-playbook --syntax-check -i invenvories/hosts playbooks/examples/example_01_test.yml -``` - -### Lint -```bash -ansible-lint ci-cd/01_test.yml -``` - -### molecule -```bash -cd roles/test -molecule test -``` - -## License - -MIT/BSD - - -## Author Information - - [https://chaos.social/@fejao](https://chaos.social/@fejao) diff --git a/roles/test/defaults/main.yml b/roles/test/defaults/main.yml deleted file mode 100644 index 9c8dd30..0000000 --- a/roles/test/defaults/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -# defaults file for test - -var_setted_everywhere: "answer from roles/test/defaults/main.yml" -var_setted_only_defaults_main: "MESSAGE FROM roles/test/defaults/main.yml" diff --git a/roles/test/molecule/default/converge.yml b/roles/test/molecule/default/converge.yml deleted file mode 100644 index 9aa3642..0000000 --- a/roles/test/molecule/default/converge.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: MOLECULE | Converge - hosts: all - tasks: - - name: MOLECULE | CONVERGE | Call the 'test' role. - ansible.builtin.include_role: - name: test diff --git a/roles/test/molecule/default/molecule.yml b/roles/test/molecule/default/molecule.yml deleted file mode 100644 index 7b5a4dc..0000000 --- a/roles/test/molecule/default/molecule.yml +++ /dev/null @@ -1,66 +0,0 @@ ---- -dependency: - name: galaxy -driver: - name: docker -platforms: - - name: instance - image: geerlingguy/docker-ubuntu2004-ansible:latest - # privileged: true - pre_build_image: true -provisioner: - name: ansible - inventory: - ### - ### VARS used from the role - ### - group_vars: - example_servers_group: - var_setted_only_group_vars: "group_vars_value" - var_setted_everywhere: "group_vars_value" - host_vars: - instance: - var_setted_only_host_vars: "host_vars_value" - var_setted_everywhere: "host_vars_value" -lint: | - ansible-lint --exclude molecule/default/ -scenario: - name: default - create_sequence: - - dependency - - create - - prepare - check_sequence: - - dependency - - cleanup - - destroy - - create - - prepare - - converge - - check - - destroy - converge_sequence: - - dependency - - create - - prepare - - converge - destroy_sequence: - - dependency - - cleanup - - destroy - test_sequence: - # - lint - # - dependency - # - cleanup - - destroy - - syntax - - create - # - prepare - - converge - - verify - - idempotence - # - side_effect - # - cleanup - - destroy -verifier: - name: ansible diff --git a/roles/test/molecule/default/verify.yml b/roles/test/molecule/default/verify.yml deleted file mode 100644 index 5dd983f..0000000 --- a/roles/test/molecule/default/verify.yml +++ /dev/null @@ -1,59 +0,0 @@ ---- -- name: VERIFY | Test role for debugging variables - hosts: all - pre_tasks: - - name: MOLECULE | VERIFY | PRE-TASKS | Adding variables from -> ../../../../inventories/group_vars - ansible.builtin.include_vars: - dir: ../../../../inventories/group_vars - extensions: - - 'yml' - - - name: MOLECULE | VERIFY | PRE-TASKS | Adding variables from -> ../../../../inventories/host_vars - ansible.builtin.include_vars: - dir: ../../../../inventories/host_vars - extensions: - - 'yml' - - - name: MOLECULE | VERIFY | PRE-TASKS | Adding variables from -> ../../defaults - ansible.builtin.include_vars: - dir: ../../defaults - extensions: - - 'yml' - - - name: MOLECULE | VERIFY | PRE-TASKS | Adding variables from -> ../../vars - ansible.builtin.include_vars: - dir: ../../vars - extensions: - - 'yml' - - tasks: - - name: MOLECULE | VERIFY | Test parsed variable setted only at roles/test/defaults/main.yml - ansible.builtin.debug: - msg: "{{ var_setted_only_defaults_main }}" - - - name: MOLECULE | VERIFY | Test parsed variable setted only at roles/test/vars/main.yml - ansible.builtin.debug: - msg: "{{ var_setted_only_vars_main }}" - - - name: MOLECULE | VERIFY | Test parsed variable setted only at inventory/group_vars/example_servers_group.yml - ansible.builtin.debug: - msg: "{{ var_setted_only_group_vars }}" - when: var_setted_only_group_vars is defined - - - name: MOLECULE | VERIFY | Test parsed variable setted only at inventory/host_vars/example_server.yml - ansible.builtin.debug: - msg: "{{ var_setted_only_host_vars }}" - - - name: MOLECULE | VERIFY | Test parsed variable setted EVERYWHERE -> should come from roles/test/vars/main.yml - ansible.builtin.debug: - msg: "{{ var_setted_everywhere }}" - - - name: MOLECULE | VERIFY | List the root ('/') folder from the target to a register - ansible.builtin.command: - cmd: ls -hal / - register: ret_list_folder - changed_when: false - - - name: MOLECULE | VERIFY | Shows output from listing folder - ansible.builtin.debug: - msg: "{{ ret_list_folder }}" diff --git a/roles/test/tasks/main.yml b/roles/test/tasks/main.yml deleted file mode 100644 index 3e7e633..0000000 --- a/roles/test/tasks/main.yml +++ /dev/null @@ -1,33 +0,0 @@ ---- -# tasks file for test - -- name: Test parsed variable setted only at roles/test/defaults/main.yml - ansible.builtin.debug: - msg: "{{ var_setted_only_defaults_main }}" - -- name: Test parsed variable setted only at roles/test/vars/main.yml - ansible.builtin.debug: - msg: "{{ var_setted_only_vars_main }}" - -- name: Test parsed variable setted only at inventory/group_vars/example_servers_group.yml - ansible.builtin.debug: - msg: "{{ var_setted_only_group_vars }}" - when: var_setted_only_group_vars is defined - -- name: Test parsed variable setted only at inventory/host_vars/example_server.yml - ansible.builtin.debug: - msg: "{{ var_setted_only_host_vars }}" - -- name: Test parsed variable setted EVERYWHERE -> should come from roles/test/vars/main.yml - ansible.builtin.debug: - msg: "{{ var_setted_everywhere }}" - -- name: List the root ('/') folder from the target to a register - ansible.builtin.command: - cmd: ls -hal / - register: ret_list_folder - changed_when: false - -- name: Shows output from listing folder - ansible.builtin.debug: - msg: "{{ ret_list_folder }}" diff --git a/roles/test/vars/main.yml b/roles/test/vars/main.yml deleted file mode 100644 index 76a45cb..0000000 --- a/roles/test/vars/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -# vars file for test - -var_setted_everywhere: "MESSAGE EVERYWHERE FROM roles/test/vars/main.yml" -var_setted_only_vars_main: "MESSAGE FROM roles/test/vars/main.yml" -- GitLab From 4ee11deb6d2b168dab0e45bd6bd879914f7b5477 Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 12:55:40 +0100 Subject: [PATCH 02/28] setting ci-cd --- .gitlab-ci.yml | 38 +++++++++++-------- .../requirements_syntax_n_lint.txt | 8 ++++ ci-cd/requirements.txt | 3 -- 3 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 ci-cd/python_requirements/requirements_syntax_n_lint.txt delete mode 100644 ci-cd/requirements.txt diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e201c7d..aba805c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,8 @@ variables: # IMAGE_NAME_MOLECULE: geerlingguy/docker-ubuntu2204-ansible:latest IMAGE_NAME_MOLECULE: docker:dind INVENTORIES_PATH: "inventories/hosts" + PATH_PLAYBOOK_FOR_ROLE_TEST: "ci-cd/playbooks/01_test.yml" + #### PLAYBOOK_PATH_FOR_ROLE_TEST: "ci-cd/01_test.yml" PLAYBOOK_PATH_FOR_ROLE_DEPENDENCIES: "ci-cd/02_dependencies.yml" PLAYBOOK_PATH_FOR_ROLE_CLONE_REPOSITORIES: "ci-cd/03_clone_repositories.yml" @@ -32,33 +34,37 @@ stages: ### .before_syntax_n_lint: &before_syntax_n_lint - apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/* - - pip3 install -r ci-cd/requirements.txt + # - pip3 install -r ci-cd/requirements.txt + - pip3 install -r ci-cd/python_requirements/requirements_syntax_n_lint.txt ### Correct the permissions on the build environment directory. ### See https://github.com/ansible/ansible/pull/42142/files - chmod 700 /builds/fejao/c3infodesk-deployment .run_syntax_check: &run_syntax_check - - ansible-playbook --syntax-check -i $INVENTORIES_PATH $ROLE_PATH + # - ansible-playbook --syntax-check -i $INVENTORIES_PATH $ROLE_PATH + - ansible-playbook --syntax-check -i $INVENTORIES_PATH $PLAYBOOK_PATH .run_lint: &run_lint - - ansible-lint $ROLE_PATH + # - ansible-lint $ROLE_PATH + - ansible-lint $PLAYBOOK_PATH ### ### STAGE-SYNTAX-CHECK ### -# syntax-test: -# stage: syntax-check -# image: $IMAGE_NAME_SYNTAX -# variables: -# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_TEST -# before_script: -# - *before_syntax_n_lint -# script: -# - echo "Running ansible-playbook --syntax-check tests at the role-> 'test'" -# - *run_syntax_check -# only: -# changes: -# - roles/test +syntax-test: + stage: syntax-check + image: $IMAGE_NAME_SYNTAX + variables: + # ROLE_PATH: $PATH_PLAYBOOK_FOR_ROLE_TEST + PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_TEST + before_script: + - *before_syntax_n_lint + script: + - echo "Running ansible-playbook --syntax-check tests at the role-> 'test'" + - *run_syntax_check + # only: + # changes: + # - roles/test # syntax-dependencies: # stage: syntax-check diff --git a/ci-cd/python_requirements/requirements_syntax_n_lint.txt b/ci-cd/python_requirements/requirements_syntax_n_lint.txt new file mode 100644 index 0000000..ca7d738 --- /dev/null +++ b/ci-cd/python_requirements/requirements_syntax_n_lint.txt @@ -0,0 +1,8 @@ +yamllint +ansible +ansible-dev-tools +ansible-lint +### MOLECULE +# python3 -m pip install --user "molecule-plugins[docker]" +# molecule +# ansible-core diff --git a/ci-cd/requirements.txt b/ci-cd/requirements.txt deleted file mode 100644 index a42d9c6..0000000 --- a/ci-cd/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -ansible -ansible-dev-tools -ansible-lint -- GitLab From 2009daf1649d4a42ab411bf3710b8d28c8093945 Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 12:57:49 +0100 Subject: [PATCH 03/28] setting ci-cd --- ci-cd/playbooks/01_test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci-cd/playbooks/01_test.yml b/ci-cd/playbooks/01_test.yml index eb8a83f..dc44087 100644 --- a/ci-cd/playbooks/01_test.yml +++ b/ci-cd/playbooks/01_test.yml @@ -5,4 +5,5 @@ hosts: - example_servers_group roles: - - roles/test + # - roles/test + - roles/c3infodesk-deployment-role-test -- GitLab From 2d8974f84f73a7695043d9088f7121e59d3e0b4e Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 13:06:21 +0100 Subject: [PATCH 04/28] setting ci-cd --- .gitlab-ci.yml | 57 +++++++++++++++++--------------- ci-cd/templates/syntax-check.yml | 50 ++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 27 deletions(-) create mode 100644 ci-cd/templates/syntax-check.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aba805c..ae5ba8f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,42 +29,45 @@ stages: - lint-tests - molecule +include: + - local: ci-cd/templates/syntax-check.yml + ### ### SCRIPTS ### -.before_syntax_n_lint: &before_syntax_n_lint - - apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/* - # - pip3 install -r ci-cd/requirements.txt - - pip3 install -r ci-cd/python_requirements/requirements_syntax_n_lint.txt - ### Correct the permissions on the build environment directory. - ### See https://github.com/ansible/ansible/pull/42142/files - - chmod 700 /builds/fejao/c3infodesk-deployment +# .before_syntax_n_lint: &before_syntax_n_lint +# - apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/* +# # - pip3 install -r ci-cd/requirements.txt +# - pip3 install -r ci-cd/python_requirements/requirements_syntax_n_lint.txt +# ### Correct the permissions on the build environment directory. +# ### See https://github.com/ansible/ansible/pull/42142/files +# - chmod 700 /builds/fejao/c3infodesk-deployment -.run_syntax_check: &run_syntax_check - # - ansible-playbook --syntax-check -i $INVENTORIES_PATH $ROLE_PATH - - ansible-playbook --syntax-check -i $INVENTORIES_PATH $PLAYBOOK_PATH +# .run_syntax_check: &run_syntax_check +# # - ansible-playbook --syntax-check -i $INVENTORIES_PATH $ROLE_PATH +# - ansible-playbook --syntax-check -i $INVENTORIES_PATH $PLAYBOOK_PATH -.run_lint: &run_lint - # - ansible-lint $ROLE_PATH - - ansible-lint $PLAYBOOK_PATH +# .run_lint: &run_lint +# # - ansible-lint $ROLE_PATH +# - ansible-lint $PLAYBOOK_PATH ### ### STAGE-SYNTAX-CHECK ### -syntax-test: - stage: syntax-check - image: $IMAGE_NAME_SYNTAX - variables: - # ROLE_PATH: $PATH_PLAYBOOK_FOR_ROLE_TEST - PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_TEST - before_script: - - *before_syntax_n_lint - script: - - echo "Running ansible-playbook --syntax-check tests at the role-> 'test'" - - *run_syntax_check - # only: - # changes: - # - roles/test +# syntax-test: +# stage: syntax-check +# image: $IMAGE_NAME_SYNTAX +# variables: +# # ROLE_PATH: $PATH_PLAYBOOK_FOR_ROLE_TEST +# PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_TEST +# before_script: +# - *before_syntax_n_lint +# script: +# - echo "Running ansible-playbook --syntax-check tests at the role-> 'test'" +# - *run_syntax_check +# # only: +# # changes: +# # - roles/test # syntax-dependencies: # stage: syntax-check diff --git a/ci-cd/templates/syntax-check.yml b/ci-cd/templates/syntax-check.yml new file mode 100644 index 0000000..fad5bb7 --- /dev/null +++ b/ci-cd/templates/syntax-check.yml @@ -0,0 +1,50 @@ +--- + +### +### VARIABLES +### +variables: + AUTHOR: fejao + IMAGE_NAME_SYNTAX: python:3.10.15-bullseye + # IMAGE_NAME_LINT: python:3.10.15-bullseye + # IMAGE_NAME_MOLECULE: geerlingguy/docker-ubuntu2204-ansible:latest + IMAGE_NAME_MOLECULE: docker:dind + INVENTORIES_PATH: "inventories/hosts" + PATH_PLAYBOOK_FOR_ROLE_TEST: "ci-cd/playbooks/01_test.yml" + +### +### SCRIPTS +### +.before_syntax_n_lint: &before_syntax_n_lint + - apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/* + # - pip3 install -r ci-cd/requirements.txt + - pip3 install -r ci-cd/python_requirements/requirements_syntax_n_lint.txt + ### Correct the permissions on the build environment directory. + ### See https://github.com/ansible/ansible/pull/42142/files + - chmod 700 /builds/fejao/c3infodesk-deployment + +.run_syntax_check: &run_syntax_check + # - ansible-playbook --syntax-check -i $INVENTORIES_PATH $ROLE_PATH + - ansible-playbook --syntax-check -i $INVENTORIES_PATH $PLAYBOOK_PATH + +.run_lint: &run_lint + # - ansible-lint $ROLE_PATH + - ansible-lint $PLAYBOOK_PATH + +### +### STAGE-SYNTAX-CHECK +### +syntax-test: + stage: syntax-check + image: $IMAGE_NAME_SYNTAX + variables: + # ROLE_PATH: $PATH_PLAYBOOK_FOR_ROLE_TEST + PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_TEST + before_script: + - *before_syntax_n_lint + script: + - echo "Running ansible-playbook --syntax-check tests at the role-> 'test'" + - *run_syntax_check + # only: + # changes: + # - roles/test \ No newline at end of file -- GitLab From 5ce9a8d90f5b1e8959605b0592b5a080f0f5ed29 Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 13:11:54 +0100 Subject: [PATCH 05/28] setting ci-cd --- ci-cd/templates/syntax-check.yml | 65 ++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 3 deletions(-) diff --git a/ci-cd/templates/syntax-check.yml b/ci-cd/templates/syntax-check.yml index fad5bb7..96bc538 100644 --- a/ci-cd/templates/syntax-check.yml +++ b/ci-cd/templates/syntax-check.yml @@ -8,9 +8,9 @@ variables: IMAGE_NAME_SYNTAX: python:3.10.15-bullseye # IMAGE_NAME_LINT: python:3.10.15-bullseye # IMAGE_NAME_MOLECULE: geerlingguy/docker-ubuntu2204-ansible:latest - IMAGE_NAME_MOLECULE: docker:dind INVENTORIES_PATH: "inventories/hosts" PATH_PLAYBOOK_FOR_ROLE_TEST: "ci-cd/playbooks/01_test.yml" + PATH_PLAYBOOK_FOR_ROLE_DEPENDENCIES: "ci-cd/playbooks/02_dependencies.yml" ### ### SCRIPTS @@ -38,7 +38,6 @@ syntax-test: stage: syntax-check image: $IMAGE_NAME_SYNTAX variables: - # ROLE_PATH: $PATH_PLAYBOOK_FOR_ROLE_TEST PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_TEST before_script: - *before_syntax_n_lint @@ -47,4 +46,64 @@ syntax-test: - *run_syntax_check # only: # changes: - # - roles/test \ No newline at end of file + # - roles/test + +syntax-dependencies: + stage: syntax-check + image: $IMAGE_NAME_SYNTAX + variables: + PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_DEPENDENCIES + before_script: + - *before_syntax_n_lint + script: + - echo "Running ansible-playbook --syntax-check tests at the role-> 'dependencies'" + - *run_syntax_check + allow_failure: false + +# syntax-clone-repositories: +# stage: syntax-check +# image: $IMAGE_NAME_SYNTAX +# variables: +# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_CLONE_REPOSITORIES +# before_script: +# - *before_syntax_n_lint +# script: +# - echo "Running ansible-playbook --syntax-check tests at the role-> 'clone_repositories'" +# - *run_syntax_check +# allow_failure: false + +# syntax-docker-images: +# stage: syntax-check +# image: $IMAGE_NAME_SYNTAX +# variables: +# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DOCKER_IMAGES +# before_script: +# - *before_syntax_n_lint +# script: +# - echo "Running ansible-playbook --syntax-check tests at the role-> 'docker_images'" +# - *run_syntax_check +# allow_failure: false + +# syntax-docker-containers: +# stage: syntax-check +# image: $IMAGE_NAME_SYNTAX +# variables: +# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DOCKER_CONTAINERS +# before_script: +# - *before_syntax_n_lint +# script: +# - echo "Running ansible-playbook --syntax-check tests at the role-> 'docker_containers'" +# - *run_syntax_check +# allow_failure: false + +# syntax-oh-my-bash: +# stage: syntax-check +# image: $IMAGE_NAME_SYNTAX +# variables: +# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_OH_MY_BASH +# before_script: +# - *before_syntax_n_lint +# script: +# - echo "Running ansible-playbook --syntax-check tests at the role-> 'docker_containers'" +# - *run_syntax_check +# allow_failure: false -- GitLab From c14041f76af99ebdf36b1888f5467e9d46328a7c Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 13:24:45 +0100 Subject: [PATCH 06/28] setting ci-cd --- .gitlab-ci.yml | 3 ++ ci-cd/scripts/syntax_n_lint.yml | 27 +++++++++++++++ ci-cd/templates/syntax-check.yml | 56 ++++++++++++++++++-------------- 3 files changed, 61 insertions(+), 25 deletions(-) create mode 100644 ci-cd/scripts/syntax_n_lint.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae5ba8f..2ceb0bb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,6 +29,9 @@ stages: - lint-tests - molecule +### +### TEMPLATES +### include: - local: ci-cd/templates/syntax-check.yml diff --git a/ci-cd/scripts/syntax_n_lint.yml b/ci-cd/scripts/syntax_n_lint.yml new file mode 100644 index 0000000..07a11d3 --- /dev/null +++ b/ci-cd/scripts/syntax_n_lint.yml @@ -0,0 +1,27 @@ +--- + +variables: + # INVENTORIES_PATH: "/builds/c3infodesk/printer/deployment/inventories/hosts" + INVENTORIES_PATH: "inventories/hosts" + + +.before_script_syntax_n_lint_before: + before_script: + - echo "Running before_script for 'before_script_syntax_n_lint_before'" + - pwd + - ls -la + ### + # - apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/* + # - pip3 install -r /builds/c3infodesk/printer/deployment/ci-cd/python_requeriments/requirements_syntax_n_lint.txt + # # ### Correct the permissions on the build environment directory. + # # ### See https://github.com/ansible/ansible/pull/42142/files + # - chmod 700 /builds/c3infodesk/printer/deployment + +# .before_script_syntax_n_lint_before: +# before_script: +# - echo "Running before_script for 'before_script_syntax_n_lint_before'" +# - apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/* +# - pip3 install -r /builds/c3infodesk/printer/deployment/ci-cd/python_requeriments/requirements_syntax_n_lint.txt +# # ### Correct the permissions on the build environment directory. +# # ### See https://github.com/ansible/ansible/pull/42142/files +# - chmod 700 /builds/c3infodesk/printer/deployment diff --git a/ci-cd/templates/syntax-check.yml b/ci-cd/templates/syntax-check.yml index 96bc538..6c793cc 100644 --- a/ci-cd/templates/syntax-check.yml +++ b/ci-cd/templates/syntax-check.yml @@ -12,24 +12,30 @@ variables: PATH_PLAYBOOK_FOR_ROLE_TEST: "ci-cd/playbooks/01_test.yml" PATH_PLAYBOOK_FOR_ROLE_DEPENDENCIES: "ci-cd/playbooks/02_dependencies.yml" +### +### INCLUDE +### +include: + - local: /ci-cd/scripts/syntax_n_lint.yml + ### ### SCRIPTS ### -.before_syntax_n_lint: &before_syntax_n_lint - - apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/* - # - pip3 install -r ci-cd/requirements.txt - - pip3 install -r ci-cd/python_requirements/requirements_syntax_n_lint.txt - ### Correct the permissions on the build environment directory. - ### See https://github.com/ansible/ansible/pull/42142/files - - chmod 700 /builds/fejao/c3infodesk-deployment +# .before_syntax_n_lint: &before_syntax_n_lint +# - apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/* +# # - pip3 install -r ci-cd/requirements.txt +# - pip3 install -r ci-cd/python_requirements/requirements_syntax_n_lint.txt +# ### Correct the permissions on the build environment directory. +# ### See https://github.com/ansible/ansible/pull/42142/files +# - chmod 700 /builds/fejao/c3infodesk-deployment -.run_syntax_check: &run_syntax_check - # - ansible-playbook --syntax-check -i $INVENTORIES_PATH $ROLE_PATH - - ansible-playbook --syntax-check -i $INVENTORIES_PATH $PLAYBOOK_PATH +# .run_syntax_check: &run_syntax_check +# # - ansible-playbook --syntax-check -i $INVENTORIES_PATH $ROLE_PATH +# - ansible-playbook --syntax-check -i $INVENTORIES_PATH $PLAYBOOK_PATH -.run_lint: &run_lint - # - ansible-lint $ROLE_PATH - - ansible-lint $PLAYBOOK_PATH +# .run_lint: &run_lint +# # - ansible-lint $ROLE_PATH +# - ansible-lint $PLAYBOOK_PATH ### ### STAGE-SYNTAX-CHECK @@ -43,22 +49,22 @@ syntax-test: - *before_syntax_n_lint script: - echo "Running ansible-playbook --syntax-check tests at the role-> 'test'" - - *run_syntax_check + # - *run_syntax_check # only: # changes: # - roles/test -syntax-dependencies: - stage: syntax-check - image: $IMAGE_NAME_SYNTAX - variables: - PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_DEPENDENCIES - before_script: - - *before_syntax_n_lint - script: - - echo "Running ansible-playbook --syntax-check tests at the role-> 'dependencies'" - - *run_syntax_check - allow_failure: false +# syntax-dependencies: +# stage: syntax-check +# image: $IMAGE_NAME_SYNTAX +# variables: +# PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_DEPENDENCIES +# before_script: +# - *before_syntax_n_lint +# script: +# - echo "Running ansible-playbook --syntax-check tests at the role-> 'dependencies'" +# - *run_syntax_check +# allow_failure: false # syntax-clone-repositories: # stage: syntax-check -- GitLab From 329bb2f29dd39d4e3d78e11cdfe8b07dbd5ee61c Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 13:28:18 +0100 Subject: [PATCH 07/28] setting ci-cd --- ci-cd/scripts/syntax_n_lint.yml | 2 +- ci-cd/templates/syntax-check.yml | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ci-cd/scripts/syntax_n_lint.yml b/ci-cd/scripts/syntax_n_lint.yml index 07a11d3..7d5f930 100644 --- a/ci-cd/scripts/syntax_n_lint.yml +++ b/ci-cd/scripts/syntax_n_lint.yml @@ -5,7 +5,7 @@ variables: INVENTORIES_PATH: "inventories/hosts" -.before_script_syntax_n_lint_before: +.before_script_syntax_n_lint: before_script: - echo "Running before_script for 'before_script_syntax_n_lint_before'" - pwd diff --git a/ci-cd/templates/syntax-check.yml b/ci-cd/templates/syntax-check.yml index 6c793cc..d5789f9 100644 --- a/ci-cd/templates/syntax-check.yml +++ b/ci-cd/templates/syntax-check.yml @@ -45,11 +45,12 @@ syntax-test: image: $IMAGE_NAME_SYNTAX variables: PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_TEST - before_script: - - *before_syntax_n_lint - script: - - echo "Running ansible-playbook --syntax-check tests at the role-> 'test'" - # - *run_syntax_check + extends: .before_script_syntax_n_lint + # before_script: + # - *before_syntax_n_lint + # script: + # - echo "Running ansible-playbook --syntax-check tests at the role-> 'test'" + # # - *run_syntax_check # only: # changes: # - roles/test -- GitLab From 3264372819d58ab3a58af2c5f548fe4001834e13 Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 13:30:30 +0100 Subject: [PATCH 08/28] setting ci-cd --- ci-cd/scripts/syntax_n_lint.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/ci-cd/scripts/syntax_n_lint.yml b/ci-cd/scripts/syntax_n_lint.yml index 7d5f930..3fbd3e5 100644 --- a/ci-cd/scripts/syntax_n_lint.yml +++ b/ci-cd/scripts/syntax_n_lint.yml @@ -7,7 +7,7 @@ variables: .before_script_syntax_n_lint: before_script: - - echo "Running before_script for 'before_script_syntax_n_lint_before'" + - echo "Running before_script for 'before_script_syntax_n_lint'" - pwd - ls -la ### @@ -17,11 +17,8 @@ variables: # # ### See https://github.com/ansible/ansible/pull/42142/files # - chmod 700 /builds/c3infodesk/printer/deployment -# .before_script_syntax_n_lint_before: -# before_script: -# - echo "Running before_script for 'before_script_syntax_n_lint_before'" -# - apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/* -# - pip3 install -r /builds/c3infodesk/printer/deployment/ci-cd/python_requeriments/requirements_syntax_n_lint.txt -# # ### Correct the permissions on the build environment directory. -# # ### See https://github.com/ansible/ansible/pull/42142/files -# - chmod 700 /builds/c3infodesk/printer/deployment +.script_syntax_check_main: + extends: .before_script_syntax_n_lint + script: + - echo "Running script for 'script_syntax_check_main'" + # - ansible-playbook --syntax-check -i $INVENTORIES_PATH $ROLE_PATH -- GitLab From 9b9887225f76fe6e59c5ad7ac736f99c3120a940 Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 13:32:16 +0100 Subject: [PATCH 09/28] setting ci-cd --- ci-cd/templates/syntax-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-cd/templates/syntax-check.yml b/ci-cd/templates/syntax-check.yml index d5789f9..4ece3a7 100644 --- a/ci-cd/templates/syntax-check.yml +++ b/ci-cd/templates/syntax-check.yml @@ -43,9 +43,9 @@ include: syntax-test: stage: syntax-check image: $IMAGE_NAME_SYNTAX + extends: .script_syntax_check_main variables: PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_TEST - extends: .before_script_syntax_n_lint # before_script: # - *before_syntax_n_lint # script: -- GitLab From fb7c8469dc20ce9074f564d59a4e40cd1b73e395 Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 13:39:05 +0100 Subject: [PATCH 10/28] setting ci-cd --- ci-cd/scripts/syntax_n_lint.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ci-cd/scripts/syntax_n_lint.yml b/ci-cd/scripts/syntax_n_lint.yml index 3fbd3e5..f1bf45a 100644 --- a/ci-cd/scripts/syntax_n_lint.yml +++ b/ci-cd/scripts/syntax_n_lint.yml @@ -3,6 +3,9 @@ variables: # INVENTORIES_PATH: "/builds/c3infodesk/printer/deployment/inventories/hosts" INVENTORIES_PATH: "inventories/hosts" + # REQUIREMENTS_PATH: "/builds/fejao/c3infodesk-deployment/ci-cd/python_requeriments/requirements_syntax_n_lint.txt" + REQUIREMENTS_PATH: "ci-cd/python_requeriments/requirements_syntax_n_lint.txt" + ENV_DIR_PATH: "/builds/fejao/c3infodesk-deployment" .before_script_syntax_n_lint: @@ -11,8 +14,9 @@ variables: - pwd - ls -la ### - # - apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/* + - apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/* # - pip3 install -r /builds/c3infodesk/printer/deployment/ci-cd/python_requeriments/requirements_syntax_n_lint.txt + - pip3 install -r $REQUIREMENTS_PATH # # ### Correct the permissions on the build environment directory. # # ### See https://github.com/ansible/ansible/pull/42142/files # - chmod 700 /builds/c3infodesk/printer/deployment -- GitLab From 2bfbf73bf3ad5f5da334716e10756741abaacc95 Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 13:41:30 +0100 Subject: [PATCH 11/28] setting ci-cd --- ci-cd/scripts/syntax_n_lint.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ci-cd/scripts/syntax_n_lint.yml b/ci-cd/scripts/syntax_n_lint.yml index f1bf45a..23f8328 100644 --- a/ci-cd/scripts/syntax_n_lint.yml +++ b/ci-cd/scripts/syntax_n_lint.yml @@ -13,10 +13,13 @@ variables: - echo "Running before_script for 'before_script_syntax_n_lint'" - pwd - ls -la + - ls -la ci-cd + - ls -la ci-cd/python_requirements ### - apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/* # - pip3 install -r /builds/c3infodesk/printer/deployment/ci-cd/python_requeriments/requirements_syntax_n_lint.txt - - pip3 install -r $REQUIREMENTS_PATH + # - pip3 install -r $REQUIREMENTS_PATH + - echo "pip3 install -r $REQUIREMENTS_PATH" # # ### Correct the permissions on the build environment directory. # # ### See https://github.com/ansible/ansible/pull/42142/files # - chmod 700 /builds/c3infodesk/printer/deployment -- GitLab From 67beab41e13ef7a42334f0b9672b92cd93288796 Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 13:43:41 +0100 Subject: [PATCH 12/28] setting ci-cd --- ci-cd/scripts/syntax_n_lint.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci-cd/scripts/syntax_n_lint.yml b/ci-cd/scripts/syntax_n_lint.yml index 23f8328..822b7c2 100644 --- a/ci-cd/scripts/syntax_n_lint.yml +++ b/ci-cd/scripts/syntax_n_lint.yml @@ -4,7 +4,7 @@ variables: # INVENTORIES_PATH: "/builds/c3infodesk/printer/deployment/inventories/hosts" INVENTORIES_PATH: "inventories/hosts" # REQUIREMENTS_PATH: "/builds/fejao/c3infodesk-deployment/ci-cd/python_requeriments/requirements_syntax_n_lint.txt" - REQUIREMENTS_PATH: "ci-cd/python_requeriments/requirements_syntax_n_lint.txt" + REQUIREMENTS_PATH: "ci-cd/python_requirements/requirements_syntax_n_lint.txt" ENV_DIR_PATH: "/builds/fejao/c3infodesk-deployment" @@ -18,8 +18,9 @@ variables: ### - apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/* # - pip3 install -r /builds/c3infodesk/printer/deployment/ci-cd/python_requeriments/requirements_syntax_n_lint.txt - # - pip3 install -r $REQUIREMENTS_PATH - echo "pip3 install -r $REQUIREMENTS_PATH" + - pip3 install -r $REQUIREMENTS_PATH + ########### # # ### Correct the permissions on the build environment directory. # # ### See https://github.com/ansible/ansible/pull/42142/files # - chmod 700 /builds/c3infodesk/printer/deployment -- GitLab From abd33bd52d8247250eaa29933e66edde4b0687aa Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 13:46:41 +0100 Subject: [PATCH 13/28] setting ci-cd --- ci-cd/scripts/syntax_n_lint.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/ci-cd/scripts/syntax_n_lint.yml b/ci-cd/scripts/syntax_n_lint.yml index 822b7c2..346ead4 100644 --- a/ci-cd/scripts/syntax_n_lint.yml +++ b/ci-cd/scripts/syntax_n_lint.yml @@ -11,22 +11,17 @@ variables: .before_script_syntax_n_lint: before_script: - echo "Running before_script for 'before_script_syntax_n_lint'" - - pwd - - ls -la - - ls -la ci-cd - - ls -la ci-cd/python_requirements - ### - apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/* - # - pip3 install -r /builds/c3infodesk/printer/deployment/ci-cd/python_requeriments/requirements_syntax_n_lint.txt - - echo "pip3 install -r $REQUIREMENTS_PATH" - pip3 install -r $REQUIREMENTS_PATH ########### - # # ### Correct the permissions on the build environment directory. - # # ### See https://github.com/ansible/ansible/pull/42142/files + # ### Correct the permissions on the build environment directory. + # ### See https://github.com/ansible/ansible/pull/42142/files # - chmod 700 /builds/c3infodesk/printer/deployment + - chmod 700 $ENV_DIR_PATH .script_syntax_check_main: extends: .before_script_syntax_n_lint script: - echo "Running script for 'script_syntax_check_main'" # - ansible-playbook --syntax-check -i $INVENTORIES_PATH $ROLE_PATH + - ansible-playbook --syntax-check -i $INVENTORIES_PATH $PLAYBOOK_PATH -- GitLab From 9fb82bcd01af34e544c2d5b870d9a0b0611caabf Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 13:51:40 +0100 Subject: [PATCH 14/28] setting ci-cd --- ci-cd/scripts/syntax_n_lint.yml | 13 ++++++++----- ci-cd/templates/syntax-check.yml | 4 +--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ci-cd/scripts/syntax_n_lint.yml b/ci-cd/scripts/syntax_n_lint.yml index 346ead4..f19802a 100644 --- a/ci-cd/scripts/syntax_n_lint.yml +++ b/ci-cd/scripts/syntax_n_lint.yml @@ -1,13 +1,13 @@ --- variables: - # INVENTORIES_PATH: "/builds/c3infodesk/printer/deployment/inventories/hosts" INVENTORIES_PATH: "inventories/hosts" - # REQUIREMENTS_PATH: "/builds/fejao/c3infodesk-deployment/ci-cd/python_requeriments/requirements_syntax_n_lint.txt" REQUIREMENTS_PATH: "ci-cd/python_requirements/requirements_syntax_n_lint.txt" ENV_DIR_PATH: "/builds/fejao/c3infodesk-deployment" - +### +### SCRIPTS +### .before_script_syntax_n_lint: before_script: - echo "Running before_script for 'before_script_syntax_n_lint'" @@ -16,12 +16,15 @@ variables: ########### # ### Correct the permissions on the build environment directory. # ### See https://github.com/ansible/ansible/pull/42142/files - # - chmod 700 /builds/c3infodesk/printer/deployment - chmod 700 $ENV_DIR_PATH .script_syntax_check_main: extends: .before_script_syntax_n_lint script: - echo "Running script for 'script_syntax_check_main'" - # - ansible-playbook --syntax-check -i $INVENTORIES_PATH $ROLE_PATH - ansible-playbook --syntax-check -i $INVENTORIES_PATH $PLAYBOOK_PATH + +.run_lint: + extends: .before_script_syntax_n_lint + script: + - ansible-lint $PLAYBOOK_PATH diff --git a/ci-cd/templates/syntax-check.yml b/ci-cd/templates/syntax-check.yml index 4ece3a7..b730908 100644 --- a/ci-cd/templates/syntax-check.yml +++ b/ci-cd/templates/syntax-check.yml @@ -6,9 +6,7 @@ variables: AUTHOR: fejao IMAGE_NAME_SYNTAX: python:3.10.15-bullseye - # IMAGE_NAME_LINT: python:3.10.15-bullseye - # IMAGE_NAME_MOLECULE: geerlingguy/docker-ubuntu2204-ansible:latest - INVENTORIES_PATH: "inventories/hosts" + # INVENTORIES_PATH: "inventories/hosts" PATH_PLAYBOOK_FOR_ROLE_TEST: "ci-cd/playbooks/01_test.yml" PATH_PLAYBOOK_FOR_ROLE_DEPENDENCIES: "ci-cd/playbooks/02_dependencies.yml" -- GitLab From ab90ad1ece9d28f7d3415f74472a061095b9a269 Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 14:02:26 +0100 Subject: [PATCH 15/28] setting ci-cd --- .gitlab-ci.yml | 5 +- ci-cd/templates/lint-tests.yml | 50 +++++++++++++++++++ .../{syntax-check.yml => syntax-checks.yml} | 41 +++------------ 3 files changed, 61 insertions(+), 35 deletions(-) create mode 100644 ci-cd/templates/lint-tests.yml rename ci-cd/templates/{syntax-check.yml => syntax-checks.yml} (64%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2ceb0bb..663c6c1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,7 @@ variables: ### STAGES ### stages: - - syntax-check + - syntax-checks - lint-tests - molecule @@ -33,7 +33,8 @@ stages: ### TEMPLATES ### include: - - local: ci-cd/templates/syntax-check.yml + - local: ci-cd/templates/syntax-checks.yml + - local: ci-cd/templates/lint-tests.yml ### ### SCRIPTS diff --git a/ci-cd/templates/lint-tests.yml b/ci-cd/templates/lint-tests.yml new file mode 100644 index 0000000..e428d6c --- /dev/null +++ b/ci-cd/templates/lint-tests.yml @@ -0,0 +1,50 @@ +--- + +### +### VARIABLES +### +variables: + AUTHOR: fejao + # IMAGE_NAME_LINT: python:3.10.15-bullseye + PATH_PLAYBOOK_FOR_ROLE_TEST: "ci-cd/playbooks/01_test.yml" + PATH_PLAYBOOK_FOR_ROLE_DEPENDENCIES: "ci-cd/playbooks/02_dependencies.yml" + +### +### INCLUDE +### +include: + - local: /ci-cd/scripts/syntax_n_lint.yml + +syntax-test: + stage: syntax-checks + image: $IMAGE_NAME_SYNTAX + extends: .script_syntax_check_main + variables: + PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_TEST + # only: + # changes: + # - roles/test + +### +### STAGE-LINT-TESTS +### +lint-test: + stage: lint-tests + image: $IMAGE_NAME_LINT + variables: + PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_TEST + # only: + # changes: + # - roles/test + +# lint-dependencies: +# stage: lint-tests +# image: $IMAGE_NAME_LINT +# variables: +# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DEPENDENCIES +# before_script: +# - *before_syntax_n_lint +# script: +# - echo "Running ansible-lint tests at the role-> 'dependencies'" +# - *run_lint +# allow_failure: false diff --git a/ci-cd/templates/syntax-check.yml b/ci-cd/templates/syntax-checks.yml similarity index 64% rename from ci-cd/templates/syntax-check.yml rename to ci-cd/templates/syntax-checks.yml index b730908..e6c8d84 100644 --- a/ci-cd/templates/syntax-check.yml +++ b/ci-cd/templates/syntax-checks.yml @@ -5,8 +5,7 @@ ### variables: AUTHOR: fejao - IMAGE_NAME_SYNTAX: python:3.10.15-bullseye - # INVENTORIES_PATH: "inventories/hosts" + # IMAGE_NAME_SYNTAX: python:3.10.15-bullseye PATH_PLAYBOOK_FOR_ROLE_TEST: "ci-cd/playbooks/01_test.yml" PATH_PLAYBOOK_FOR_ROLE_DEPENDENCIES: "ci-cd/playbooks/02_dependencies.yml" @@ -17,44 +16,20 @@ include: - local: /ci-cd/scripts/syntax_n_lint.yml ### -### SCRIPTS -### -# .before_syntax_n_lint: &before_syntax_n_lint -# - apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/* -# # - pip3 install -r ci-cd/requirements.txt -# - pip3 install -r ci-cd/python_requirements/requirements_syntax_n_lint.txt -# ### Correct the permissions on the build environment directory. -# ### See https://github.com/ansible/ansible/pull/42142/files -# - chmod 700 /builds/fejao/c3infodesk-deployment - -# .run_syntax_check: &run_syntax_check -# # - ansible-playbook --syntax-check -i $INVENTORIES_PATH $ROLE_PATH -# - ansible-playbook --syntax-check -i $INVENTORIES_PATH $PLAYBOOK_PATH - -# .run_lint: &run_lint -# # - ansible-lint $ROLE_PATH -# - ansible-lint $PLAYBOOK_PATH - -### -### STAGE-SYNTAX-CHECK +### STAGE-SYNTAX-CHECKS ### syntax-test: - stage: syntax-check + stage: syntax-checks image: $IMAGE_NAME_SYNTAX extends: .script_syntax_check_main variables: PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_TEST - # before_script: - # - *before_syntax_n_lint - # script: - # - echo "Running ansible-playbook --syntax-check tests at the role-> 'test'" - # # - *run_syntax_check # only: # changes: # - roles/test # syntax-dependencies: -# stage: syntax-check +# stage: syntax-checks # image: $IMAGE_NAME_SYNTAX # variables: # PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_DEPENDENCIES @@ -66,7 +41,7 @@ syntax-test: # allow_failure: false # syntax-clone-repositories: -# stage: syntax-check +# stage: syntax-checks # image: $IMAGE_NAME_SYNTAX # variables: # ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_CLONE_REPOSITORIES @@ -78,7 +53,7 @@ syntax-test: # allow_failure: false # syntax-docker-images: -# stage: syntax-check +# stage: syntax-checks # image: $IMAGE_NAME_SYNTAX # variables: # ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DOCKER_IMAGES @@ -90,7 +65,7 @@ syntax-test: # allow_failure: false # syntax-docker-containers: -# stage: syntax-check +# stage: syntax-checks # image: $IMAGE_NAME_SYNTAX # variables: # ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DOCKER_CONTAINERS @@ -102,7 +77,7 @@ syntax-test: # allow_failure: false # syntax-oh-my-bash: -# stage: syntax-check +# stage: syntax-checks # image: $IMAGE_NAME_SYNTAX # variables: # ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_OH_MY_BASH -- GitLab From 28bf3c06e8338e3efc2c2cab829da6048758704f Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 14:03:33 +0100 Subject: [PATCH 16/28] setting ci-cd --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 663c6c1..3bdc038 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,7 +34,7 @@ stages: ### include: - local: ci-cd/templates/syntax-checks.yml - - local: ci-cd/templates/lint-tests.yml + # - local: ci-cd/templates/lint-tests.yml ### ### SCRIPTS -- GitLab From 14c61b33bf57d8975e0bac07efe444d1507dcb1c Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 14:09:37 +0100 Subject: [PATCH 17/28] setting ci-cd --- .gitlab-ci.yml | 16 +++++++++------- ci-cd/scripts/syntax_n_lint.yml | 1 + ci-cd/templates/lint-tests.yml | 19 ++++++++++--------- ci-cd/templates/syntax-checks.yml | 4 ++-- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3bdc038..6288f9c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,16 +10,18 @@ variables: IMAGE_NAME_SYNTAX: python:3.10.15-bullseye IMAGE_NAME_LINT: python:3.10.15-bullseye # IMAGE_NAME_MOLECULE: geerlingguy/docker-ubuntu2204-ansible:latest - IMAGE_NAME_MOLECULE: docker:dind + # IMAGE_NAME_MOLECULE: docker:dind + ### INVENTORIES_PATH: "inventories/hosts" PATH_PLAYBOOK_FOR_ROLE_TEST: "ci-cd/playbooks/01_test.yml" + PATH_PLAYBOOK_FOR_ROLE_DEPENDENCIES: "ci-cd/playbooks/02_dependencies.yml" #### - PLAYBOOK_PATH_FOR_ROLE_TEST: "ci-cd/01_test.yml" - PLAYBOOK_PATH_FOR_ROLE_DEPENDENCIES: "ci-cd/02_dependencies.yml" - PLAYBOOK_PATH_FOR_ROLE_CLONE_REPOSITORIES: "ci-cd/03_clone_repositories.yml" - PLAYBOOK_PATH_FOR_ROLE_DOCKER_IMAGES: "ci-cd/04_docker_images.yml" - PLAYBOOK_PATH_FOR_ROLE_DOCKER_CONTAINERS: "ci-cd/05_docker_containers.yml" - PLAYBOOK_PATH_FOR_ROLE_OH_MY_BASH: "ci-cd/06_oh_my_bash.yml" + # PLAYBOOK_PATH_FOR_ROLE_TEST: "ci-cd/01_test.yml" + # PLAYBOOK_PATH_FOR_ROLE_DEPENDENCIES: "ci-cd/02_dependencies.yml" + # PLAYBOOK_PATH_FOR_ROLE_CLONE_REPOSITORIES: "ci-cd/03_clone_repositories.yml" + # PLAYBOOK_PATH_FOR_ROLE_DOCKER_IMAGES: "ci-cd/04_docker_images.yml" + # PLAYBOOK_PATH_FOR_ROLE_DOCKER_CONTAINERS: "ci-cd/05_docker_containers.yml" + # PLAYBOOK_PATH_FOR_ROLE_OH_MY_BASH: "ci-cd/06_oh_my_bash.yml" ### ### STAGES diff --git a/ci-cd/scripts/syntax_n_lint.yml b/ci-cd/scripts/syntax_n_lint.yml index f19802a..c934cf7 100644 --- a/ci-cd/scripts/syntax_n_lint.yml +++ b/ci-cd/scripts/syntax_n_lint.yml @@ -27,4 +27,5 @@ variables: .run_lint: extends: .before_script_syntax_n_lint script: + - echo "Running script for 'run_lint'" - ansible-lint $PLAYBOOK_PATH diff --git a/ci-cd/templates/lint-tests.yml b/ci-cd/templates/lint-tests.yml index e428d6c..8e4c489 100644 --- a/ci-cd/templates/lint-tests.yml +++ b/ci-cd/templates/lint-tests.yml @@ -15,15 +15,15 @@ variables: include: - local: /ci-cd/scripts/syntax_n_lint.yml -syntax-test: - stage: syntax-checks - image: $IMAGE_NAME_SYNTAX - extends: .script_syntax_check_main - variables: - PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_TEST - # only: - # changes: - # - roles/test +# syntax-test: +# stage: syntax-checks +# image: $IMAGE_NAME_SYNTAX +# extends: .script_syntax_check_main +# variables: +# PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_TEST +# # only: +# # changes: +# # - roles/test ### ### STAGE-LINT-TESTS @@ -31,6 +31,7 @@ syntax-test: lint-test: stage: lint-tests image: $IMAGE_NAME_LINT + extends: .run_lint variables: PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_TEST # only: diff --git a/ci-cd/templates/syntax-checks.yml b/ci-cd/templates/syntax-checks.yml index e6c8d84..ace4c73 100644 --- a/ci-cd/templates/syntax-checks.yml +++ b/ci-cd/templates/syntax-checks.yml @@ -6,8 +6,8 @@ variables: AUTHOR: fejao # IMAGE_NAME_SYNTAX: python:3.10.15-bullseye - PATH_PLAYBOOK_FOR_ROLE_TEST: "ci-cd/playbooks/01_test.yml" - PATH_PLAYBOOK_FOR_ROLE_DEPENDENCIES: "ci-cd/playbooks/02_dependencies.yml" + # PATH_PLAYBOOK_FOR_ROLE_TEST: "ci-cd/playbooks/01_test.yml" + # PATH_PLAYBOOK_FOR_ROLE_DEPENDENCIES: "ci-cd/playbooks/02_dependencies.yml" ### ### INCLUDE -- GitLab From 7456163b4e5cbbbb250b56bdd0f52eae3ced0701 Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 14:11:45 +0100 Subject: [PATCH 18/28] setting ci-cd --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6288f9c..8efd60a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,7 +36,7 @@ stages: ### include: - local: ci-cd/templates/syntax-checks.yml - # - local: ci-cd/templates/lint-tests.yml + - local: ci-cd/templates/lint-tests.yml ### ### SCRIPTS -- GitLab From c595b9904199e7677fe06d921e773b2a640a5b73 Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 14:20:32 +0100 Subject: [PATCH 19/28] setting ci-cd --- .gitlab-ci.yml | 4 ++ ci-cd/templates/syntax-checks.yml | 105 +++++++++++++----------------- 2 files changed, 50 insertions(+), 59 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8efd60a..077659a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,6 +15,10 @@ variables: INVENTORIES_PATH: "inventories/hosts" PATH_PLAYBOOK_FOR_ROLE_TEST: "ci-cd/playbooks/01_test.yml" PATH_PLAYBOOK_FOR_ROLE_DEPENDENCIES: "ci-cd/playbooks/02_dependencies.yml" + PATH_PLAYBOOK_FOR_ROLE_CLONE_REPOSITORIES: "ci-cd/playbooks/03_clone_repositories.yml" + PATH_PLAYBOOK_FOR_ROLE_DOCKER_IMAGES: "ci-cd/playbooks/04_docker_images.yml" + PATH_PLAYBOOK_FOR_ROLE_DOCKER_CONTAINERS: "ci-cd/playbooks/05_docker_containers.yml" + PATH_PLAYBOOK_FOR_ROLE_OH_MY_BASH: "ci-cd/playbooks/06_oh_my_bash.yml" #### # PLAYBOOK_PATH_FOR_ROLE_TEST: "ci-cd/01_test.yml" # PLAYBOOK_PATH_FOR_ROLE_DEPENDENCIES: "ci-cd/02_dependencies.yml" diff --git a/ci-cd/templates/syntax-checks.yml b/ci-cd/templates/syntax-checks.yml index ace4c73..970ee74 100644 --- a/ci-cd/templates/syntax-checks.yml +++ b/ci-cd/templates/syntax-checks.yml @@ -5,9 +5,6 @@ ### variables: AUTHOR: fejao - # IMAGE_NAME_SYNTAX: python:3.10.15-bullseye - # PATH_PLAYBOOK_FOR_ROLE_TEST: "ci-cd/playbooks/01_test.yml" - # PATH_PLAYBOOK_FOR_ROLE_DEPENDENCIES: "ci-cd/playbooks/02_dependencies.yml" ### ### INCLUDE @@ -26,64 +23,54 @@ syntax-test: PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_TEST # only: # changes: - # - roles/test + # - roles/c3infodesk-deployment-role-test -# syntax-dependencies: -# stage: syntax-checks -# image: $IMAGE_NAME_SYNTAX -# variables: -# PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_DEPENDENCIES -# before_script: -# - *before_syntax_n_lint -# script: -# - echo "Running ansible-playbook --syntax-check tests at the role-> 'dependencies'" -# - *run_syntax_check -# allow_failure: false +syntax-dependencies: + stage: syntax-checks + image: $IMAGE_NAME_SYNTAX + extends: .script_syntax_check_main + variables: + PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_DEPENDENCIES + # only: + # changes: + # - roles/c3infodesk-deployment-role-dependencies -# syntax-clone-repositories: -# stage: syntax-checks -# image: $IMAGE_NAME_SYNTAX -# variables: -# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_CLONE_REPOSITORIES -# before_script: -# - *before_syntax_n_lint -# script: -# - echo "Running ansible-playbook --syntax-check tests at the role-> 'clone_repositories'" -# - *run_syntax_check -# allow_failure: false +syntax-clone-repositories: + stage: syntax-checks + image: $IMAGE_NAME_SYNTAX + extends: .script_syntax_check_main + variables: + PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_CLONE_REPOSITORIES + # only: + # changes: + # - roles/c3infodesk-deployment-role-clone-repositories -# syntax-docker-images: -# stage: syntax-checks -# image: $IMAGE_NAME_SYNTAX -# variables: -# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DOCKER_IMAGES -# before_script: -# - *before_syntax_n_lint -# script: -# - echo "Running ansible-playbook --syntax-check tests at the role-> 'docker_images'" -# - *run_syntax_check -# allow_failure: false +syntax-docker-images: + stage: syntax-checks + image: $IMAGE_NAME_SYNTAX + extends: .script_syntax_check_main + variables: + PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_DOCKER_IMAGES + # only: + # changes: + # - roles/c3infodesk-deployment-role-docker-images -# syntax-docker-containers: -# stage: syntax-checks -# image: $IMAGE_NAME_SYNTAX -# variables: -# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DOCKER_CONTAINERS -# before_script: -# - *before_syntax_n_lint -# script: -# - echo "Running ansible-playbook --syntax-check tests at the role-> 'docker_containers'" -# - *run_syntax_check -# allow_failure: false +syntax-docker-containers: + stage: syntax-checks + image: $IMAGE_NAME_SYNTAX + extends: .script_syntax_check_main + variables: + PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_DOCKER_CONTAINERS + # only: + # changes: + # - roles/c3infodesk-deployment-role-docker-containers -# syntax-oh-my-bash: -# stage: syntax-checks -# image: $IMAGE_NAME_SYNTAX -# variables: -# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_OH_MY_BASH -# before_script: -# - *before_syntax_n_lint -# script: -# - echo "Running ansible-playbook --syntax-check tests at the role-> 'docker_containers'" -# - *run_syntax_check -# allow_failure: false +syntax-oh-my-bash: + stage: syntax-checks + image: $IMAGE_NAME_SYNTAX + extends: .script_syntax_check_main + variables: + PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_OH_MY_BASH + # only: + # changes: + # - roles/c3infodesk-deployment-role-oh-my-bash -- GitLab From f762f9aee2f374dc8507ee30941f02a84066c93a Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 14:38:31 +0100 Subject: [PATCH 20/28] setting ci-cd --- .gitlab-ci.yml | 243 +----------------------------- ci-cd/templates/lint-tests.yml | 78 ++++++---- ci-cd/templates/molecule.yml | 72 +++++++++ ci-cd/templates/syntax-checks.yml | 2 + 4 files changed, 129 insertions(+), 266 deletions(-) create mode 100644 ci-cd/templates/molecule.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 077659a..671316e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,9 +9,9 @@ variables: AUTHOR: fejao IMAGE_NAME_SYNTAX: python:3.10.15-bullseye IMAGE_NAME_LINT: python:3.10.15-bullseye + IMAGE_NAME_MOLECULE: python:3.10.15-bullseye # IMAGE_NAME_MOLECULE: geerlingguy/docker-ubuntu2204-ansible:latest - # IMAGE_NAME_MOLECULE: docker:dind - ### + ### PATHS INVENTORIES_PATH: "inventories/hosts" PATH_PLAYBOOK_FOR_ROLE_TEST: "ci-cd/playbooks/01_test.yml" PATH_PLAYBOOK_FOR_ROLE_DEPENDENCIES: "ci-cd/playbooks/02_dependencies.yml" @@ -19,13 +19,6 @@ variables: PATH_PLAYBOOK_FOR_ROLE_DOCKER_IMAGES: "ci-cd/playbooks/04_docker_images.yml" PATH_PLAYBOOK_FOR_ROLE_DOCKER_CONTAINERS: "ci-cd/playbooks/05_docker_containers.yml" PATH_PLAYBOOK_FOR_ROLE_OH_MY_BASH: "ci-cd/playbooks/06_oh_my_bash.yml" - #### - # PLAYBOOK_PATH_FOR_ROLE_TEST: "ci-cd/01_test.yml" - # PLAYBOOK_PATH_FOR_ROLE_DEPENDENCIES: "ci-cd/02_dependencies.yml" - # PLAYBOOK_PATH_FOR_ROLE_CLONE_REPOSITORIES: "ci-cd/03_clone_repositories.yml" - # PLAYBOOK_PATH_FOR_ROLE_DOCKER_IMAGES: "ci-cd/04_docker_images.yml" - # PLAYBOOK_PATH_FOR_ROLE_DOCKER_CONTAINERS: "ci-cd/05_docker_containers.yml" - # PLAYBOOK_PATH_FOR_ROLE_OH_MY_BASH: "ci-cd/06_oh_my_bash.yml" ### ### STAGES @@ -41,234 +34,4 @@ stages: include: - local: ci-cd/templates/syntax-checks.yml - local: ci-cd/templates/lint-tests.yml - -### -### SCRIPTS -### -# .before_syntax_n_lint: &before_syntax_n_lint -# - apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/* -# # - pip3 install -r ci-cd/requirements.txt -# - pip3 install -r ci-cd/python_requirements/requirements_syntax_n_lint.txt -# ### Correct the permissions on the build environment directory. -# ### See https://github.com/ansible/ansible/pull/42142/files -# - chmod 700 /builds/fejao/c3infodesk-deployment - -# .run_syntax_check: &run_syntax_check -# # - ansible-playbook --syntax-check -i $INVENTORIES_PATH $ROLE_PATH -# - ansible-playbook --syntax-check -i $INVENTORIES_PATH $PLAYBOOK_PATH - -# .run_lint: &run_lint -# # - ansible-lint $ROLE_PATH -# - ansible-lint $PLAYBOOK_PATH - -### -### STAGE-SYNTAX-CHECK -### -# syntax-test: -# stage: syntax-check -# image: $IMAGE_NAME_SYNTAX -# variables: -# # ROLE_PATH: $PATH_PLAYBOOK_FOR_ROLE_TEST -# PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_TEST -# before_script: -# - *before_syntax_n_lint -# script: -# - echo "Running ansible-playbook --syntax-check tests at the role-> 'test'" -# - *run_syntax_check -# # only: -# # changes: -# # - roles/test - -# syntax-dependencies: -# stage: syntax-check -# image: $IMAGE_NAME_SYNTAX -# variables: -# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DEPENDENCIES -# before_script: -# - *before_syntax_n_lint -# script: -# - echo "Running ansible-playbook --syntax-check tests at the role-> 'dependencies'" -# - *run_syntax_check -# allow_failure: false - -# syntax-clone-repositories: -# stage: syntax-check -# image: $IMAGE_NAME_SYNTAX -# variables: -# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_CLONE_REPOSITORIES -# before_script: -# - *before_syntax_n_lint -# script: -# - echo "Running ansible-playbook --syntax-check tests at the role-> 'clone_repositories'" -# - *run_syntax_check -# allow_failure: false - -# syntax-docker-images: -# stage: syntax-check -# image: $IMAGE_NAME_SYNTAX -# variables: -# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DOCKER_IMAGES -# before_script: -# - *before_syntax_n_lint -# script: -# - echo "Running ansible-playbook --syntax-check tests at the role-> 'docker_images'" -# - *run_syntax_check -# allow_failure: false - -# syntax-docker-containers: -# stage: syntax-check -# image: $IMAGE_NAME_SYNTAX -# variables: -# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DOCKER_CONTAINERS -# before_script: -# - *before_syntax_n_lint -# script: -# - echo "Running ansible-playbook --syntax-check tests at the role-> 'docker_containers'" -# - *run_syntax_check -# allow_failure: false - -# syntax-oh-my-bash: -# stage: syntax-check -# image: $IMAGE_NAME_SYNTAX -# variables: -# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_OH_MY_BASH -# before_script: -# - *before_syntax_n_lint -# script: -# - echo "Running ansible-playbook --syntax-check tests at the role-> 'docker_containers'" -# - *run_syntax_check -# allow_failure: false - -# ### -# ### STAGE-LINT-TESTS -# ### -# lint-test: -# stage: lint-tests -# image: $IMAGE_NAME_LINT -# variables: -# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_TEST -# before_script: -# - *before_syntax_n_lint -# script: -# - echo "Running ansible-lint tests at the role-> 'test'" -# - *run_lint -# allow_failure: false - -# lint-dependencies: -# stage: lint-tests -# image: $IMAGE_NAME_LINT -# variables: -# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DEPENDENCIES -# before_script: -# - *before_syntax_n_lint -# script: -# - echo "Running ansible-lint tests at the role-> 'dependencies'" -# - *run_lint -# allow_failure: false - -# lint-clone-repositories: -# stage: lint-tests -# image: $IMAGE_NAME_LINT -# variables: -# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_CLONE_REPOSITORIES -# before_script: -# - *before_syntax_n_lint -# script: -# - echo "Running ansible-lint tests at the role-> 'clone_repositories'" -# - *run_lint -# allow_failure: false - -# lint-docker-images: -# stage: lint-tests -# image: $IMAGE_NAME_LINT -# variables: -# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DOCKER_IMAGES -# before_script: -# - *before_syntax_n_lint -# script: -# - echo "Running ansible-lint tests at the role-> 'docker_images'" -# - *run_lint -# allow_failure: false - -# lint-docker-containers: -# stage: lint-tests -# image: $IMAGE_NAME_LINT -# variables: -# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DOCKER_CONTAINERS -# before_script: -# - *before_syntax_n_lint -# script: -# - echo "Running ansible-lint tests at the role-> 'docker_containers'" -# - *run_lint -# allow_failure: false - -# lint-oh-my-bash: -# stage: lint-tests -# image: $IMAGE_NAME_LINT -# variables: -# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_OH_MY_BASH -# before_script: -# - *before_syntax_n_lint -# script: -# - echo "Running ansible-lint tests at the role-> 'docker_containers'" -# - *run_lint -# allow_failure: false - -### -### STAGE-MOLECULE --> At the moment, running DIND (docker in docker) at this instance is disable :( -### -# molecule-test: -# stage: molecule -# image: $IMAGE_NAME_MOLECULE -# ### AVAILABLE TAGS -# # https://docs.gitlab.com/ee/ci/runners/hosted_runners/linux.html#machine-types-available-for-linux---x86-64 -# tags: -# - saas-linux-small-amd64 -# # before_script: -# # # - apk add --no-cache python3 py3-pip -# # # - rm /usr/lib/python*/EXTERNALLY-MANAGED -# # # - python3 -m ensurepip -# # - pip3 install ansible ansible-lint molecule molecule-docker -# # - pip3 install --user "molecule-plugins[docker]" -# script: -# - echo "Running molecule tests at the role-> 'test'" -# - docker ps -a -# # - cd roles/test -# # - molecule test -# allow_failure: false - -# molecule-test: -# stage: molecule -# # image: docker:latest -# # image: docker:27.5.1-alpine3.21 -# # image: docker:27.5.1-dind -# # image: geerlingguy/docker-ubuntu2204-ansible:latest -# image: $IMAGE_NAME_MOLECULE -# before_script: -# # - apk add --no-cache python3 py3-pip -# # - rm /usr/lib/python*/EXTERNALLY-MANAGED -# # - python3 -m ensurepip -# - pip3 install ansible ansible-lint molecule molecule-docker -# - pip3 install --user "molecule-plugins[docker]" -# script: -# - echo "Running ansible-lint tests at the role-> 'test'" -# - docker ps -a -# # - cd roles/test -# # - molecule test -# allow_failure: false - -# molecule-test: -# stage: molecule -# # image: docker:latest -# image: docker:27.5.1-alpine3.21 -# before_script: -# - apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/* -# - pip3 install -r ci-cd/requirements.txt -# - pip3 install --upgrade molecule molecule-docker -# # - python3 -m pip install --user "molecule-plugins[docker] -# - pip3 install --user "molecule-plugins[docker]" -# script: -# - echo "Running ansible-lint tests at the role-> 'test'" -# - cd roles/test -# - molecule test -# allow_failure: false + - local: ci-cd/templates/molecule.yml diff --git a/ci-cd/templates/lint-tests.yml b/ci-cd/templates/lint-tests.yml index 8e4c489..7449c23 100644 --- a/ci-cd/templates/lint-tests.yml +++ b/ci-cd/templates/lint-tests.yml @@ -5,9 +5,6 @@ ### variables: AUTHOR: fejao - # IMAGE_NAME_LINT: python:3.10.15-bullseye - PATH_PLAYBOOK_FOR_ROLE_TEST: "ci-cd/playbooks/01_test.yml" - PATH_PLAYBOOK_FOR_ROLE_DEPENDENCIES: "ci-cd/playbooks/02_dependencies.yml" ### ### INCLUDE @@ -15,16 +12,6 @@ variables: include: - local: /ci-cd/scripts/syntax_n_lint.yml -# syntax-test: -# stage: syntax-checks -# image: $IMAGE_NAME_SYNTAX -# extends: .script_syntax_check_main -# variables: -# PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_TEST -# # only: -# # changes: -# # - roles/test - ### ### STAGE-LINT-TESTS ### @@ -36,16 +23,55 @@ lint-test: PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_TEST # only: # changes: - # - roles/test - -# lint-dependencies: -# stage: lint-tests -# image: $IMAGE_NAME_LINT -# variables: -# ROLE_PATH: $PLAYBOOK_PATH_FOR_ROLE_DEPENDENCIES -# before_script: -# - *before_syntax_n_lint -# script: -# - echo "Running ansible-lint tests at the role-> 'dependencies'" -# - *run_lint -# allow_failure: false + # - roles/c3infodesk-deployment-role-test + +lint-dependencies: + stage: lint-tests + image: $IMAGE_NAME_LINT + extends: .run_lint + variables: + PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_DEPENDENCIES + # only: + # changes: + # - roles/c3infodesk-deployment-role-dependencies + +lint-clone-repositories: + stage: lint-tests + image: $IMAGE_NAME_LINT + extends: .run_lint + variables: + PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_CLONE_REPOSITORIES + # only: + # changes: + # - roles/c3infodesk-deployment-role-clone-repositories + +lint-docker-images: + stage: lint-tests + image: $IMAGE_NAME_LINT + extends: .run_lint + variables: + PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_DOCKER_IMAGES + # only: + # changes: + # - roles/c3infodesk-deployment-role-docker-containers + +lint-docker-containers: + stage: lint-tests + image: $IMAGE_NAME_LINT + extends: .run_lint + variables: + PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_DOCKER_CONTAINERS + # only: + # changes: + # - roles/c3infodesk-deployment-role-docker-containers + +lint-oh-my-bash: + stage: lint-tests + image: $IMAGE_NAME_LINT + extends: .run_lint + variables: + PLAYBOOK_PATH: $PATH_PLAYBOOK_FOR_ROLE_OH_MY_BASH + # only: + # changes: + # - roles/c3infodesk-deployment-role-oh-my-bash + diff --git a/ci-cd/templates/molecule.yml b/ci-cd/templates/molecule.yml new file mode 100644 index 0000000..1a311e0 --- /dev/null +++ b/ci-cd/templates/molecule.yml @@ -0,0 +1,72 @@ +--- + +### +### VARIABLES +### +variables: + AUTHOR: fejao + +molecule-not-enabled: + stage: molecule + image: $IMAGE_NAME_MOLECULE + script: + - echo "This can't be done before enable DIND at the instance" + +### +### STAGE-MOLECULE --> At the moment, running DIND (docker in docker) at this instance is disable :( +### +# molecule-test: +# stage: molecule +# image: $IMAGE_NAME_MOLECULE +# ### AVAILABLE TAGS +# # https://docs.gitlab.com/ee/ci/runners/hosted_runners/linux.html#machine-types-available-for-linux---x86-64 +# tags: +# - saas-linux-small-amd64 +# # before_script: +# # # - apk add --no-cache python3 py3-pip +# # # - rm /usr/lib/python*/EXTERNALLY-MANAGED +# # # - python3 -m ensurepip +# # - pip3 install ansible ansible-lint molecule molecule-docker +# # - pip3 install --user "molecule-plugins[docker]" +# script: +# - echo "Running molecule tests at the role-> 'test'" +# - docker ps -a +# # - cd roles/test +# # - molecule test +# allow_failure: false + +# molecule-test: +# stage: molecule +# # image: docker:latest +# # image: docker:27.5.1-alpine3.21 +# # image: docker:27.5.1-dind +# # image: geerlingguy/docker-ubuntu2204-ansible:latest +# image: $IMAGE_NAME_MOLECULE +# before_script: +# # - apk add --no-cache python3 py3-pip +# # - rm /usr/lib/python*/EXTERNALLY-MANAGED +# # - python3 -m ensurepip +# - pip3 install ansible ansible-lint molecule molecule-docker +# - pip3 install --user "molecule-plugins[docker]" +# script: +# - echo "Running ansible-lint tests at the role-> 'test'" +# - docker ps -a +# # - cd roles/test +# # - molecule test +# allow_failure: false + +# molecule-test: +# stage: molecule +# # image: docker:latest +# image: docker:27.5.1-alpine3.21 +# before_script: +# - apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/* +# - pip3 install -r ci-cd/requirements.txt +# - pip3 install --upgrade molecule molecule-docker +# # - python3 -m pip install --user "molecule-plugins[docker] +# - pip3 install --user "molecule-plugins[docker]" +# script: +# - echo "Running ansible-lint tests at the role-> 'test'" +# - cd roles/test +# - molecule test +# allow_failure: false diff --git a/ci-cd/templates/syntax-checks.yml b/ci-cd/templates/syntax-checks.yml index 970ee74..04ffeb7 100644 --- a/ci-cd/templates/syntax-checks.yml +++ b/ci-cd/templates/syntax-checks.yml @@ -24,6 +24,8 @@ syntax-test: # only: # changes: # - roles/c3infodesk-deployment-role-test + # refs: + # - main syntax-dependencies: stage: syntax-checks -- GitLab From 219af2d544ba3fcfc935b5471d3e95b12467a487 Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 14:54:27 +0100 Subject: [PATCH 21/28] setting ci-cd --- .gitlab-ci.yml | 8 +++++--- ci-cd/templates/trigger-pipeline.yml | 11 +++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 ci-cd/templates/trigger-pipeline.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 671316e..22b2520 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,6 +24,7 @@ variables: ### STAGES ### stages: + - before-role-trigger - syntax-checks - lint-tests - molecule @@ -32,6 +33,7 @@ stages: ### TEMPLATES ### include: - - local: ci-cd/templates/syntax-checks.yml - - local: ci-cd/templates/lint-tests.yml - - local: ci-cd/templates/molecule.yml + - local: ci-cd/templates/trigger-pipeline.yml + # - local: ci-cd/templates/syntax-checks.yml + # - local: ci-cd/templates/lint-tests.yml + # - local: ci-cd/templates/molecule.yml diff --git a/ci-cd/templates/trigger-pipeline.yml b/ci-cd/templates/trigger-pipeline.yml new file mode 100644 index 0000000..466aae8 --- /dev/null +++ b/ci-cd/templates/trigger-pipeline.yml @@ -0,0 +1,11 @@ +--- + + +trigger-pipeline: + stage: before-role-trigger + # trigger: + # include: https://git.cccv.de/fejao/c3infodesk-deployment/.gitlab-ci.yml + + script: + - pwd + - ls -la -- GitLab From 418267e2a0105926827e18e85eb4fbb49c40afa4 Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 14:56:19 +0100 Subject: [PATCH 22/28] setting ci-cd --- ci-cd/templates/trigger-pipeline.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ci-cd/templates/trigger-pipeline.yml b/ci-cd/templates/trigger-pipeline.yml index 466aae8..c52dac6 100644 --- a/ci-cd/templates/trigger-pipeline.yml +++ b/ci-cd/templates/trigger-pipeline.yml @@ -4,8 +4,10 @@ trigger-pipeline: stage: before-role-trigger # trigger: - # include: https://git.cccv.de/fejao/c3infodesk-deployment/.gitlab-ci.yml + # include: <ChildFolder>/.gitlab-ci.yml + trigger: + include: roles/c3infodesk-deployment-role-test/.gitlab-ci.yml - script: - - pwd - - ls -la + # script: + # - pwd + # - ls -la -- GitLab From 379dde29d09755402c2bb913f0c2e6d9217bb480 Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 15:04:01 +0100 Subject: [PATCH 23/28] Updated submodule for 'test' role --- roles/c3infodesk-deployment-role-test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/c3infodesk-deployment-role-test b/roles/c3infodesk-deployment-role-test index ce19a15..ddc45d2 160000 --- a/roles/c3infodesk-deployment-role-test +++ b/roles/c3infodesk-deployment-role-test @@ -1 +1 @@ -Subproject commit ce19a154fc535322f1cff231cb827c89518fdd78 +Subproject commit ddc45d25c366878dd3f92136c54d4852562342c6 -- GitLab From 76dfeb6da78bbfbca26f95c97b63ad78c46da227 Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 15:05:33 +0100 Subject: [PATCH 24/28] setting ci-cd --- ci-cd/templates/trigger-pipeline.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/ci-cd/templates/trigger-pipeline.yml b/ci-cd/templates/trigger-pipeline.yml index c52dac6..b91f3e1 100644 --- a/ci-cd/templates/trigger-pipeline.yml +++ b/ci-cd/templates/trigger-pipeline.yml @@ -1,13 +1,18 @@ --- +### +### VARIABLES +### +variables: + AUTHOR: fejao trigger-pipeline: stage: before-role-trigger # trigger: # include: <ChildFolder>/.gitlab-ci.yml - trigger: - include: roles/c3infodesk-deployment-role-test/.gitlab-ci.yml + # trigger: + # include: roles/c3infodesk-deployment-role-test/.gitlab-ci.yml - # script: - # - pwd - # - ls -la + script: + - pwd + - ls -la -- GitLab From 7f5666c4cc89f26abd5b5797c6c5241fd4df9913 Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 15:08:05 +0100 Subject: [PATCH 25/28] setting ci-cd --- ci-cd/templates/trigger-pipeline.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ci-cd/templates/trigger-pipeline.yml b/ci-cd/templates/trigger-pipeline.yml index b91f3e1..3de201b 100644 --- a/ci-cd/templates/trigger-pipeline.yml +++ b/ci-cd/templates/trigger-pipeline.yml @@ -10,9 +10,12 @@ trigger-pipeline: stage: before-role-trigger # trigger: # include: <ChildFolder>/.gitlab-ci.yml - # trigger: - # include: roles/c3infodesk-deployment-role-test/.gitlab-ci.yml + trigger: + # include: roles/c3infodesk-deployment-role-test/.gitlab-ci.yml + include: /builds/fejao/c3infodesk-deployment/roles/c3infodesk-deployment-role-test/.gitlab-ci.yml script: + - echo "Triggering tests for the 'test' role" - pwd + # /builds/fejao/c3infodesk-deployment - ls -la -- GitLab From 0753957aa9ceb8c449307a00fe3f31f08680c71c Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 15:08:48 +0100 Subject: [PATCH 26/28] setting ci-cd --- ci-cd/templates/trigger-pipeline.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ci-cd/templates/trigger-pipeline.yml b/ci-cd/templates/trigger-pipeline.yml index 3de201b..2632fb5 100644 --- a/ci-cd/templates/trigger-pipeline.yml +++ b/ci-cd/templates/trigger-pipeline.yml @@ -14,8 +14,8 @@ trigger-pipeline: # include: roles/c3infodesk-deployment-role-test/.gitlab-ci.yml include: /builds/fejao/c3infodesk-deployment/roles/c3infodesk-deployment-role-test/.gitlab-ci.yml - script: - - echo "Triggering tests for the 'test' role" - - pwd - # /builds/fejao/c3infodesk-deployment - - ls -la + # script: + # - echo "Triggering tests for the 'test' role" + # - pwd + # # /builds/fejao/c3infodesk-deployment + # - ls -la -- GitLab From db873371480302bda9748365264b35f58fc569d6 Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 15:10:25 +0100 Subject: [PATCH 27/28] setting ci-cd --- ci-cd/templates/trigger-pipeline.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/ci-cd/templates/trigger-pipeline.yml b/ci-cd/templates/trigger-pipeline.yml index 2632fb5..80458f2 100644 --- a/ci-cd/templates/trigger-pipeline.yml +++ b/ci-cd/templates/trigger-pipeline.yml @@ -10,12 +10,15 @@ trigger-pipeline: stage: before-role-trigger # trigger: # include: <ChildFolder>/.gitlab-ci.yml - trigger: - # include: roles/c3infodesk-deployment-role-test/.gitlab-ci.yml - include: /builds/fejao/c3infodesk-deployment/roles/c3infodesk-deployment-role-test/.gitlab-ci.yml + # trigger: + # # include: roles/c3infodesk-deployment-role-test/.gitlab-ci.yml + # include: /builds/fejao/c3infodesk-deployment/roles/c3infodesk-deployment-role-test/.gitlab-ci.yml - # script: - # - echo "Triggering tests for the 'test' role" - # - pwd - # # /builds/fejao/c3infodesk-deployment - # - ls -la + script: + - echo "Triggering tests for the 'test' role" + - pwd + # /builds/fejao/c3infodesk-deployment + - ls -la + - ls -la roles + - ls -la roles/c3infodesk-deployment-role-test + - ls -la roles/c3infodesk-deployment-role-test/.gitlab-ci.yml -- GitLab From 1ef084e33ebc43883695cf9f2bc332dbe9a4d3c5 Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Tue, 11 Feb 2025 15:16:10 +0100 Subject: [PATCH 28/28] setting ci-cd --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 22b2520..fdf0501 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ stages: ### TEMPLATES ### include: - - local: ci-cd/templates/trigger-pipeline.yml - # - local: ci-cd/templates/syntax-checks.yml - # - local: ci-cd/templates/lint-tests.yml - # - local: ci-cd/templates/molecule.yml + # - local: ci-cd/templates/trigger-pipeline.yml + - local: ci-cd/templates/syntax-checks.yml + - local: ci-cd/templates/lint-tests.yml + - local: ci-cd/templates/molecule.yml -- GitLab