Skip to content

Removing rhel7 based distros from testing #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -169,16 +169,12 @@ This Ansible role supports all platforms supported by [NGINX Management Suite](h
```yaml
Amazon Linux 2:
- any
CentOS:
- 7.4+
Debian:
- buster (10)
- bullseye (11)
Oracle Linux:
- 7.4+
- 8
Red Hat:
- 7.4+
- 8
- 9
Ubuntu:
Expand Down
18 changes: 0 additions & 18 deletions molecule/all-nms-modules-set1/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,6 @@
driver:
name: docker
platforms:
- name: centos-7
image: centos:7
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: rhel-7
image: registry.access.redhat.com/ubi7/ubi:7.9
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: rhel-8
image: redhat/ubi8:8.7
platform: x86_64
Expand Down
9 changes: 0 additions & 9 deletions molecule/all-nms-modules-set2/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,6 @@ platforms:
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: oraclelinux-7
image: oraclelinux:7
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: oraclelinux-8
image: oraclelinux:8
platform: x86_64
Expand Down
24 changes: 11 additions & 13 deletions molecule/common/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,17 @@ ENV {{ var }} {{ value }}

RUN \
if [ $(command -v apt-get) ]; then \
apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y aptitude bash curl dirmngr iproute2 python3 python3-apt procps sudo systemd systemd-sysv vim \
&& apt-get clean; \
apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y aptitude bash curl dirmngr iproute2 python3 python3-apt procps sudo systemd systemd-sysv vim \
&& apt-get clean; \
elif [ $(command -v dnf) ]; then \
dnf makecache \
&& dnf --assumeyes install bash iproute sudo /usr/bin/dnf-3 /usr/bin/python3 /usr/bin/python3-config vim \
&& dnf clean all; \
dnf makecache \
&& dnf --assumeyes install bash iproute sudo /usr/bin/dnf-3 /usr/bin/python3 /usr/bin/python3-config vim \
&& dnf clean all; \
elif [ $(command -v yum) ]; then \
yum makecache fast \
&& yum install -y bash iproute initscripts sudo /usr/bin/python /usr/bin/python2-config vim yum-plugin-ovl \
&& yum install -y http://mirror.centos.org/centos/7/os/x86_64/Packages/yum-plugin-copr-1.1.31-54.el7_8.noarch.rpm http://mirror.centos.org/centos/7/os/x86_64/Packages/libseccomp-2.3.1-4.el7.x86_64.rpm \
&& yum copr enable -y jsynacek/systemd-backports-for-centos-7 \
&& yum update --disableplugin=priorities -y systemd \
&& sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf \
&& yum clean all; \
yum makecache fast \
&& yum install -y bash iproute initscripts sudo /usr/bin/python /usr/bin/python2-config vim yum-plugin-ovl \
&& yum update --disableplugin=priorities -y systemd \
&& sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf \
&& yum clean all; \
fi
18 changes: 0 additions & 18 deletions molecule/default-set1/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,6 @@
driver:
name: docker
platforms:
- name: centos-7
image: centos:7
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: rhel-7
image: registry.access.redhat.com/ubi7/ubi:7.9
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: rhel-8
image: redhat/ubi8:8.7
platform: x86_64
Expand Down
9 changes: 0 additions & 9 deletions molecule/default-set2/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,6 @@ platforms:
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: oraclelinux-7
image: oraclelinux:7
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: oraclelinux-8
image: oraclelinux:8
platform: x86_64
Expand Down
18 changes: 0 additions & 18 deletions molecule/ga-nms-modules-set1/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,6 @@
driver:
name: docker
platforms:
- name: centos-7
image: centos:7
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: rhel-7
image: registry.access.redhat.com/ubi7/ubi:7.9
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: rhel-8
image: redhat/ubi8:8.7
platform: x86_64
Expand Down
9 changes: 0 additions & 9 deletions molecule/ga-nms-modules-set2/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,6 @@ platforms:
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: oraclelinux-7
image: oraclelinux:7
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: oraclelinux-8
image: oraclelinux:8
platform: x86_64
Expand Down
45 changes: 0 additions & 45 deletions molecule/plus-count-rhel/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,6 @@ platforms:
- name: bridge
- name: hostname_network
command: /usr/sbin/init
- name: oraclelinux-7
image: oraclelinux:7
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
groups:
- data
- data_r26
networks:
- name: bridge
- name: hostname_network
command: /usr/sbin/init
- name: oraclelinux-8
image: oraclelinux:8
platform: x86_64
Expand All @@ -69,36 +54,6 @@ platforms:
- name: bridge
- name: hostname_network
command: /usr/sbin/init
- name: centos-7
image: centos:7
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
groups:
- data
- data_r26
networks:
- name: bridge
- name: hostname_network
command: /usr/sbin/init
- name: rhel-7
image: registry.access.redhat.com/ubi7/ubi:7.9
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
groups:
- data
- data_r26
networks:
- name: bridge
- name: hostname_network
command: /usr/sbin/init
- name: rhel-8
image: redhat/ubi8:8.7
platform: x86_64
Expand Down
45 changes: 0 additions & 45 deletions molecule/plus-count-ubuntu/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,6 @@ platforms:
- name: bridge
- name: hostname_network
command: /usr/sbin/init
- name: oraclelinux-7
image: oraclelinux:7
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
groups:
- data
- data_r26
networks:
- name: bridge
- name: hostname_network
command: /usr/sbin/init
- name: oraclelinux-8
image: oraclelinux:8
platform: x86_64
Expand All @@ -69,36 +54,6 @@ platforms:
- name: bridge
- name: hostname_network
command: /usr/sbin/init
- name: centos-7
image: centos:7
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
groups:
- data
- data_r26
networks:
- name: bridge
- name: hostname_network
command: /usr/sbin/init
- name: rhel-7
image: registry.access.redhat.com/ubi7/ubi:7.9
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
groups:
- data
- data_r26
networks:
- name: bridge
- name: hostname_network
command: /usr/sbin/init
- name: rhel-8
image: redhat/ubi8:8.7
platform: x86_64
Expand Down
15 changes: 0 additions & 15 deletions molecule/plus-count-upgrade/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,6 @@ platforms:
- name: bridge
- name: hostname_network
command: /usr/sbin/init
- name: centos-7
image: centos:7
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
groups:
- data
- data_r27
networks:
- name: bridge
- name: hostname_network
command: /usr/sbin/init
- name: rhel-9
image: redhat/ubi9:9.1.0
platform: x86_64
Expand Down
18 changes: 0 additions & 18 deletions molecule/plus-set1/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,6 @@
driver:
name: docker
platforms:
- name: centos-7
image: centos:7
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: rhel-7
image: registry.access.redhat.com/ubi7/ubi:7.9
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: rhel-8
image: redhat/ubi8:8.7
platform: x86_64
Expand Down
9 changes: 0 additions & 9 deletions molecule/plus-set2/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,6 @@ platforms:
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: oraclelinux-7
image: oraclelinux:7
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: oraclelinux-8
image: oraclelinux:8
platform: x86_64
Expand Down
18 changes: 0 additions & 18 deletions molecule/service-stopped-set1/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,6 @@
driver:
name: docker
platforms:
- name: centos-7
image: centos:7
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: rhel-7
image: registry.access.redhat.com/ubi7/ubi:7.9
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: rhel-8
image: redhat/ubi8:8.7
platform: x86_64
Expand Down
9 changes: 0 additions & 9 deletions molecule/service-stopped-set2/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,6 @@ platforms:
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: oraclelinux-7
image: oraclelinux:7
platform: x86_64
dockerfile: ../common/Dockerfile.j2
privileged: true
cgroupns_mode: host
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
command: /usr/sbin/init
- name: oraclelinux-8
image: oraclelinux:8
platform: x86_64
Expand Down
Loading
Loading