From f5283900302cf34d6ad434cc7f26c73868c7d9d1 Mon Sep 17 00:00:00 2001 From: "Daniel.Gordillo" Date: Wed, 4 Oct 2023 13:25:06 +0200 Subject: [PATCH 1/3] [PC-1179] Fix path & version --- meta/main.yml | 12 +++++++----- tasks/main.yml | 6 +++--- tests/requirements.yml | 10 ++++++---- tests/test.yml | 2 +- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index a3821f3..a096e36 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,7 +1,7 @@ --- galaxy_info: role_name: jenkins_plugins - namespace: wcm_io_devops + namespace: wcm-io-devops author: Tobias Richter description: Role for maintaining plugins on Jenkins instances. company: pro!vision @@ -21,7 +21,8 @@ galaxy_info: dependencies: # ensure service is started - - role: wcm_io_devops.jenkins_service + - role: wcm-io-devops.jenkins_service + src: https://github.com/Ebury/ansible-jenkins-service.git version: 1.2.2 jenkins_service_hostname: "{{ jenkins_plugins_jenkins_hostname }}" jenkins_service_port: "{{ jenkins_plugins_jenkins_port }}" @@ -30,11 +31,12 @@ dependencies: jenkins_service_admin_password: "{{ jenkins_plugins_admin_password }}" jenkins_service_state: started # gather facts about the jenkins - - role: wcm_io_devops.jenkins_facts - version: 1.4.0 + - role: wcm-io-devops.jenkins_facts + src: https://github.com/Ebury/ansible-jenkins-facts.git + version: 1.3.2 jenkins_facts_admin_username: "{{ jenkins_plugins_admin_username }}" jenkins_facts_admin_password: "{{ jenkins_plugins_admin_password }}" jenkins_facts_jenkins_hostname: "{{ jenkins_plugins_jenkins_hostname }}" jenkins_facts_jenkins_port: "{{ jenkins_plugins_jenkins_port }}" jenkins_facts_jenkins_url_prefix: "{{ jenkins_plugins_jenkins_url_prefix }}" - tags: ['wcm_io_devops.jenkins_plugins.jenkins_facts'] + tags: ['wcm-io-devops.jenkins_plugins.jenkins_facts'] diff --git a/tasks/main.yml b/tasks/main.yml index 6c1de5f..64e2c0c 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -93,7 +93,7 @@ with_dict: "{{ jenkins_plugins_install_plugins | default({}) }}" changed_when: jenkins_plugins_install_plugins | default({}) | length > 0 notify: - - wcm_io_devops.jenkins_service restart + - wcm-io-devops.jenkins_service restart register: _jenkins_plugins_install_result - name: Uninstall Jenkins plugins. @@ -111,7 +111,7 @@ with_dict: "{{ jenkins_plugins_uninstall_plugins | default({}) }}" changed_when: _jenkins_plugins_uninstall_result.status == 302 notify: - - wcm_io_devops.jenkins_service restart + - wcm-io-devops.jenkins_service restart register: _jenkins_plugins_uninstall_result - name: Flush pending (restart) handlers before continue. @@ -123,7 +123,7 @@ - block: - name: "gather jenkins facts." include_role: - name: "wcm_io_devops.jenkins_facts" + name: "wcm-io-devops.jenkins_facts" tasks_from: "gather_jenkins_facts.yml" vars: jenkins_facts_admin_username: "{{ jenkins_plugins_admin_username }}" diff --git a/tests/requirements.yml b/tests/requirements.yml index a4778fb..0ae5666 100644 --- a/tests/requirements.yml +++ b/tests/requirements.yml @@ -1,5 +1,7 @@ --- -- name: wcm_io_devops.jenkins_facts - version: master -- name: wcm_io_devops.jenkins_service - version: master +- name: wcm-io-devops.jenkins_facts + src: https://github.com/Ebury/ansible-jenkins-facts.git + version: 1.3.2 +- name: wcm-io-devops.jenkins_service + src: https://github.com/Ebury/ansible-jenkins-service.git + version: 1.2.2 diff --git a/tests/test.yml b/tests/test.yml index ee62f77..e751249 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -2,4 +2,4 @@ - name: test role syntax hosts: test roles: - - wcm_io_devops.jenkins_plugins + - wcm-io-devops.jenkins_plugins From 7ac707feb627e6a67cb7784f2ced35fdfb9d85b5 Mon Sep 17 00:00:00 2001 From: "Daniel.Gordillo" Date: Wed, 4 Oct 2023 13:26:04 +0200 Subject: [PATCH 2/3] [PC-1179] Fix path & version --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5395e43..fba9fbc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,11 +2,11 @@ name: CI env: - ROLE_NAME: wcm_io_devops.jenkins_plugins + ROLE_NAME: wcm-io-devops.jenkins_plugins defaults: run: - working-directory: 'wcm_io_devops.jenkins_plugins' + working-directory: 'wcm-io-devops.jenkins_plugins' 'on': pull_request: From 09caeb0bbb2a8a0c224011d90c277ad68142dcf8 Mon Sep 17 00:00:00 2001 From: "Daniel.Gordillo" Date: Wed, 4 Oct 2023 16:04:08 +0200 Subject: [PATCH 3/3] [PC-1179] Add SCM --- meta/main.yml | 2 ++ tests/requirements.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/meta/main.yml b/meta/main.yml index a096e36..557ddb5 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -23,6 +23,7 @@ dependencies: # ensure service is started - role: wcm-io-devops.jenkins_service src: https://github.com/Ebury/ansible-jenkins-service.git + scm: git version: 1.2.2 jenkins_service_hostname: "{{ jenkins_plugins_jenkins_hostname }}" jenkins_service_port: "{{ jenkins_plugins_jenkins_port }}" @@ -33,6 +34,7 @@ dependencies: # gather facts about the jenkins - role: wcm-io-devops.jenkins_facts src: https://github.com/Ebury/ansible-jenkins-facts.git + scm: git version: 1.3.2 jenkins_facts_admin_username: "{{ jenkins_plugins_admin_username }}" jenkins_facts_admin_password: "{{ jenkins_plugins_admin_password }}" diff --git a/tests/requirements.yml b/tests/requirements.yml index 0ae5666..ad77f05 100644 --- a/tests/requirements.yml +++ b/tests/requirements.yml @@ -1,7 +1,9 @@ --- - name: wcm-io-devops.jenkins_facts src: https://github.com/Ebury/ansible-jenkins-facts.git + scm: git version: 1.3.2 - name: wcm-io-devops.jenkins_service src: https://github.com/Ebury/ansible-jenkins-service.git + scm: git version: 1.2.2