refactor: ...

Author: cupen

Diff for: .yamllint

@@ -0,0 +1,33 @@
+---
+# Based on ansible-lint config
+extends: default
+
+rules:
+  braces:
+    max-spaces-inside: 1
+    level: error
+  brackets:
+    max-spaces-inside: 1
+    level: error
+  colons:
+    max-spaces-after: -1
+    level: error
+  commas:
+    max-spaces-after: -1
+    level: error
+  comments: disable
+  comments-indentation: disable
+  document-start: disable
+  empty-lines:
+    max: 3
+    level: error
+  hyphens:
+    level: error
+  indentation: disable
+  key-duplicates: enable
+  line-length: disable
+  new-line-at-end-of-file: disable
+  new-lines:
+    type: unix
+  trailing-spaces: disable
+  truthy: disable

Diff for: Makefile

@@ -8,3 +8,6 @@ install: clean
 clean:
 	rm -fr $(install_dir)
 
+
+test:
+	cd tests && ansible-playbook test.yml

Diff for: defaults/main.yml

@@ -1,10 +1,10 @@
 ---
-# defaults file for python
-version: 3.6.4
+# version and path
+version: 3.6.8
 version_short: "{{ version.split('.')[0] }}.{{ version.split('.')[1] }}"
 python_dir: /usr/local/opt/python{{ version }}
-python_exe: "{{ python_dir }}/bin/python{{ version_short }}"
-pip_exe: "{{ python_dir }}/bin/pip{{ version_short }}"
+python_bin: "{{ python_dir }}/bin/python{{ version_short }}"
+pip_bin: "{{ python_dir }}/bin/pip{{ version_short }}"
 
 checksum: null
 checksum_expect: "{{ checksum | default(checksum_defaults[version]) }}"
@@ -15,17 +15,22 @@ link: true
 python_link: "/usr/local/bin/python{{ version_short }}"
 pip_link:    "/usr/local/bin/pip{{ version_short }}"
 
-# source config
-source_url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}.tar.xz
-source_tar: /usr/local/src/Python-{{ version }}.tar.xz
+# pythn source 
+python_source_url_default: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}.tar.xz
+python_source_url: null
+python_source_local: /usr/local/src/Python-{{ version }}.tar.xz
 
 checksum_defaults:
   # python3.11
   3.11.2: a957cffb58a89303b62124896881950b
 
   # python3.10
   3.10.10: 7bf85df71bbe7f95e5370b983e6ae684
-  
+
+  3.9.7:  md5:fddb060b483bc01850a3f412eea1d954
+  3.8.12: md5:9dd8f82e586b776383c82e27923f8795
+  3.7.12: md5:352ea082224121a8b7bc4d6d06e5de39
+
   # python3.6
   3.6.5: md5:9f49654a4d6f733ff3284ab9d227e9fd
   3.6.4: md5:1325134dd525b4a2c3272a1a0214dd54

Diff for: tasks/install-pip.yml

@@ -1,11 +1,2 @@
-- name: Download get-pip.py
-  get_url:
-    url: https://bootstrap.pypa.io/get-pip.py
-    dest: /usr/local/src/get-pip.py
-    validate_certs: no
-  tags:
-    - download
-
-
-- name: Execute get-pip.py
-  shell: "{{ python_exe }} /usr/local/src/get-pip.py"
+- name: Upgrade pip
+  shell: "{{ python_bin }} -m pip install -U pip"

Diff for: tasks/install-python.yml

@@ -1,27 +1,37 @@
 ---
-- name: Download source of python-{{ version }} from {{ source_url }} to {{ source_tar }}
+- name: Download python-{{ version }} source from {{ python_source_url }} to {{ python_source_local }}
   get_url:
-    url: "{{ source_url }}"
-    dest: "{{ source_tar }}"
+    url: "{{ python_source_url | default(python_source_url_default, true) }}"
+    dest: "{{ python_source_local }}"
     validate_certs: no
     checksum: "{{ checksum_expect }}"
   tags:
     - download
 
 
-- name: Extract source from {{ source_tar }} to /usr/local/src/
+- name: Extract source from {{ python_source_local }} to /usr/local/src/
   unarchive:
-    src: "{{ source_tar }}"
+    src: "{{ python_source_local }}"
     dest: /usr/local/src/
     remote_src: True
 
 
+- name: Install requirements for python-{{ version }}
+  dnf:
+    name: "{{ item }}"
+    state: present
+  loop:
+    - "{{ require_packages[ansible_os_family] }}"
+  when: ansible_distribution == 'Alibaba'
+
+
 - name: Install requirements for python-{{ version }}
   package:
     name: "{{ item }}"
     state: present
-  with_items:
+  loop:
     - "{{ require_packages[ansible_os_family] }}"
+  when: ansible_distribution != 'Alibaba'
 
 
 - name: Compile and install python{{ version }}

Diff for: tasks/link.yml

@@ -1,7 +1,7 @@
 
 - name: Link to {{ python_link }}. force ? {{ 'yes' if reinstall else 'no' }}
   file:
-    src: "{{ python_exe }}"
+    src: "{{ python_bin }}"
     dest: "{{ python_link }}"
     state: link
     force: "{{ 'yes' if reinstall else 'no' }}"
@@ -12,7 +12,7 @@
 
 - name: Link to {{ pip_link }}. force ? {{ 'yes' if reinstall else 'no' }}
   file:
-    src: "{{ pip_exe }}"
+    src: "{{ pip_bin }}"
     dest: "{{ pip_link }}"
     state: link
     force: "{{ 'yes' if reinstall else 'no' }}"

Diff for: tasks/main.yml

@@ -7,7 +7,7 @@
 
 - name: Check status of python-{{ version }}
   stat:
-    path: "{{ python_exe }}"
+    path: "{{ python_bin }}"
   register: python
   tags:
     - link
@@ -16,7 +16,7 @@
 
 - name: Check status of pip-{{ version }}
   stat:
-    path: "{{ pip_exe }}"
+    path: "{{ pip_bin }}"
   register: pip
   tags:
     - link

Diff for: tests/inventory

@@ -1,2 +1,2 @@
-[localtest]
-127.0.0.1  ansible_user=vagrant ansible_ssh_port=2222
+localhost ansible_connection=local
+

Diff for: tests/requirements.yml

@@ -0,0 +1,2 @@
+- src: chrismeyersfsu.provision_docker
+  name: provision_docker

Diff for: tests/test.yml

@@ -1,13 +1,22 @@
 ---
-
-- name: Test install python.
-  hosts: "{{ host }}"
-  connection: paramiko
+- name: Bring up docker containers
+  hosts: localhost
+  gather_facts: false
+  vars:
+    inventory:
+      - name: hello
+        image: "chrismeyers/centos7"
   roles:
-    - { role: ../ansible-python, version: "2.7.14", checksum: "md5:1f6db41ad91d9eb0a6f0c769b8613c5b", link: false }
-    - { role: ../ansible-python, version: "3.4.8", checksum: "md5:15c44931f2274bfe928d53e0b675a4d8", link: false }
-    - { role: ../ansible-python, version: "3.5.5", checksum: "md5:f3763edf9824d5d3a15f5f646083b6e0", link: false }
-    - { role: ../ansible-python, version: "3.6.5", checksum: "md5:9f49654a4d6f733ff3284ab9d227e9fd", link: false }
+    - role: provision_docker
+      provision_docker_inventory: "{{ inventory }}"
+
 
-  # vars:
-  #   # source_url: http://127.0.0.1:8000/Python-{{ version }}.tar.xz
+- name: Run install python
+  hosts: docker_containers
+  vars:
+    python_source_url: http://127.0.0.1:8000/Python-{{ version }}.tar.xz
+  roles:
+    - { role: ../../ansible-python, version: "3.10.0", checksum: "md5:3e7035d272680f80e3ce4e8eb492d580", link: false }
+    - { role: ../../ansible-python, version: "3.9.7", checksum: "md5:fddb060b483bc01850a3f412eea1d954", link: false }
+    - { role: ../../ansible-python, version: "3.8.12", checksum: "md5:9dd8f82e586b776383c82e27923f8795", link: false }
+    - { role: ../../ansible-python, version: "3.7.12", checksum: "md5:352ea082224121a8b7bc4d6d06e5de39", link: false }

Diff for: vars/main.yml

@@ -1,6 +1,6 @@
 ---
 # vars file for python2
-version: 3.6.1
+version: 3.6.8
 checksum: null
 python_dir: /usr/local/opt/python{{ version }}
 reinstall: false