Merge "Rename install-pdk-dependencies to ensure-pdk-dependencies for consistency"

doc/source/puppet-roles.rst

@@ -2,6 +2,7 @@ Puppet Roles
 ============
 
 .. zuul:autorole:: build-puppet-module
-.. zuul:autorole:: install-pdk-dependencies
+.. zuul:autorole:: ensure-pdk-dependencies
 .. zuul:autorole:: fetch-puppet-module-output
+.. zuul:autorole:: install-pdk-dependencies
 .. zuul:autorole:: upload-forge

roles/build-puppet-module/README.rst

@@ -5,7 +5,7 @@ Development Kit (PDK).
 
    This role requires installed Ruby, Ruby development and build tools
    (gcc/g++ and make) packages, they can be installed using the
-   :zuul:role:`install-pdk-dependencies` role.
+   :zuul:role:`ensure-pdk-dependencies` role.
 
 **Role Variables**
 

roles/ensure-pdk-dependencies/README.rst

@@ -0,0 +1,5 @@
+Ensure dependencies for Puppet Development Kit are installed
+
+This role installs all dependencies for Puppet Development Kit (PDK)
+so that puppet modules can be build with the PDK and published to the
+forge.

roles/ensure-pdk-dependencies/tasks/main.yaml

@@ -0,0 +1,19 @@
+- name: Install ruby dependencies on Red Hat/SUSE based distribution
+  package:
+    name:
+      - ruby-devel
+      - gcc-c++
+      - make
+    state: present
+  become: yes
+  when: ansible_os_family == "RedHat" or ansible_os_family == "Suse"
+
+- name: Install ruby dependencies on Debian based distribution
+  package:
+    name:
+      - ruby-dev
+      - g++
+      - make
+    state: present
+  become: yes
+  when: ansible_os_family == "Debian"

roles/install-pdk-dependencies/README.rst

@@ -1,5 +1 @@
-Ensure dependencies for Puppet Development Kit are installed
-
-This role installs all dependencies for Puppet Development Kit (PDK)
-so that puppet modules can be build with the PDK and published to the
-forge.
+.. warning:: Deprecated, use ensure-pdk-dependencies instead.

roles/install-pdk-dependencies/tasks/main.yaml

@@ -1,19 +1,3 @@
-- name: Install ruby dependencies on Red Hat/SUSE based distribution
-  package:
-    name:
-      - ruby-devel
-      - gcc-c++
-      - make
-    state: present
-  become: yes
-  when: ansible_os_family == "RedHat" or ansible_os_family == "Suse"
-
-- name: Install ruby dependencies on Debian based distribution
-  package:
-    name:
-      - ruby-dev
-      - g++
-      - make
-    state: present
-  become: yes
-  when: ansible_os_family == "Debian"
+- name: Include ensure-pdk-dependencies.
+  include_role:
+    name: ensure-pdk-dependencies

zuul-tests.d/puppet-roles-jobs.yaml

@@ -1,11 +1,11 @@
 - job:
-    name: zuul-jobs-test-install-pdk-dependencies
-    description: Test the install-pdk-dependencies role
+    name: zuul-jobs-test-ensure-pdk-dependencies
+    description: Test the ensure-pdk-dependencies role
     files:
-      - roles/install-pdk-dependencies/.*
+      - roles/ensure-pdk-dependencies/.*
     run: test-playbooks/simple-role-test.yaml
     vars:
-      role_name: install-pdk-dependencies
+      role_name: ensure-pdk-dependencies
 
 # -* AUTOGENERATED *-
 #  The following project section is autogenerated by
@@ -15,6 +15,6 @@
 - project:
     check:
       jobs: &id001
-        - zuul-jobs-test-install-pdk-dependencies
+        - zuul-jobs-test-ensure-pdk-dependencies
     gate:
       jobs: *id001