From b68c3ecffb7d0d0c357e03addf37e0ea2bac86d3 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 6 Aug 2024 10:45:08 +0200 Subject: [PATCH] Delete legacy nodesets We don't use them anymore, we can delete them. --- spec/acceptance/nodesets/centos-6.yml | 22 --------------- spec/acceptance/nodesets/debian-10.yml | 28 -------------------- spec/acceptance/nodesets/debian-11.yml | 28 -------------------- spec/acceptance/nodesets/debian-7.Dockerfile | 13 --------- spec/acceptance/nodesets/debian-7.yml | 21 --------------- spec/acceptance/nodesets/debian-8.yml | 22 --------------- spec/acceptance/nodesets/debian-9.yml | 25 ----------------- spec/acceptance/nodesets/ubuntu-14.04.yml | 18 ------------- spec/acceptance/nodesets/ubuntu-16.04.yml | 17 ------------ spec/acceptance/nodesets/ubuntu-18.04.yml | 28 -------------------- spec/acceptance/nodesets/ubuntu-20.04.yml | 28 -------------------- spec/acceptance/nodesets/ubuntu-22.04.yml | 28 -------------------- 12 files changed, 278 deletions(-) delete mode 100644 spec/acceptance/nodesets/centos-6.yml delete mode 100644 spec/acceptance/nodesets/debian-10.yml delete mode 100644 spec/acceptance/nodesets/debian-11.yml delete mode 100644 spec/acceptance/nodesets/debian-7.Dockerfile delete mode 100644 spec/acceptance/nodesets/debian-7.yml delete mode 100644 spec/acceptance/nodesets/debian-8.yml delete mode 100644 spec/acceptance/nodesets/debian-9.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-14.04.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-16.04.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-18.04.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-20.04.yml delete mode 100644 spec/acceptance/nodesets/ubuntu-22.04.yml diff --git a/spec/acceptance/nodesets/centos-6.yml b/spec/acceptance/nodesets/centos-6.yml deleted file mode 100644 index 5c85ec27..00000000 --- a/spec/acceptance/nodesets/centos-6.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# This file is managed via modulesync -# https://github.com/voxpupuli/modulesync -# https://github.com/voxpupuli/modulesync_config -HOSTS: - centos-6-x64: - platform: el-6-x86_64 - hypervisor: docker - image: centos:6 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'rm -rf /var/run/network/*' - - 'yum install -y crontabs initscripts iproute openssl sysvinit-tools tar wget which' - - 'rm /etc/init/tty.conf' - # for local development - - 'echo "MaxAuthTries 100" >> /etc/ssh/sshd_config' -CONFIG: - trace_limit: 200 - masterless: true -... -# vim: syntax=yaml \ No newline at end of file diff --git a/spec/acceptance/nodesets/debian-10.yml b/spec/acceptance/nodesets/debian-10.yml deleted file mode 100644 index d57ba38b..00000000 --- a/spec/acceptance/nodesets/debian-10.yml +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - debian-10-x64: - platform: debian-10-amd64 - hypervisor: docker - image: debian:10 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - # ensure that upstart is booting correctly in the container - - 'apt-get update && apt-get install -y wget' - # for local development - - 'echo "MaxAuthTries 100" >> /etc/ssh/sshd_config' - # exportfs does not work on overlayfs - mounting local filesystem - mount_folders: - export: - host_path: .spec/fixtures/export - container_path: /export - data_folder: - host_path: .spec/fixtures/export/data_folder - container_path: /export/data_folder - homeexport: - host_path: .spec/fixtures/export/homeexport - container_path: /export/homeexport -CONFIG: - type: foss - trace_limit: 200 -... -# vim: syntax=yaml diff --git a/spec/acceptance/nodesets/debian-11.yml b/spec/acceptance/nodesets/debian-11.yml deleted file mode 100644 index 79fdd760..00000000 --- a/spec/acceptance/nodesets/debian-11.yml +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - debian-11-x64: - platform: debian-11-amd64 - hypervisor: docker - image: debian:11 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - # ensure that upstart is booting correctly in the container - - 'apt-get update && apt-get install -y wget' - # for local development - - 'echo "MaxAuthTries 100" >> /etc/ssh/sshd_config' - # exportfs does not work on overlayfs - mounting local filesystem - mount_folders: - export: - host_path: .spec/fixtures/export - container_path: /export - data_folder: - host_path: .spec/fixtures/export/data_folder - container_path: /export/data_folder - homeexport: - host_path: .spec/fixtures/export/homeexport - container_path: /export/homeexport -CONFIG: - type: foss - trace_limit: 200 -... -# vim: syntax=yaml diff --git a/spec/acceptance/nodesets/debian-7.Dockerfile b/spec/acceptance/nodesets/debian-7.Dockerfile deleted file mode 100644 index 9fb56016..00000000 --- a/spec/acceptance/nodesets/debian-7.Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM debian:7 -ENV container docker -RUN echo "deb http://archive.debian.org/debian/ wheezy main contrib non-free" > /etc/apt/sources.list -RUN apt-get update -RUN apt-get install -y openssh-server openssh-client curl ntpdate lsb-release cron locales-all net-tools wget -RUN mkdir -p /var/run/sshd -RUN echo root:root | chpasswd -RUN sed -ri 's/^#?PermitRootLogin .*/PermitRootLogin yes/' /etc/ssh/sshd_config -RUN sed -ri 's/^#?PasswordAuthentication .*/PasswordAuthentication yes/' /etc/ssh/sshd_config -RUN sed -ri 's/^#?UseDNS .*/UseDNS no/' /etc/ssh/sshd_config -RUN echo "MaxAuthTries 100" >> /etc/ssh/sshd_config -EXPOSE 22 -CMD ["/sbin/init"] \ No newline at end of file diff --git a/spec/acceptance/nodesets/debian-7.yml b/spec/acceptance/nodesets/debian-7.yml deleted file mode 100644 index a7b3840d..00000000 --- a/spec/acceptance/nodesets/debian-7.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -# This file is managed via modulesync -# https://github.com/voxpupuli/modulesync -# https://github.com/voxpupuli/modulesync_config -HOSTS: - debian-7-x64: - platform: debian-7-amd64 - hypervisor: docker - #image: debian:7 - dockerfile: spec/acceptance/nodesets/debian-7.Dockerfile - docker_preserve_image: true - tag: debian:7-a - docker_cmd: '["/sbin/init"]' - docker_image_commands: - # for local development - - 'echo "MaxAuthTries 100" >> /etc/ssh/sshd_config' -CONFIG: - trace_limit: 200 - masterless: true - type: foss -... \ No newline at end of file diff --git a/spec/acceptance/nodesets/debian-8.yml b/spec/acceptance/nodesets/debian-8.yml deleted file mode 100644 index b35c1794..00000000 --- a/spec/acceptance/nodesets/debian-8.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# This file is managed via modulesync -# https://github.com/voxpupuli/modulesync -# https://github.com/voxpupuli/modulesync_config -HOSTS: - debian-8-x64: - platform: debian-8-amd64 - hypervisor: docker - image: debian:8 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - - 'apt-get update && apt-get install -y cron locales-all net-tools wget' - - 'rm -f /usr/sbin/policy-rc.d' - - 'systemctl mask getty@tty1.service getty-static.service' - # for local development - - 'echo "MaxAuthTries 100" >> /etc/ssh/sshd_config' -CONFIG: - trace_limit: 200 - masterless: true -... -# vim: syntax=yaml \ No newline at end of file diff --git a/spec/acceptance/nodesets/debian-9.yml b/spec/acceptance/nodesets/debian-9.yml deleted file mode 100644 index ae45b04d..00000000 --- a/spec/acceptance/nodesets/debian-9.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -# This file is managed via modulesync -# https://github.com/voxpupuli/modulesync -# https://github.com/voxpupuli/modulesync_config -HOSTS: - debian-9-x64: - platform: debian-9-amd64 - hypervisor: docker - image: debian:9 - docker_preserve_image: true - docker_cmd: ["/sbin/init"] - docker_image_commands: - - 'apt-get update && apt-get install -y cron locales-all net-tools wget init' - - 'rm -f /usr/sbin/policy-rc.d' - - 'systemctl mask getty@tty1.service getty-static.service' - - 'echo "MaxAuthTries 100" >> /etc/ssh/sshd_config' - - 'sed "s@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g" -i /etc/pam.d/sshd' - - 'echo "export VISIBLE=now" >> /etc/profile' - -CONFIG: - trace_limit: 200 - masterless: true - log_level: verbose -... -# vim: syntax=yaml diff --git a/spec/acceptance/nodesets/ubuntu-14.04.yml b/spec/acceptance/nodesets/ubuntu-14.04.yml deleted file mode 100644 index 014b9056..00000000 --- a/spec/acceptance/nodesets/ubuntu-14.04.yml +++ /dev/null @@ -1,18 +0,0 @@ -HOSTS: - ubuntu-1404-x64: - platform: ubuntu-14.04-amd64 - hypervisor: docker - image: ubuntu:14.04 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - # ensure that upstart is booting correctly in the container - #- 'apt-get update && locale-gen en_US.UTF-8' - - 'rm /usr/sbin/policy-rc.d && rm /sbin/initctl && dpkg-divert --rename --remove /sbin/initctl && apt-get update && apt-get install -y net-tools wget && locale-gen en_US.UTF-8' - # for local development - - 'echo "MaxAuthTries 100" >> /etc/ssh/sshd_config' -CONFIG: - type: foss - trace_limit: 200 -... -# vim: syntax=yaml \ No newline at end of file diff --git a/spec/acceptance/nodesets/ubuntu-16.04.yml b/spec/acceptance/nodesets/ubuntu-16.04.yml deleted file mode 100644 index 20ca6398..00000000 --- a/spec/acceptance/nodesets/ubuntu-16.04.yml +++ /dev/null @@ -1,17 +0,0 @@ -HOSTS: - ubuntu-1604-x64: - platform: ubuntu-16.04-amd64 - hypervisor: docker - image: ubuntu:16.04 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - # ensure that upstart is booting correctly in the container - - 'apt-get update && apt-get install locales && locale-gen en_US.UTF-8' - # for local development - - 'echo "MaxAuthTries 100" >> /etc/ssh/sshd_config' -CONFIG: - type: foss - trace_limit: 200 -... -# vim: syntax=yaml \ No newline at end of file diff --git a/spec/acceptance/nodesets/ubuntu-18.04.yml b/spec/acceptance/nodesets/ubuntu-18.04.yml deleted file mode 100644 index f6c4e402..00000000 --- a/spec/acceptance/nodesets/ubuntu-18.04.yml +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - ubuntu-1804-x64: - platform: ubuntu-18.04-amd64 - hypervisor: docker - image: ubuntu:bionic-20220531 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - # ensure that upstart is booting correctly in the container - - 'apt-get update && apt-get install -y init distro-info-data locales lsb-release && locale-gen en_US.UTF-8' - # for local development - - 'echo "MaxAuthTries 100" >> /etc/ssh/sshd_config' - # exportfs does not work on overlayfs - mounting local filesystem - mount_folders: - export: - host_path: .spec/fixtures/export - container_path: /export - data_folder: - host_path: .spec/fixtures/export/data_folder - container_path: /export/data_folder - homeexport: - host_path: .spec/fixtures/export/homeexport - container_path: /export/homeexport -CONFIG: - type: foss - trace_limit: 200 -... -# vim: syntax=yaml diff --git a/spec/acceptance/nodesets/ubuntu-20.04.yml b/spec/acceptance/nodesets/ubuntu-20.04.yml deleted file mode 100644 index 1f621f4c..00000000 --- a/spec/acceptance/nodesets/ubuntu-20.04.yml +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - ubuntu-2004-x64: - platform: ubuntu-20.04-amd64 - hypervisor: docker - image: ubuntu:20.04 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - # ensure that upstart is booting correctly in the container - - 'apt-get update && apt-get install -y distro-info-data locales lsb-release && locale-gen en_US.UTF-8' - # for local development - - 'echo "MaxAuthTries 100" >> /etc/ssh/sshd_config' - # exportfs does not work on overlayfs - mounting local filesystem - mount_folders: - export: - host_path: .spec/fixtures/export - container_path: /export - data_folder: - host_path: .spec/fixtures/export/data_folder - container_path: /export/data_folder - homeexport: - host_path: .spec/fixtures/export/homeexport - container_path: /export/homeexport -CONFIG: - type: foss - trace_limit: 200 -... -# vim: syntax=yaml diff --git a/spec/acceptance/nodesets/ubuntu-22.04.yml b/spec/acceptance/nodesets/ubuntu-22.04.yml deleted file mode 100644 index 06760632..00000000 --- a/spec/acceptance/nodesets/ubuntu-22.04.yml +++ /dev/null @@ -1,28 +0,0 @@ -HOSTS: - ubuntu-2204-x64: - platform: ubuntu-22.04-amd64 - hypervisor: docker - image: ubuntu:22.04 - docker_preserve_image: true - docker_cmd: '["/sbin/init"]' - docker_image_commands: - # ensure that upstart is booting correctly in the container - - 'apt-get update && apt-get install -y distro-info-data locales lsb-release && locale-gen en_US.UTF-8' - # for local development - - 'echo "MaxAuthTries 100" >> /etc/ssh/sshd_config' - # exportfs does not work on overlayfs - mounting local filesystem - mount_folders: - export: - host_path: .spec/fixtures/export - container_path: /export - data_folder: - host_path: .spec/fixtures/export/data_folder - container_path: /export/data_folder - homeexport: - host_path: .spec/fixtures/export/homeexport - container_path: /export/homeexport -CONFIG: - type: foss - trace_limit: 200 -... -# vim: syntax=yaml