Fix RHEL10 tests - Related: RHEL-39410

Signed-off-by: Jindrich Novy <jnovy@redhat.com>

.fmf/version

@@ -0,0 +1 @@
+1

plans/basic.fmf

@@ -0,0 +1,5 @@
+summary: Check basic functionality
+discover:
+    how: fmf
+execute:
+    how: tmt

tests/README

@@ -1,18 +0,0 @@
-I'm sorry. The playbooks here are a much-too-complicated way of saying:
-
-   - test podman (root and rootless)
-   - same, with podman-remote
-
-The starting point is tests.yml . From there:
-
-    tests.yml
-      \- test_podman.yml
-           |- roles/rootless_user_ready/
-           \- run_podman_tests.yml          (once for local, once for remote)
-                \- roles/run_bats_tests/    (runs tests: root, rootless)
-
-Principal result is the file 'artifacts/test.log'. It will contain
-one line for each test run, format will be '(PASS|FAIL|ERROR) <test name>'
-
-For each completed test there will also be a 'test.<name>.bats.log'
-containing some setup blurbs (RPMs, environment) and the full BATS log.

tests/check_results.yml

@@ -1,36 +0,0 @@
----
-# Copied from standard-test-basic
-# ...and, 2020-05-13, updated, looks like they changed the whole thing around
-- name: Check the results
-  local_action:
-    module: shell
-    cmd: |
-      log="{{ artifacts }}/test.log"
-      if [ ! -f "$log" ]; then
-          echo ERROR
-          echo "Test results not found." 1>&2
-      elif grep ^ERROR "$log" 1>&2; then
-          echo ERROR
-      elif grep ^FAIL "$log" 1>&2; then
-          echo FAIL
-      elif grep -q ^PASS "$log"; then
-          echo PASS
-      else
-          echo ERROR
-          echo "No test results found." 1>&2
-      fi
-  register: test_results
-
-- name: Set role result
-  set_fact:
-    role_result: "{{ test_results.stdout }}"
-    role_message: "{{ test_results.stderr|d('test execution error.') }}"
-
-- name: display results
-  vars:
-    msg: |
-       role_result:  {{ role_result|d('Undefined') }}
-       {{ role_message|d('[No error messages found]') }}
-  debug:
-    msg: "{{ msg.split('\n') }}"
-  failed_when: role_message|d("") != ""

tests/main.fmf

@@ -0,0 +1,2 @@
+require:
+  - podman

tests/roles/bats_installed/tasks/main.yml

@@ -0,0 +1,12 @@
+---
+# Sigh; RHEL8 doesn't have BATS
+- name: bats | fetch and unpack tarball
+  unarchive:
+    src: https://github.com/bats-core/bats-core/archive/v1.9.0.tar.gz
+    dest: /root
+    remote_src: true
+
+- name: bats | install
+  command: ./install.sh /usr/local
+  args:
+    chdir: /root/bats-core-1.9.0

tests/roles/disable_systemd_resolved/files/disable_systemd_resolved.sh

@@ -1,41 +0,0 @@
-#!/bin/bash
-#
-# Excerpted from https://github.com/containers/automation_images/blob/main/systemd_banish.sh
-#
-# Early 2023: https://github.com/containers/podman/issues/16973
-#
-# We see countless instances of "lookup cdn03.quay.io" flakes.
-# Disabling the systemd resolver has completely resolved those,
-# from multiple flakes per day to zero in a month.
-#
-# Opinions differ on the merits of systemd-resolve, but the fact is
-# it breaks our CI testing. Kill it.
-nsswitch=/etc/authselect/nsswitch.conf
-if [[ -e $nsswitch ]]; then
-    if grep -q -E 'hosts:.*resolve' $nsswitch; then
-        echo "Disabling systemd-resolved"
-        sed -i -e 's/^\(hosts: *\).*/\1files dns myhostname/' $nsswitch
-        systemctl disable --now systemd-resolved
-        rm -f /etc/resolv.conf
-
-        # NetworkManager may already be running, or it may not....
-        systemctl start NetworkManager
-        sleep 1
-        systemctl restart NetworkManager
-
-        # ...and it may create resolv.conf upon start/restart, or it
-        # may not. Keep restarting until it does. (Yes, I realize
-        # this is cargocult thinking. Don't care. Not worth the effort
-        # to diagnose and solve properly.)
-        retries=10
-        while ! test -e /etc/resolv.conf;do
-              retries=$((retries - 1))
-              if [[ $retries -eq 0 ]]; then
-                  echo "Timed out waiting for resolv.conf" >&2
-                  echo "...gonna try continuing. Expect failures." >&2
-              fi
-              systemctl restart NetworkManager
-              sleep 5
-        done
-    fi
-fi

tests/roles/disable_systemd_resolved/tasks/main.yml

@@ -1,3 +0,0 @@
----
-- name: disable systemd resolved
-  script: ./disable_systemd_resolved.sh

tests/roles/rootless_user/tasks/main.yml

@@ -0,0 +1,7 @@
+---
+- name: create rootless user
+  user:
+    name: testuser
+    shell: /bin/bash
+- name: enable linger
+  command: loginctl enable-linger testuser

tests/roles/rootless_user_ready/tasks/main.yml

@@ -1,14 +0,0 @@
----
-- name: make sure rootless account exists
-  user: name={{ rootless_user }}
-
-- name: rootless account | enable linger
-  shell: loginctl enable-linger {{ rootless_user }}
-
-- name: rootless account | get uid
-  getent:
-    database: passwd
-    key: "{{ rootless_user }}"
-
-- name: rootless account | preserve uid
-  set_fact: rootless_uid="{{ getent_passwd[rootless_user][1] }}"

tests/roles/run_bats_tests/files/run_bats_tests.sh

@@ -7,59 +7,52 @@
 # directory /usr/share/foo/test/system, containing one or more .bats
 # test files.
 #
-# We create two files:
-#
-#    /tmp/test.summary.log - one-liner with FAIL, PASS, ERROR and a blurb
-#    /tmp/test.bats.log    - full log of this script, plus the BATS run
-#
+
 export PATH=/usr/local/bin:/usr/sbin:/usr/bin
 
-FULL_LOG=/tmp/test.bats.log
-rm -f $FULL_LOG
-touch $FULL_LOG
+FULL_LOG=/tmp/test.debug.log
+BATS_LOG=/tmp/test.bats.log
+rm -f $FULL_LOG $BATS_LOG
+touch $FULL_LOG $BATS_LOG
 
-# Preserve output to a log file, but also emit on stdout. This covers
-# RHEL (which preserves logfiles but runs ansible without --verbose)
-# and Fedora (which hides logfiles but runs ansible --verbose).
-exec &> >(tee -a $FULL_LOG)
+exec &> $FULL_LOG
 
 # Log program versions
 echo "Packages:"
-echo "  Kernel: $(uname -r)"
-rpm -qa |\
-    egrep 'podman|conmon|containers-common|crun|runc|iptable|slirp|aardvark|netavark|containernetworking-plugins|systemd|container-selinux|passt' |\
-    sort |\
-    sed -e 's/^/  /'
+rpm -q ${TEST_PACKAGE} ${TEST_PACKAGE}-tests
 
-divider='------------------------------------------------------------------'
-echo $divider
+echo "------------------------------"
 printenv | sort
-echo $divider
-echo "ip addr:"
-ip addr
-echo $divider
 
 testdir=/usr/share/${TEST_PACKAGE}/test/system
 
 if ! cd $testdir; then
-    echo "FAIL ${TEST_NAME} : cd $testdir"      > /tmp/test.summary.log
+    echo "FAIL ${TEST_NAME} : cd $testdir"      >> /tmp/test.log
     exit 0
 fi
 
-if [[ $PODMAN =~ remote ]]; then
-    ${PODMAN%%-remote} system service -t0 &>/dev/null &
-    PODMAN_SERVER_PID=$!
+if [ -e /tmp/helper.sh ]; then
+    echo "------------------------------"
+    echo ". /tmp/helper.sh"
+    . /tmp/helper.sh
 fi
 
+if [ "$(type -t setup)" = "function" ]; then
+    echo "------------------------------"
+    echo "\$ setup"
+    setup
+    if [ $? -ne 0 ]; then
+        echo "FAIL ${TEST_NAME} : setup"       >> /tmp/test.log
+        exit 0
+    fi
+fi
+
+echo "------------------------------"
 echo "\$ bats ."
-bats .
+bats . &> $BATS_LOG
 rc=$?
 
-if [[ -n "$PODMAN_SERVER_PID" ]]; then
-    kill $PODMAN_SERVER_PID
-fi
-
-echo $divider
+echo "------------------------------"
 echo "bats completed with status $rc"
 
 status=PASS
@@ -67,7 +60,13 @@ if [ $rc -ne 0 ]; then
     status=FAIL
 fi
 
-echo "${status} ${TEST_NAME}" > /tmp/test.summary.log
+echo "${status} ${TEST_NAME}" >> /tmp/test.log
+
+if [ "$(type -t teardown)" = "function" ]; then
+    echo "------------------------------"
+    echo "\$ teardown"
+    teardown
+fi
 
 # FIXME: for CI purposes, always exit 0. This allows subsequent tests.
 exit 0

tests/roles/run_bats_tests/tasks/main.yml

@@ -4,7 +4,34 @@
   copy: dest=/tmp/test.log content='' force=yes mode=0666
 
 - name: execute tests
-  include_tasks: run_one_test.yml
+  include: run_one_test.yml
   with_items: "{{ tests }}"
   loop_control:
     loop_var: test
+
+- name: pull test.log results
+  fetch:
+    src: "/tmp/test.log"
+    dest: "{{ artifacts }}/test.log"
+    flat: yes
+
+# Copied from standard-test-basic
+- name: check results
+  shell: grep "^FAIL" /tmp/test.log
+  register: test_fails
+  # Never fail at this step. Just store result of tests.
+  failed_when: False
+
+- name: preserve results
+  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.') }}"
+
+- name: display results
+  vars:
+    msg: |
+       Tests failed: {{ role_result_failed|d('Undefined') }}
+       Tests msg: {{ role_result_msg|d('None') }}
+  debug:
+    msg: "{{ msg.split('\n') }}"
+  failed_when: "role_result_failed|bool"

tests/roles/run_bats_tests/tasks/run_one_test.yml

@@ -25,17 +25,14 @@
   copy: src=helper.{{ test_name_oneword }}.sh dest=/tmp/helper.sh
   when: helper.stat.exists
 
-# This is what runs the BATS tests.
 - name: "{{ test.name }} | run test"
   script: ./run_bats_tests.sh
   args:
     chdir: /usr/share/{{ test.package }}/test/system
   become: "{{ true if test.become is defined else false }}"
-  become_user: "{{ rootless_user }}"
+  become_user: testuser
   environment: "{{ local_environment | combine(test.environment) }}"
 
-# BATS tests will always exit zero and should leave behind two files:
-# a full log (test.bats.log) and a one-line PASS/FAIL file (.summary.log)
 - name: "{{ test.name }} | pull logs"
   fetch:
     src: "/tmp/test.{{ item }}.log"
@@ -43,25 +40,7 @@
     flat: yes
   with_items:
     - bats
-    - summary
-
-# Collect all the one-line PASS/FAIL results in one file, test.log
-# Write the same thing, in a different format, to results.yml
-#   https://docs.fedoraproject.org/en-US/ci/standard-test-interface/
-- name: "{{ test.name }} | keep running tally of test results"
-  local_action:
-    module: shell
-    cmd: |
-      cd {{ artifacts }}
-      cat "test.{{ test_name_oneword }}.summary.log" >>test.log
-
-      status=$(awk '{print $1}' <test.{{ test_name_oneword }}.summary.log | tr A-Z a-z)
-      echo "- test: {{ test.name }}"                        >>results.yml
-      echo "  result: $status"                              >>results.yml
-      echo "  logs: test.{{ test_name_oneword }}.bats.log"  >>results.yml
-
-      # delete the oneliner file, to keep artifacts dir clean
-      rm -f test.{{ test_name_oneword }}.summary.log
+    - debug
 
 - name: "{{ test.name }} | remove remote logs and helpers"
   file:
@@ -69,19 +48,5 @@
     state=absent
   with_items:
     - test.bats.log
-    - test.summary.log
+    - test.debug.log
     - helper.sh
-
-# AAAAARGH!
-#
-# Fedora gating tests are failing, because str-common-final/tasks/main.yml
-# tries to pull test.log and other logs from $remote_host:/tmp/artifacts .
-# Those don't exist, because I track status and artifacts locally, because
-# with the reboot I can't rely on /tmp being preserved.
-# I see no way to tell str-common-final to skip this step; so let's just
-# push logs over upon completion of each subtest.
-- name: keep remote artifacts synced
-  synchronize:
-    src:  "{{ artifacts }}/"
-    dest: "{{ remote_artifacts|d('/tmp/artifacts') }}/"
-    mode: push

tests/run_podman_tests.yml

@@ -1,22 +0,0 @@
----
-- name: "podman-remote | install"
-  dnf: name="podman-remote" state=installed
-  when: podman_bin == "podman-remote"
-
-- include_role:
-    name: run_bats_tests
-  vars:
-    tests:
-    # Yes, this is horrible duplication, but trying to refactor in ansible
-    # yields even more horrible unreadable code. This is the lesser evil.
-    - name: "{{ podman_bin }} root"
-      package: podman
-      environment:
-        PODMAN: /usr/bin/{{ podman_bin }}
-        QUADLET: /usr/libexec/podman/quadlet
-    - name: "{{ podman_bin }} rootless"
-      package: podman
-      environment:
-        PODMAN: /usr/bin/{{ podman_bin }}
-        QUADLET: /usr/libexec/podman/quadlet
-      become: true

tests/smoke.fmf

@@ -0,0 +1,2 @@
+summary: Execute a simple command
+test: podman run -t --rm fedora cat /etc/os-release | grep 'Fedora Linux'

tests/test_podman.yml

@@ -1,39 +0,0 @@
----
-- hosts: localhost
-  tags:
-    - classic
-    - container
-  vars:
-  - artifacts: ./artifacts
-    rootless_user: testuser
-  roles:
-  - role: disable_systemd_resolved
-  - role: rootless_user_ready
-
-  tasks:
-  # At the start of a run, clean up state. Useful for test reruns.
-  - name: local artifacts directory exists
-    local_action: file path="{{ artifacts }}" state=directory
-
-  - name: remove stale log files
-    local_action: shell rm -f {{ artifacts }}/test*.log
-
-  - name: clear test results (test.log)
-    local_action: command truncate --size=0 {{ artifacts }}/test.log
-
-  - name: clear test results (results.yml)
-    local_action: copy content="results:\n" dest={{ artifacts }}/results.yml
-
-  # These are the actual tests.
-  - name: test podman
-    include_tasks: run_podman_tests.yml
-    loop: [ podman, podman-remote ]
-    loop_control:
-      loop_var: podman_bin
-
-  - name: test toolbox
-    include_tasks: test_toolbox.yml
-
-  # Postprocessing: check for FAIL or ERROR in any test, exit 1 if so
-  - name: check results
-    include_tasks: check_results.yml

tests/test_toolbox.yml

@@ -1,10 +0,0 @@
----
-- include_role:
-    name: run_bats_tests
-  vars:
-    tests:
-    - name: toolbox
-      package: toolbox
-      become: true
-      environment:
-        XDG_RUNTIME_DIR: /run/user/{{ rootless_uid }}

tests/tests.yml

@@ -1 +1,28 @@
-- import_playbook: test_podman.yml
+---
+- hosts: localhost
+  tags:  classic
+  vars:
+  - artifacts: ./artifacts
+  roles:
+  - role: bats_installed
+  - role: rootless_user
+  - role: run_bats_tests
+    tests:
+    - name:    podman root
+      package: podman
+      environment:
+        PODMAN: /usr/bin/podman
+        QUADLET: /usr/libexec/podman/quadlet
+
+    - name:    podman rootless
+      package: podman
+      environment:
+        PODMAN: /usr/bin/podman
+        QUADLET: /usr/libexec/podman/quadlet
+      become:  true
+
+      #- name:    podman-remote root
+      #package: podman
+      #environment:
+      #  PODMAN: /usr/bin/podman-remote
+      #  QUADLET: /usr/libexec/podman/quadlet

tests/tmt.fmf

@@ -0,0 +1,8 @@
+summary: Make sure that container provision works
+require:
+  - tmt-provision-container
+test:
+    tmt run --verbose --remove
+        provision --how container --image fedora
+        login --command 'cat /etc/os-release'
+        finish