From d324b2dbd7b25bc6eafae4886c6bcc73b7bea0be Mon Sep 17 00:00:00 2001 From: Tomas Krizek <tomas.krizek@nic.cz> Date: Mon, 20 May 2019 16:15:01 +0200 Subject: [PATCH] distro/tests: remove pkgtests for rolling distros --- distro/tests/arch/Vagrantfile | 21 ---- distro/tests/knot-resolver-test.yaml | 148 --------------------------- distro/tests/tumbleweed/Vagrantfile | 21 ---- distro/tests/tumbleweed/ansible.cfg | 1 - 4 files changed, 191 deletions(-) delete mode 100644 distro/tests/arch/Vagrantfile delete mode 100644 distro/tests/knot-resolver-test.yaml delete mode 100644 distro/tests/tumbleweed/Vagrantfile delete mode 120000 distro/tests/tumbleweed/ansible.cfg diff --git a/distro/tests/arch/Vagrantfile b/distro/tests/arch/Vagrantfile deleted file mode 100644 index fdc3e7834..000000000 --- a/distro/tests/arch/Vagrantfile +++ /dev/null @@ -1,21 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : -# - -Vagrant.configure(2) do |config| - - config.vm.box = "archlinux/archlinux" - config.vm.synced_folder ".", "/vagrant", disabled: true - - config.vm.define "arch_knot-resolver" do |machine| - machine.vm.provision "ansible" do |ansible| - ansible.playbook = "../knot-resolver-test.yaml" - end - end - - config.vm.provider :libvirt do |libvirt| - libvirt.cpus = 1 - libvirt.memory = 512 - end - -end diff --git a/distro/tests/knot-resolver-test.yaml b/distro/tests/knot-resolver-test.yaml deleted file mode 100644 index 4fb244846..000000000 --- a/distro/tests/knot-resolver-test.yaml +++ /dev/null @@ -1,148 +0,0 @@ ---- -- hosts: all - - remote_user: root - become: true - - vars: - dig_package: - Debian: dnsutils - Ubuntu: dnsutils - Fedora: bind-utils - CentOS: bind-utils - openSUSE Leap: bind-utils - openSUSE Tumbleweed: bind-utils - Archlinux: bind-tools - configure_obs_repo: - Fedora: | - dnf config-manager --add-repo https://download.opensuse.org/repositories/home:CZ-NIC:{{ item }}/Fedora_{{ ansible_distribution_major_version }}/home:CZ-NIC:{{ item }}.repo - CentOS: | - yum install -y wget && - wget -i wget https://download.opensuse.org/repositories/home:CZ-NIC:{{ item }}/CentOS_7_EPEL/home:CZ-NIC:{{ item }}.repo -O /etc/yum.repos.d/home:CZ-NIC:{{ item }}.repo - Debian: | - echo 'deb http://download.opensuse.org/repositories/home:/CZ-NIC:/{{ item }}/Debian_9.0/ /' > /etc/apt/sources.list.d/{{ item }}.list && - wget -nv https://download.opensuse.org/repositories/home:CZ-NIC:{{ item }}/Debian_9.0/Release.key -O Release.key && - apt-key add - < Release.key && - apt-get update - Ubuntu: | - echo 'deb http://download.opensuse.org/repositories/home:/CZ-NIC:/{{ item }}/xUbuntu_{{ ansible_distribution_version }}/ /' > /etc/apt/sources.list.d/{{ item }}.list && - wget -nv https://download.opensuse.org/repositories/home:CZ-NIC:{{ item }}/xUbuntu_{{ ansible_distribution_version }}/Release.key -O Release.key && - apt-key add - < Release.key && - apt-get update - openSUSE Tumbleweed: | - zypper addrepo https://download.opensuse.org/repositories/home:CZ-NIC:{{ item }}/openSUSE_Tumbleweed/home:CZ-NIC:{{ item }}.repo && - zypper --gpg-auto-import-keys refresh - openSUSE Leap: | - zypper addrepo https://download.opensuse.org/repositories/home:CZ-NIC:{{ item }}/openSUSE_Leap_15.0/home:CZ-NIC:{{ item }}.repo && - zypper --gpg-auto-import-keys refresh - show_package_version: - Archlinux: - pacman -Qi knot-resolver | grep '^Version' - Fedora: &pkg_version_rpm | - rpm -qi knot-resolver | grep '^Version' - CentOS: *pkg_version_rpm - openSUSE Leap: *pkg_version_rpm - openSUSE Tumbleweed: *pkg_version_rpm - Debian: - dpkg -s knot-resolver | grep '^Version' - Ubuntu: | - dpkg -s knot-resolver | grep '^Version' - vars_files: - - repos.yaml - - gather_facts: false - pre_tasks: - - name: install python3 (Arch) - raw: | - (pacman-key --init && pacman-key --populate archlinux && \ - pacman -Sy python3 --noconfirm) || : - ignore_errors: true - - name: gather facts - setup: - - tasks: - - name: install epel - package: - name: epel-release - state: present - when: ansible_distribution == 'CentOS' - - - name: configure OBS repository - shell: "{{ configure_obs_repo[ansible_distribution] }}" - args: - warn: false - with_items: "{{ repos }}" - when: ansible_distribution_file_variety != 'Archlinux' - - - block: - - name: configure OBS repository (Arch) - blockinfile: - block: | - [home_CZ-NIC_{{ item }}_Arch] - SigLevel = Never - Server = https://download.opensuse.org/repositories/home:/CZ-NIC:/{{ item }}/Arch/$arch - insertbefore: '^\[core\]' - path: /etc/pacman.conf - state: present - with_items: "{{ repos }}" - - name: set up package mirrors - copy: - content: | - ## Arch Linux repository mirrorlist - ## Generated on 2018-12-10 - ## Czechia - Server = http://mirrors.nic.cz/archlinux/$repo/os/$arch - Server = http://ftp.fi.muni.cz/pub/linux/arch/$repo/os/$arch - Server = http://ftp.sh.cvut.cz/arch/$repo/os/$arch - Server = http://gluttony.sin.cvut.cz/arch/$repo/os/$arch - dest: /etc/pacman.d/mirrorlist - - name: sync repos (Arch) - shell: pacman -Syu --noconfirm - args: - warn: false - when: ansible_distribution_file_variety == 'Archlinux' - - - name: install dig - package: - name: "{{ dig_package[ansible_distribution] }}" - state: present - - - name: install knot-resolver - package: - name: knot-resolver - state: latest - - - name: get installed package version - shell: "{{ show_package_version[ansible_distribution] }}" - args: - warn: false - register: package_version - - - name: testing block - block: - - name: start kresd@1.service - service: - name: kresd@1.service - state: restarted - - - name: resolve nic.cz - shell: dig @127.0.0.1 nic.cz - register: res - failed_when: '"status: NOERROR" not in res.stdout' - - - name: test dnssec is turned on - block: - - name: test dnssec-failed.org +cd returns NOERROR - shell: dig +cd @127.0.0.1 dnssec-failed.org - register: res - failed_when: '"status: NOERROR" not in res.stdout' - - - name: test dnssec-failed.org returns SERVFAIL - shell: dig @127.0.0.1 dnssec-failed.org - register: res - failed_when: '"status: SERVFAIL" not in res.stdout' - - always: - - name: show installed version - debug: - var: package_version.stdout diff --git a/distro/tests/tumbleweed/Vagrantfile b/distro/tests/tumbleweed/Vagrantfile deleted file mode 100644 index 0da635093..000000000 --- a/distro/tests/tumbleweed/Vagrantfile +++ /dev/null @@ -1,21 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : -# - -Vagrant.configure(2) do |config| - - config.vm.box = "opensuse/openSUSE-Tumbleweed-x86_64" - config.vm.synced_folder ".", "/vagrant", disabled: true - - config.vm.define "tumbleweed_knot-resolver" do |machine| - machine.vm.provision "ansible" do |ansible| - ansible.playbook = "../knot-resolver-pkgtest.yaml" - end - end - - config.vm.provider :libvirt do |libvirt| - libvirt.cpus = 1 - libvirt.memory = 512 - end - -end diff --git a/distro/tests/tumbleweed/ansible.cfg b/distro/tests/tumbleweed/ansible.cfg deleted file mode 120000 index f80698e88..000000000 --- a/distro/tests/tumbleweed/ansible.cfg +++ /dev/null @@ -1 +0,0 @@ -../.ansible.cfg \ No newline at end of file -- GitLab