From dad39ee521c047350a7f73b134a02d721727f053 Mon Sep 17 00:00:00 2001 From: Viktor Ashirov Date: Tue, 11 Jun 2024 22:46:06 +0200 Subject: [PATCH] Convert STI tests to FMF --- .fmf/version | 1 + main.fmf | 17 +++++++++++++++++ tests/tests.yml | 50 ------------------------------------------------- 3 files changed, 18 insertions(+), 50 deletions(-) create mode 100644 .fmf/version create mode 100644 main.fmf delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/main.fmf b/main.fmf new file mode 100644 index 0000000..76d16bf --- /dev/null +++ b/main.fmf @@ -0,0 +1,17 @@ +/plan: + summary: Basic test suite + discover: + how: fmf + execute: + how: tmt + prepare: + - name: install required packages + how: install + package: [389-ds-base, git, pytest] + - name: clone repo + how: shell + script: git clone https://github.com/389ds/389-ds-base /root/ds +/test: + /upstream_basic: + test: pytest -v /root/ds/dirsrvtests/tests/suites/basic/basic_test.py + duration: 30m diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index a676c90..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,50 +0,0 @@ ---- -- hosts: localhost - remote_user: root - vars: - ds_repo_url: https://github.com/389ds/389-ds-base.git - ds_repo_dir: ds - ds_repo_version: 389-ds-base-1.4.3 - ds_tests: "{{ ds_repo_dir }}/dirsrvtests/tests" - pytest: "py.test-3" - pytest_args: "-v" - pytest_tier0_tests: "-m tier0" - pytest_tier1_tests: "-m 'tier1 and not tier2'" - pytest_run_command: "PYTHONPATH=../../src/lib389 {{ pytest }} {{ pytest_args }}" - artifacts: ./artifacts - pre_tasks: - - name: Install policycoreutils - action: > - {{ ansible_pkg_mgr }} name=policycoreutils-python-utils state=present - tags: always - ignore_errors: yes - - name: Prelabel non-secure ports - tags: always - shell: "semanage port -a -t ldap_port_t -p tcp 38900-39299" - ignore_errors: yes - - name: Prelabel secure ports - tags: always - shell: "semanage port -a -t ldap_port_t -p tcp 63600-63999" - ignore_errors: yes - roles: - - role: standard-test-basic - tags: - - classic - repositories: - - repo: "{{ ds_repo_url }}" - dest: "{{ ds_repo_dir }}" - version: "{{ ds_repo_version }}" - tests: - - tier0: - dir: "{{ ds_tests }}" - run: "{{ pytest_run_command }} {{ pytest_tier0_tests }}" - - tier1: - dir: "{{ ds_tests }}" - run: "{{ pytest_run_command }} {{ pytest_tier1_tests }}" - required_packages: - - python3-pytest - - python3-distro - - 389-ds-base - - 389-ds-base-snmp - - 389-ds-base-legacy-tools - - cracklib-dicts