From 354bed5efcdef53fd4bf88a3c9244c6770eadd21 Mon Sep 17 00:00:00 2001 From: Tomas Pelka Date: Thu, 18 Sep 2025 12:29:42 +0200 Subject: [PATCH] removing the old tests definition, migrate towards the main.fmf one --- .fmf/version | 1 + tests/main.fmf => main.fmf | 0 tests/.fmf/version | 1 - .../defaults/main.yml | 4 - .../gnome-desktop-testing-role/meta/main.yml | 4 - .../gnome-desktop-testing-role/tasks/main.yml | 85 ------------------- tests/tests.yml | 10 --- 7 files changed, 1 insertion(+), 104 deletions(-) create mode 100644 .fmf/version rename tests/main.fmf => main.fmf (100%) delete mode 100644 tests/.fmf/version delete mode 100644 tests/roles/gnome-desktop-testing-role/defaults/main.yml delete mode 100644 tests/roles/gnome-desktop-testing-role/meta/main.yml delete mode 100644 tests/roles/gnome-desktop-testing-role/tasks/main.yml delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..56a6051 --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 \ No newline at end of file diff --git a/tests/main.fmf b/main.fmf similarity index 100% rename from tests/main.fmf rename to main.fmf diff --git a/tests/.fmf/version b/tests/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/tests/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/tests/roles/gnome-desktop-testing-role/defaults/main.yml b/tests/roles/gnome-desktop-testing-role/defaults/main.yml deleted file mode 100644 index 6359d45..0000000 --- a/tests/roles/gnome-desktop-testing-role/defaults/main.yml +++ /dev/null @@ -1,4 +0,0 @@ -role_pkgs_req: - - rsync - - xorg-x11-server-Xvfb - - sudo diff --git a/tests/roles/gnome-desktop-testing-role/meta/main.yml b/tests/roles/gnome-desktop-testing-role/meta/main.yml deleted file mode 100644 index 6626402..0000000 --- a/tests/roles/gnome-desktop-testing-role/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -dependencies: - - role: str-common-init diff --git a/tests/roles/gnome-desktop-testing-role/tasks/main.yml b/tests/roles/gnome-desktop-testing-role/tasks/main.yml deleted file mode 100644 index ff20eab..0000000 --- a/tests/roles/gnome-desktop-testing-role/tasks/main.yml +++ /dev/null @@ -1,85 +0,0 @@ ---- -- name: Check if GNOME installed-tests testing harness is installed - register: gnome_desktop_testing_runner - find: - paths: "{{ ansible_env.PATH.split(':') }}" - pattern: gnome-desktop-testing-runner - -- name: Build and install GNOME installed-tests testing harness - when: gnome_desktop_testing_runner.matched == 0 - block: - - name: Installing build dependencies for GNOME installed-tests testing harness - package: - name: - - git - - make - - gcc - - diffutils - - autoconf - - automake - - libtool - - glib2-devel - - systemd-devel - - - name: Fetching GNOME installed-tests testing harness source from remote repository - git: - repo: 'https://gitlab.gnome.org/GNOME/gnome-desktop-testing.git' - dest: gnome-desktop-testing - force: yes - - - name: Configure GNOME installed-tests testing harness build - command: ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var - args: - chdir: gnome-desktop-testing - - - name: Build GNOME installed-tests testing harness - command: make - args: - chdir: gnome-desktop-testing - - - name: Install GNOME installed-tests testing harness - command: make install - args: - chdir: gnome-desktop-testing - -- name: Create a user to run GNOME installed-tests as - user: - name: shadowman - state: present - -- name: Start GNOME installed-tests testing harness - block: - - name: Allow shadowman user access to artifacts dir - file: - path: "{{ remote_artifacts }}" - mode: 01777 - - - name: Execute tests - become: yes - become_user: shadowman - shell: | - set -e - log_file="{{ remote_artifacts }}/{{ installed_test_name }}.log" - exec 2>>$log_file 1>>$log_file - status="FAIL" - dbus-run-session xvfb-run -a -s '-screen 0 1024x768x24' env TMPDIR='{{ remote_artifacts }}' G_MESSAGES_DEBUG='all' gnome-desktop-testing-runner '{{ installed_test_name }}' - if [ $? -eq 0 ]; then - status="PASS" - fi - echo "${status} $TEST" >> {{ remote_artifacts }}/test.log - args: - chdir: "{{ remote_artifacts }}" - - - name: Check the results - shell: grep "^FAIL" {{ remote_artifacts }}/test.log - register: test_fails - failed_when: False - - - name: Set role result - set_fact: - role_result_failed: "{{ (test_fails.stdout|d|length > 0) or (test_fails.stderr|d|length > 0) }}" - role_result_msg: "{{ test_fails.stdout|d('tests failed.') }}" - - - include_role: - name: str-common-final - diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index dba76d0..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,10 +0,0 @@ -- hosts: localhost - roles: - - role: gnome-desktop-testing-role - installed_test_name: glib - tags: - - classic - - gating - required_packages: - - shared-mime-info -