Add SLES tests (#536)

alessfg · web-flow · commit 1bcc46fe8433 · 2022-08-10T23:05:56.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@ BUG FIXES:
 
 TESTS:
 
+* Add SLES 15 to all Molecule tests.
 * Create downgrade and upgrade tests for NGINX Plus.
 * Remove Yamllint (Ansible Lint now incorporates Yamllint).
 * Skip Ansible Lint line length rule.
diff --git a/molecule/common/Dockerfile.j2 b/molecule/common/Dockerfile.j2
@@ -30,7 +30,7 @@ RUN \
     && yum clean all; \
   elif [ $(command -v zypper) ]; then \
     zypper refresh \
-    && zypper install -y bash iproute2 python3 sudo vim \
+    && zypper install -y bash iproute2 python3 sudo systemd systemd-sysvinit vim \
     && zypper clean -a; \
   elif [ $(command -v apk) ]; then \
     apk update \
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -14,6 +14,10 @@
       ansible.builtin.set_fact:
         version: -1.21.6-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
       when: ansible_facts['os_family'] == "RedHat"
+    - name: Set repo if SLES
+      ansible.builtin.set_fact:
+        version: =1.21.6-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
+      when: ansible_facts['os_family'] == "Suse"
   tasks:
     - name: Install NGINX
       ansible.builtin.include_role:
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -103,6 +103,13 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /sbin/init
+  - name: sles15
+    image: registry.suse.com/bci/bci-base:15.4
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
 provisioner:
   name: ansible
   playbooks:
diff --git a/molecule/downgrade/converge.yml b/molecule/downgrade/converge.yml
@@ -14,6 +14,10 @@
       ansible.builtin.set_fact:
         version: -1.21.6-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
       when: ansible_facts['os_family'] == "RedHat"
+    - name: Set repo if SLES
+      ansible.builtin.set_fact:
+        version: =1.21.6-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
+      when: ansible_facts['os_family'] == "Suse"
   tasks:
     - name: Install NGINX
       ansible.builtin.include_role:
diff --git a/molecule/downgrade/molecule.yml b/molecule/downgrade/molecule.yml
@@ -103,6 +103,13 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /sbin/init
+  - name: sles15
+    image: registry.suse.com/bci/bci-base:15.4
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
 provisioner:
   name: ansible
   playbooks:
diff --git a/molecule/downgrade_plus/converge.yml b/molecule/downgrade_plus/converge.yml
@@ -14,6 +14,10 @@
       ansible.builtin.set_fact:
         version: -26-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
       when: ansible_facts['os_family'] == "RedHat"
+    - name: Set repo if SLES
+      ansible.builtin.set_fact:
+        version: =26-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
+      when: ansible_facts['os_family'] == "Suse"
   tasks:
     - name: Install NGINX
       ansible.builtin.include_role:
diff --git a/molecule/downgrade_plus/molecule.yml b/molecule/downgrade_plus/molecule.yml
@@ -96,6 +96,13 @@ platforms: # Alpine 3.16 only has one version of NGINX Plus available (at the mo
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /sbin/init
+  - name: sles15
+    image: registry.suse.com/bci/bci-base:15.4
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
 provisioner:
   name: ansible
   playbooks:
diff --git a/molecule/module/molecule.yml b/molecule/module/molecule.yml
@@ -103,6 +103,13 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /sbin/init
+  - name: sles15
+    image: registry.suse.com/bci/bci-base:15.4
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
 provisioner:
   name: ansible
   playbooks:
diff --git a/molecule/plus/molecule.yml b/molecule/plus/molecule.yml
@@ -103,6 +103,13 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /sbin/init
+  - name: sles15
+    image: registry.suse.com/bci/bci-base:15.4
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
 provisioner:
   name: ansible
   playbooks:
diff --git a/molecule/source/molecule.yml b/molecule/source/molecule.yml
@@ -103,6 +103,13 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /sbin/init
+  - name: sles15
+    image: registry.suse.com/bci/bci-base:15.4
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
 provisioner:
   name: ansible
   playbooks:
diff --git a/molecule/uninstall/molecule.yml b/molecule/uninstall/molecule.yml
@@ -103,6 +103,13 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /sbin/init
+  - name: sles15
+    image: registry.suse.com/bci/bci-base:15.4
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
 provisioner:
   name: ansible
   playbooks:
diff --git a/molecule/uninstall_plus/molecule.yml b/molecule/uninstall_plus/molecule.yml
@@ -89,6 +89,13 @@ platforms: # Ubuntu bionic and Debian buster result in a segmentation fault erro
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /sbin/init
+  - name: sles15
+    image: registry.suse.com/bci/bci-base:15.4
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
 provisioner:
   name: ansible
   playbooks:
diff --git a/molecule/upgrade/molecule.yml b/molecule/upgrade/molecule.yml
@@ -103,6 +103,13 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /sbin/init
+  - name: sles15
+    image: registry.suse.com/bci/bci-base:15.4
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
 provisioner:
   name: ansible
   playbooks:
diff --git a/molecule/upgrade/prepare.yml b/molecule/upgrade/prepare.yml
@@ -14,6 +14,10 @@
       ansible.builtin.set_fact:
         version: -1.21.6-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
       when: ansible_facts['os_family'] == "RedHat"
+    - name: Set repo if SLES
+      ansible.builtin.set_fact:
+        version: =1.21.6-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
+      when: ansible_facts['os_family'] == "Suse"
   tasks:
     - name: Install NGINX
       ansible.builtin.include_role:
diff --git a/molecule/upgrade_plus/molecule.yml b/molecule/upgrade_plus/molecule.yml
@@ -96,6 +96,13 @@ platforms: # Alpine 3.16 only has one version of NGINX Plus available (at the mo
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /sbin/init
+  - name: sles15
+    image: registry.suse.com/bci/bci-base:15.4
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /usr/sbin/init
 provisioner:
   name: ansible
   playbooks:
diff --git a/molecule/upgrade_plus/prepare.yml b/molecule/upgrade_plus/prepare.yml
@@ -32,6 +32,10 @@
       ansible.builtin.set_fact:
         version: -26-1.{{ (ansible_facts['distribution'] == "Amazon") | ternary('amzn2', ('el' + ansible_facts['distribution_major_version'] | string)) }}.ngx
       when: ansible_facts['os_family'] == "RedHat"
+    - name: Set repo if SLES
+      ansible.builtin.set_fact:
+        version: =26-1.sles{{ ansible_facts['distribution_major_version'] }}.ngx
+      when: ansible_facts['os_family'] == "Suse"
   tasks:
     - name: Install NGINX
       ansible.builtin.include_role:
diff --git a/tasks/config/setup-logrotate.yml b/tasks/config/setup-logrotate.yml
@@ -16,16 +16,10 @@
     state: present
   when: ansible_facts['os_family'] == "RedHat"
 
-- name: (SLES) Set up logrotate
-  block:
-    - name: (SLES) Configure logrotate repository
-      community.general.zypper_repository:
-        repo: https://download.opensuse.org/repositories/openSUSE:Leap:42.1/standard/openSUSE:Leap:42.1.repo
-
-    - name: (SLES) Install Logrotate
-      community.general.zypper:
-        name: logrotate
-        state: present
+- name: (SLES) Install Logrotate
+  community.general.zypper:
+    name: logrotate
+    state: present
   when: ansible_facts['os_family'] == "Suse"
 
 - name: Create logrotate config
diff --git a/tasks/opensource/install-source.yml b/tasks/opensource/install-source.yml
diff --git a/tasks/opensource/install-suse.yml b/tasks/opensource/install-suse.yml
diff --git a/tasks/plus/install-suse.yml b/tasks/plus/install-suse.yml
diff --git a/tasks/plus/setup-license.yml b/tasks/plus/setup-license.yml
diff --git a/vars/main.yml b/vars/main.yml
