CentOS: Fix jq and pip installation

This PS fixes pip and jq installation on CentOS. It also removes
some duplicate code in the gate playbooks.

Co-Authored-By: portdirect <pete@port.direct>

This patch set should fix an issue where centos cannot find
python-pip in the EPEL.

Change-Id: If3a437e0756a363b8cefaa9a8bdd1c3498fedbfd

tools/gate/playbooks/deploy-helm-packages/tasks/helm-setup-dev-environment.yaml

@@ -10,42 +10,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: installing OS-H dev tools
-  include_role:
-    name: deploy-package
-    tasks_from: dist
-  vars:
-    packages:
-      deb:
-        - git
-        - make
-        - curl
-        - ca-certificates
-        - jq
-      rpm:
-        - git
-        - make
-        - curl
-        - jq
-
 - block:
-    - name: removing jq binary on centos
+    - name: installing OS-H dev tools
-      become: true
+      include_role:
-      become_user: root
+        name: deploy-package
-      when: ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux'
+        tasks_from: dist
-      file:
+      vars:
-        path: "{{ item }}"
+        packages:
-        state: absent
+          deb:
-      with_items:
+            - git
-        - /usr/bin/jq
+            - make
-    - name: installing jq 1.5 binary for centos
+            - curl
-      become: true
+            - ca-certificates
-      become_user: root
+          rpm:
-      when: ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux'
+            - git
-      get_url:
+            - make
-        url: https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64
+            - curl
-        dest: /usr/bin/jq
+    - name: installing jq
-        mode: 0555
+      include_role:
+        name: deploy-jq
+        tasks_from: main
 
 - name: assemble charts
   make:

tools/gate/playbooks/deploy-python-pip/tasks/main.yaml

@@ -27,13 +27,13 @@
         state: present
     - name: ensuring python pip package is present for centos
       yum:
-        name: python-pip
+        name: python-devel
         state: present
 
 - name: ensuring python pip package is present for fedora via the python-devel rpm
   when: ansible_distribution == 'Fedora'
   dnf:
-    name: python-devel
+    name: python2-pip
     state: present
 
 - name: ensuring pip is the latest version

tools/gate/playbooks/deploy-yq/tasks/main.yaml

@@ -14,6 +14,7 @@
 
 - block:
     - name: ensuring jq is deployed on host
+      when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu' or ansible_distribution == 'Fedora'
       include_role:
         name: deploy-package
         tasks_from: dist