Update packages and list of supported platforms (#350)

* Update Molecule to `3.2.0` and Docker Python SDK to `4.4.0`. * Add Alpine `3.12` to supported platforms for NGINX Plus. * Remove Alpine `3.9` and CentOS/RHEL `6` from supported platforms due to EOL.
2020-12-09 15:07:24 +01:00 · 2020-12-09 15:07:24 +01:00 · c2b8eb71a4
commit c2b8eb71a4
parent 6645e0856a
17 changed files with 24 additions and 98 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,13 +5,16 @@
 *~
 \#*

-# OS Specific
+# OS Specific #
+###############
 Thumbs.db
 .DS_Store
 .vscode

-# Ansible specific
+# Ansible specific #
+####################
 *.retry

-# Python specific
+# Python specific #
+###################
 __pycache__
--- a/.travis.yml
+++ b/.travis.yml
@ -73,8 +73,8 @@ install:
  - pip install ansible==2.10.3
  - pip install ansible-lint==4.3.7
  - pip install yamllint==1.25.0
-  - pip install 'molecule[docker]'==3.1.5
-  - pip install docker==4.3.1
+  - pip install 'molecule[docker]'==3.2.0
+  - pip install docker==4.4.0
 script:
  - travis_wait 50 molecule test -s $scenario
 notifications:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,13 @@
 # Changelog

+## 0.18.2 (Unreleased)
+
+ENHANCEMENTS:
+
+*   Update Molecule to `3.2.0` and Docker Python SDK to `4.4.0`.
+*   Add Alpine `3.12` to supported platforms for NGINX Plus.
+*   Remove Alpine `3.9` and CentOS/RHEL `6` from supported platforms due to EOL.
+
 ## 0.18.1 (November 17, 2020)

 ENHANCEMENTS:
--- a/README.md
+++ b/README.md
@ -47,19 +47,16 @@ The NGINX Ansible role supports all platforms supported by [NGINX Open Source](h

 ```yaml
 Alpine:
-  - 3.9
  - 3.10
  - 3.11
  - 3.12
 CentOS:
-  - 6
  - 7.4+
  - 8
 Debian:
  - stretch
  - buster
 Red Hat:
-  - 6
  - 7.4+
  - 8
 SUSE/SLES:
@ -76,15 +73,14 @@ Ubuntu:

 ```yaml
 Alpine:
-  - 3.9
  - 3.10
  - 3.11
+  - 3.12
 Amazon Linux:
  - 2018.03
 Amazon Linux 2:
  - any
 CentOS:
-  - 6.5+
  - 7.4+
  - 8
 Debian:
@ -97,7 +93,6 @@ Oracle Linux:
  - 6.5+
  - 7.4+
 Red Hat:
-  - 6.5+
  - 7.4+
  - 8
 SUSE/SLES:
@ -116,13 +111,11 @@ Ubuntu:
 Amazon Linux:
  - 2017.09
 CentOS:
-  - 6
  - 7
 Debian:
  - jessie
  - stretch
 Red Hat:
-  - 6
  - 7
 Ubuntu:
  - xenial
--- a/meta/main.yml
+++ b/meta/main.yml
@ -25,7 +25,6 @@ galaxy_info:
        - buster
    - name: EL
      versions:
-        - 6
        - 7
        - 8
    - name: FreeBSD
--- a/molecule/default_alpine/molecule.yml
+++ b/molecule/default_alpine/molecule.yml
@ -6,13 +6,6 @@ lint: |
  yamllint .
  ansible-lint --force-color
 platforms:
-  - name: alpine-3.9
-    image: alpine:3.9
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
  - name: alpine-3.10
    image: alpine:3.10
    dockerfile: ../common/Dockerfile.j2
--- a/molecule/default_centos/molecule.yml
+++ b/molecule/default_centos/molecule.yml
@ -6,13 +6,6 @@ lint: |
  yamllint .
  ansible-lint --force-color
 platforms:
-  - name: centos-6
-    image: centos:6
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
  - name: centos-7
    image: centos:7
    dockerfile: ../common/Dockerfile.j2
--- a/molecule/module_alpine/molecule.yml
+++ b/molecule/module_alpine/molecule.yml
@ -6,13 +6,6 @@ lint: |
  yamllint .
  ansible-lint --force-color
 platforms:
-  - name: alpine-3.9
-    image: alpine:3.9
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
  - name: alpine-3.10
    image: alpine:3.10
    dockerfile: ../common/Dockerfile.j2
--- a/molecule/module_centos/molecule.yml
+++ b/molecule/module_centos/molecule.yml
@ -6,13 +6,6 @@ lint: |
  yamllint .
  ansible-lint --force-color
 platforms:
-  - name: centos-6
-    image: centos:6
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
  - name: centos-7
    image: centos:7
    dockerfile: ../common/Dockerfile.j2
--- a/molecule/plus_alpine/molecule.yml
+++ b/molecule/plus_alpine/molecule.yml
@ -6,13 +6,6 @@ lint: |
  yamllint .
  ansible-lint --force-color
 platforms:
-  - name: alpine-3.9
-    image: alpine:3.9
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
  - name: alpine-3.10
    image: python:alpine3.10
    dockerfile: ../common/Dockerfile.j2
@ -27,6 +20,13 @@ platforms:
    volumes:
      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
    command: "/sbin/init"
+  - name: alpine-3.12
+    image: alpine:3.12
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
 provisioner:
  name: ansible
  playbooks:
--- a/molecule/plus_centos/molecule.yml
+++ b/molecule/plus_centos/molecule.yml
@ -6,13 +6,6 @@ lint: |
  yamllint .
  ansible-lint --force-color
 platforms:
-  - name: centos-6
-    image: centos:6
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
  - name: centos-7
    image: centos:7
    dockerfile: ../common/Dockerfile.j2
--- a/molecule/source_alpine/molecule.yml
+++ b/molecule/source_alpine/molecule.yml
@ -6,13 +6,6 @@ lint: |
  yamllint .
  ansible-lint --force-color
 platforms:
-  - name: alpine-3.9
-    image: alpine:3.9
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
  - name: alpine-3.10
    image: alpine:3.10
    dockerfile: ../common/Dockerfile.j2
--- a/molecule/source_centos/molecule.yml
+++ b/molecule/source_centos/molecule.yml
@ -6,13 +6,6 @@ lint: |
  yamllint .
  ansible-lint --force-color
 platforms:
-  - name: centos-6
-    image: centos:6
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
  - name: centos-7
    image: centos:7
    dockerfile: ../common/Dockerfile.j2
--- a/molecule/stable_push_alpine/molecule.yml
+++ b/molecule/stable_push_alpine/molecule.yml
@ -6,13 +6,6 @@ lint: |
  yamllint .
  ansible-lint --force-color
 platforms:
-  - name: alpine-3.9
-    image: alpine:3.9
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
  - name: alpine-3.10
    image: alpine:3.10
    dockerfile: ../common/Dockerfile.j2
--- a/molecule/stable_push_centos/molecule.yml
+++ b/molecule/stable_push_centos/molecule.yml
@ -6,13 +6,6 @@ lint: |
  yamllint .
  ansible-lint --force-color
 platforms:
-  - name: centos-6
-    image: centos:6
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
  - name: centos-7
    image: centos:7
    dockerfile: ../common/Dockerfile.j2
--- a/molecule/template_alpine/molecule.yml
+++ b/molecule/template_alpine/molecule.yml
@ -6,13 +6,6 @@ lint: |
  yamllint .
  ansible-lint --force-color
 platforms:
-  - name: alpine-3.9
-    image: alpine:3.9
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
  - name: alpine-3.10
    image: alpine:3.10
    dockerfile: ../common/Dockerfile.j2
--- a/molecule/template_centos/molecule.yml
+++ b/molecule/template_centos/molecule.yml
@ -6,13 +6,6 @@ lint: |
  yamllint .
  ansible-lint --force-color
 platforms:
-  - name: centos-6
-    image: centos:6
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
  - name: centos-7
    image: centos:7
    dockerfile: ../common/Dockerfile.j2