From 1e4d887b5cbea40064c435f092f25fd12b89edb8 Mon Sep 17 00:00:00 2001 From: fejao <mail@fejao.de> Date: Mon, 27 Jan 2025 21:13:11 +0100 Subject: [PATCH] Adding lint for the 'clone_repositories' role --- .gitlab-ci.yml | 20 ++++++++++---------- playbook_example_03_clone_repositories.yml | 5 +++-- roles/clone_repositories/meta/main.yml | 4 +++- roles/clone_repositories/tasks/printer.yml | 8 ++++++-- roles/docker_containers/meta/main.yml | 4 +++- roles/docker_images/meta/main.yml | 4 +++- 6 files changed, 28 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cddcc6a..b363461 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ variables: ##### PLAYBOOK_NAME_FOR_ROLE_TEST: "playbook_example_01_test.yml" PLAYBOOK_NAME_FOR_ROLE_DEPENDENCIES: "playbook_example_02_dependencies.yml" - # PLAYBOOK_NAME_FOR_ROLE_CLONE_REPOSITORIES: "playbook_example_03_clone_repositories.yml" + PLAYBOOK_NAME_FOR_ROLE_CLONE_REPOSITORIES: "playbook_example_03_clone_repositories.yml" stages: - debug @@ -66,12 +66,12 @@ role-dependencies: - ansible-lint $PLAYBOOK_NAME_FOR_ROLE_DEPENDENCIES allow_failure: false -# role-clone-repositories: -# stage: lint-tests -# before_script: -# - apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/* -# - pip3 install -r requirements.txt -# script: -# - echo "Running ansible-lint tests at the role-> 'clone_repositories'" -# - ansible-lint $PLAYBOOK_NAME_FOR_ROLE_CLONE_REPOSITORIES -# allow_failure: false +role-clone-repositories: + stage: lint-tests + before_script: + - apt-get update && apt-get install -y python3-pip && apt-get clean && rm -rf /var/lib/apt/lists/* + - pip3 install -r requirements.txt + script: + - echo "Running ansible-lint tests at the role-> 'clone_repositories'" + - ansible-lint $PLAYBOOK_NAME_FOR_ROLE_CLONE_REPOSITORIES + allow_failure: false diff --git a/playbook_example_03_clone_repositories.yml b/playbook_example_03_clone_repositories.yml index b6b3636..1aff7a5 100644 --- a/playbook_example_03_clone_repositories.yml +++ b/playbook_example_03_clone_repositories.yml @@ -1,7 +1,8 @@ --- # Runs example for -- hosts: - - example_servers_group +- name: Playbook for running the role 'clone_repositories' + hosts: + - example_servers_group roles: - clone_repositories diff --git a/roles/clone_repositories/meta/main.yml b/roles/clone_repositories/meta/main.yml index a566122..3488600 100644 --- a/roles/clone_repositories/meta/main.yml +++ b/roles/clone_repositories/meta/main.yml @@ -1,10 +1,12 @@ +--- + galaxy_info: role_name: clone_repositories description: Role to clone the repositories used from c3InfoDesk sytems author: fejao company: cccv.de license: MIT - min_ansible_version: 2.10 + min_ansible_version: '2.10' galaxy_tags: [] # dependencies: [] diff --git a/roles/clone_repositories/tasks/printer.yml b/roles/clone_repositories/tasks/printer.yml index 8aa4703..ff56ad4 100644 --- a/roles/clone_repositories/tasks/printer.yml +++ b/roles/clone_repositories/tasks/printer.yml @@ -5,8 +5,9 @@ ansible.builtin.git: repo: "{{ c3infodesk_printer_repo_url }}" dest: "{{ c3infodesk_printer_folder }}" - clone: no - update: no + version: main + clone: false + update: false register: check_repository - name: PRINTER | Check repository exists answer @@ -18,6 +19,7 @@ ansible.builtin.git: repo: "{{ c3infodesk_printer_repo_url }}" dest: "{{ c3infodesk_printer_folder }}" + version: main depth: 1 when: - check_repository.before is defined @@ -31,3 +33,5 @@ when: - check_repository.before is defined - check_repository.before == None + register: ret_change_branch + changed_when: ret_change_branch.rc != 0 diff --git a/roles/docker_containers/meta/main.yml b/roles/docker_containers/meta/main.yml index 6bef252..8217cd1 100644 --- a/roles/docker_containers/meta/main.yml +++ b/roles/docker_containers/meta/main.yml @@ -1,10 +1,12 @@ +--- + galaxy_info: role_name: docker-containers description: Role to work with the containers for the c3InfoDesk sytems author: fejao company: cccv.de license: MIT - min_ansible_version: 2.10 + min_ansible_version: '2.10' galaxy_tags: [] # dependencies: [] diff --git a/roles/docker_images/meta/main.yml b/roles/docker_images/meta/main.yml index 8362f7b..dc928c1 100644 --- a/roles/docker_images/meta/main.yml +++ b/roles/docker_images/meta/main.yml @@ -1,10 +1,12 @@ +--- + galaxy_info: role_name: docker_images description: Role to clone the repositories used from c3InfoDesk sytems author: fejao company: cccv.de license: MIT - min_ansible_version: 2.10 + min_ansible_version: '2.10' galaxy_tags: [] # dependencies: [] -- GitLab