[skip-ci] TMT: initial enablement

.fmf/version

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

.gitignore

@@ -8,3 +8,6 @@ vendor/
 .idea/*
 contrib/systemd/*/*.service
 .vscode*
+rpm/RPMS
+rpm/SRPMS
+rpm/*.tar.gz

.packit.yaml

@@ -5,13 +5,40 @@
 downstream_package_name: netavark
 upstream_tag_template: v{version}
 
+# These files get synced from upstream to downstream (Fedora / CentOS Stream) on every
+# propose-downstream job. This is done so tests maintained upstream can be run
+# downstream in Zuul CI and Bodhi.
+# Ref: https://packit.dev/docs/configuration#files_to_sync
+files_to_sync:
+  - src: rpm/gating.yaml
+    dest: gating.yaml
+    delete: true
+  - src: plans/
+    dest: plans/
+    delete: true
+    mkpath: true
+  - src: test/tmt
+    dest: test/tmt
+    delete: true
+    mkpath: true
+  - src: test-dhcp/tmt
+    dest: test-dhcp/tmt
+    delete: true
+    mkpath: true
+  - src: .fmf/
+    dest: .fmf/
+    delete: true
+  - .packit.yaml
+
 packages:
   netavark-fedora:
     pkg_tool: fedpkg
     specfile_path: rpm/netavark.spec
   netavark-centos:
     pkg_tool: centpkg
     specfile_path: rpm/netavark.spec
+  netavark-eln:
+    specfile_path: rpm/netavark.spec
 
 srpm_build_deps:
   - cargo
@@ -22,12 +49,21 @@ jobs:
   - job: copr_build
     trigger: pull_request
     packages: [netavark-fedora]
-    notifications: &copr_build_failure_notification
-      failure_comment:
-        message: "Ephemeral COPR build failed. @containers/packit-build please check."
+    #notifications: &copr_build_failure_notification
+    #  failure_comment:
+    #    message: "Ephemeral COPR build failed. @containers/packit-build please check."
+    targets: &fedora_copr_targets
+      - fedora-all-x86_64
+      - fedora-all-aarch64
+    enable_net: true
+
+  - job: copr_build
+    trigger: ignore
+    packages: [netavark-eln]
+    #notifications: &copr_build_failure_notification
+    #  failure_comment:
+    #    message: "Ephemeral COPR build failed. @containers/packit-build please check."
     targets:
-      fedora-all-x86_64: {}
-      fedora-all-aarch64: {}
       fedora-eln-x86_64:
         additional_repos:
           - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/"
@@ -39,8 +75,8 @@ jobs:
   - job: copr_build
     trigger: pull_request
     packages: [netavark-centos]
-    notifications: *copr_build_failure_notification
-    targets:
+    #notifications: *copr_build_failure_notification
+    targets: &centos_copr_targets
       - centos-stream-9-x86_64
       - centos-stream-9-aarch64
       - centos-stream-10-x86_64
@@ -59,6 +95,47 @@ jobs:
     project: podman-next
     enable_net: true
 
+  # validate and unit tests
+  # rpm independent and sufficient to run on only one env
+  - job: tests
+    trigger: pull_request
+    packages: [netavark-fedora] # Include this else it will create multiple jobs
+    skip_build: true
+    targets:
+      - fedora-latest-stable
+    tmt_plan: "/plans/no-rpm"
+    identifier: "no-rpm"
+
+  - job: tests
+    trigger: pull_request
+    packages: [netavark-fedora]
+      #notifications:
+      #failure_comment:
+      #  message: "TMT tests failed. @containers/packit-build please check."
+    targets: *fedora_copr_targets
+    tf_extra_params:
+      environments:
+        - artifacts:
+          - type: repository-file
+            id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo
+    tmt_plan: "/plans/rpm"
+    identifier: "rpm-fedora"
+
+  - job: tests
+    trigger: pull_request
+    packages: [netavark-centos]
+      #notifications:
+      #failure_comment:
+      #  message: "TMT tests failed. @containers/packit-build please check."
+    targets: *centos_copr_targets
+    tf_extra_params:
+      environments:
+        - artifacts:
+          - type: repository-file
+            id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/centos-stream-$releasever/rhcontainerbot-podman-next-centos-stream-$releasever.repo
+    tmt_plan: "/plans/rpm"
+    identifier: "rpm-centos"
+
   # Sync to Fedora
   - job: propose_downstream
     trigger: release

Makefile

@@ -96,6 +96,7 @@ NV_UNIT_FILES = contrib/systemd/system/netavark-dhcp-proxy.service \
 .PHONY: install
 install: $(NV_UNIT_FILES)
 	install ${SELINUXOPT} -D -m0755 bin/netavark $(DESTDIR)$(LIBEXECPODMAN)/netavark
+	install ${SELINUXOPT} -D -m0755 bin/netavark-dhcp-proxy-client $(DESTDIR)$(LIBEXECPODMAN)/netavark-dhcp-proxy-client
 	$(MAKE) -C docs install
 	install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR}
 	install ${SELINUXOPT} -m 644 contrib/systemd/system/netavark-dhcp-proxy.socket ${DESTDIR}${SYSTEMDDIR}/netavark-dhcp-proxy.socket

plans/main.fmf

@@ -0,0 +1,43 @@
+discover:
+    how: fmf
+execute:
+    how: tmt
+prepare:
+    - when: distro == centos-stream or distro == rhel
+      how: shell
+      script: |
+        dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(rpm --eval '%{?rhel}').noarch.rpm
+        dnf -y config-manager --set-enabled epel
+      order: 10
+    - when: initiator == packit
+      how: shell
+      script: |
+        COPR_REPO_FILE="/etc/yum.repos.d/*podman-next*.repo"
+        if compgen -G $COPR_REPO_FILE > /dev/null; then
+            sed -i -n '/^priority=/!p;$apriority=1' $COPR_REPO_FILE
+        fi
+        dnf -y upgrade --allowerasing
+      order: 20
+
+provision:
+    how: artemis
+    hardware:
+        memory: ">= 16 GB"
+        cpu:
+            cores: ">= 4"
+            threads: ">=8"
+        disk:
+            - size: ">= 512 GB"
+
+/no-rpm:
+    summary: Run tests independent of rpm
+    discover+:
+        filter: tag:no-rpm
+    adjust+:
+        - enabled: false
+          when: initiator is not defined or initiator != packit
+
+/rpm:
+    summary: Run tests on the rpm
+    discover+:
+        filter: tag:rpm

rpm/gating.yaml

@@ -0,0 +1,16 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context:
+  - bodhi_update_push_stable
+  - bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+
+--- !Policy
+product_versions:
+  - rhel-*
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

rpm/netavark.spec

@@ -88,6 +88,29 @@ Its features include:
 * Support for IPv4 and IPv6
 * Support for container DNS resolution via aardvark-dns.
 
+# Only intended to be used for gating tests
+# End user usecases not supported
+%package tests
+Summary: Tests for %{name}
+Requires: %{name} = %{epoch}:%{version}-%{release}
+%if %{defined bats_ofc}
+Requires: bats
+%else
+Recommends: bats
+%endif
+Requires: bind-utils
+Requires: dbus-daemon
+Requires: dnsmasq
+Requires: firewalld
+Requires: iptables
+Requires: jq
+Requires: net-tools
+Requires: nftables
+Requires: nmap-ncat
+
+%description tests
+%{summary}
+
 %prep
 %autosetup -Sgit %{name}-%{version}
 # Following steps are only required on environments like koji which have no
@@ -104,18 +127,30 @@ tar fx %{SOURCE1}
 
 %build
 NETAVARK_DEFAULT_FW=%{default_fw} %{__make} CARGO="%{__cargo}" build
+%{__make} CARGO="%{__cargo}" build_proxy_client
 %if (0%{?fedora} || 0%{?rhel} >= 10) && !%{defined copr_username}
 %cargo_license_summary
 %{cargo_license} > LICENSE.dependencies
 %cargo_vendor_manifest
 %endif
 
+# Build examples package for tests
+%{__make} CARGO="%{__cargo}" examples
+
 cd docs
 %{__make}
 
 %install
 %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install
 
+%{__install} -d -p %{buildroot}%{_datadir}/%{name}/{examples,test,test-dhcp}
+%{__cp} -rpav targets/release/examples/* %{buildroot}%{_datadir}/%{name}/examples
+%{__cp} -rpav test/* %{buildroot}%{_datadir}/%{name}/test
+%{__cp} -rpav test-dhcp/* %{buildroot}%{_datadir}/%{name}/test-dhcp
+
+%{__rm} -rf %{buildroot}%{_datadir}/%{name}/test/tmt
+%{__rm} -rf %{buildroot}%{_datadir}/%{name}/test-dhcp/tmt
+
 %preun
 %systemd_preun %{name}-dhcp-proxy.service
 %systemd_preun %{name}-firewalld-reload.service
@@ -138,5 +173,14 @@ cd docs
 %{_unitdir}/%{name}-dhcp-proxy.socket
 %{_unitdir}/%{name}-firewalld-reload.service
 
+%files tests
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/examples
+%dir %{_datadir}/%{name}/test
+%dir %{_datadir}/%{name}/test-dhcp
+%{_datadir}/%{name}/examples/*
+%{_datadir}/%{name}/test/*
+%{_datadir}/%{name}/test-dhcp/*
+
 %changelog
 %autochangelog

test-dhcp/helpers.bash

@@ -11,7 +11,7 @@ TMP_TESTDIR=
 
 # Netavark binary to run
 NETAVARK=${NETAVARK:-./bin/netavark}
-
+NETAVARK_DHCP_PROXY_CLIENT=${NETAVARK_DHCP_PROXY_CLIENT:-./bin/netavark-dhcp-proxy-client}
 TESTSDIR=${TESTSDIR:-$(dirname ${BASH_SOURCE})}
 
 # export RUST_BACKTRACE so that we get a helpful stack trace
@@ -407,7 +407,7 @@ function run_teardown(){
 function run_client(){
   local verb=$1
   local conf=$2
-  run_in_container_netns "./bin/netavark-dhcp-proxy-client" --uds "$TMP_TESTDIR/nv-proxy.sock" -f "${conf}" "${verb}"
+  run_in_container_netns "$NETAVARK_DHCP_PROXY_CLIENT" --uds "$TMP_TESTDIR/nv-proxy.sock" -f "${conf}" "${verb}"
 }
 
 ###################

test-dhcp/tmt/integration.fmf

@@ -0,0 +1,17 @@
+# Only common dependencies that are NOT required to run test_integration.sh are
+# specified here. Everything else is in test_integration.sh.
+require:
+    - iptables
+    - netavark-tests
+
+adjust:
+    duration: 10m
+    when: arch == aarch64
+
+tag: [ upstream, downstream ]
+summary: Integration tests
+test: bash integration.sh
+environment:
+    NETAVARK: /usr/libexec/podman/netavark
+    NETAVARK_DHCP_PROXY_CLIENT: /usr/libexec/podman/netavark-dhcp-proxy-client
+    TEST_PLUGINS: /usr/share/netavark/examples

test-dhcp/tmt/integration.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -exo pipefail
+
+rpm -q aardvark-dns cargo netavark
+
+# Run tests
+bats /usr/share/netavark/test-dhcp

test/500-plugin.bats

@@ -33,7 +33,7 @@ EOF
 }
 
 function run_netavark_plugins() {
-    run_netavark --plugin-directory ./targets/release/examples/ "$@"
+    run_netavark --plugin-directory $TEST_PLUGINS "$@"
 }
 
 @test "plugin - test error message" {

test/helpers.bash

@@ -2,6 +2,7 @@
 
 # Netavark binary to run
 NETAVARK=${NETAVARK:-./bin/netavark}
+TEST_PLUGINS=${TEST_PLUGINS:-./targets/release/examples}
 
 TESTSDIR=${TESTSDIR:-$(dirname ${BASH_SOURCE})}
 

test/tmt/integration.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -exo pipefail
+
+rpm -q aardvark-dns cargo netavark
+
+# Run tests
+bats /usr/share/netavark/test

test/tmt/netavark.fmf

@@ -0,0 +1,33 @@
+require:
+    - cargo
+    - clippy
+    - go-md2man
+    - git-core
+    - iptables
+    - make
+    - protobuf-compiler
+    - rustfmt
+
+adjust+:
+    - duration: 10m
+      when: arch == aarch64
+
+/validate:
+    tag: no-rpm
+    summary: Validate test
+    test: make -C $TMT_TREE validate
+
+/unit:
+    tag: no-rpm
+    summary: Unit test
+    test: make -C $TMT_TREE unit
+
+/integration:
+    tag: rpm
+    summary: Integration tests
+    test: bash integration.sh
+    environment:
+        NETAVARK: /usr/libexec/podman/netavark
+        TEST_PLUGINS: /usr/share/netavark/examples
+    require+:
+        - netavark-tests

test/tmt/podman.fmf

@@ -0,0 +1,13 @@
+summary: Podman tests dependent on netavark
+require:
+    - netavark
+    - podman-tests
+
+tag: [rpm]
+
+test: |
+  /usr/bin/bats -t /usr/share/podman/test/system/030-run.bats
+  /usr/bin/bats -t /usr/share/podman/test/system/075-exec.bats
+  /usr/bin/bats -t /usr/share/podman/test/system/500-networking.bats
+
+duration: 15m