Nap 31 updates (#76)

* support for 20.04

* add focal to molecule stacks

* add missing command param

* temporarily limit test platforms for advanced scenario

* add alpine back to advanced

* add centos7 back to advanced scenario

* add debian stretch back to advanced scenario

* removing debian stretch from advanced scenario

Author: aknot242

CHANGELOG.md

@@ -18,6 +18,7 @@ FEATURES:
 *   You can now specify an `nginx_app_protect_repository` for NGINX App Protect.
 *   You can now specify an `nginx_app_protect_security_updates_repository` for NGINX App Protect signatures and threat campaigns packages.
 *   You can now specify NGINX App Protect signatures and threat campaigns package versions using the `nginx_app_protect_signatures_version` and `nginx_app_protect_threat_campaigns_version` variables.
+*   Add support for Ubuntu 20.04 available starting with App Protect 3.1.
 
 ENHANCEMENTS:
 

README.md

@@ -67,6 +67,7 @@ Debian:
   - 9
 Ubuntu:
   - 18.04
+  - 20.04
 ```
 
 ## Role Variables

meta/main.yml

@@ -24,6 +24,7 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - bionic
+        - focal
 
   galaxy_tags:
     - waf

molecule/advanced/molecule.yml

@@ -50,8 +50,8 @@ platforms:
       - nap
     networks:
       - name: molecule-test
-  - name: debian-stretch
-    image: debian:stretch-slim
+  - name: ubuntu-focal
+    image: ubuntu:focal
     dockerfile: ../Dockerfile.j2
     privileged: true
     volumes:

molecule/default/molecule.yml

@@ -27,6 +27,13 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/sbin/init"
+  - name: ubuntu-focal
+    image: ubuntu:focal
+    dockerfile: ../Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
   - name: debian-stretch
     image: debian:stretch-slim
     dockerfile: ../Dockerfile.j2

molecule/specific-version/molecule.yml

@@ -27,6 +27,13 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/sbin/init"
+  - name: ubuntu-focal
+    image: ubuntu:focal
+    dockerfile: ../Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
   - name: debian-stretch
     image: debian:stretch-slim
     dockerfile: ../Dockerfile.j2

vars/main.yml

@@ -12,7 +12,7 @@ nginx_app_protect_linux_families:
     "10",
   ]
   ubuntu: [
-    "18.04",
+    "18.04", "20.04",
   ]
   alpine: [
     "3.10",