TMT: initial enablement

lsm5 · lsm5 · commit 6e9813974f43 · 2024-12-26T19:23:14.000+05:30
This commit adds `validate`, `unit`, and `integration` tests using
for aarch64 and x86_64 arches on all active Fedora and CentOS Stream
versions.

Signed-off-by: Lokesh Mandvekar &lt;lsm5@fedoraproject.org&gt;
diff --git a/.fmf/version b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,6 @@ vendor/
 .idea/*
 contrib/systemd/*/*.service
 .vscode*
+rpm/RPMS
+rpm/SRPMS
+rpm/*.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
@@ -12,6 +12,8 @@ packages:
   netavark-centos:
     pkg_tool: centpkg
     specfile_path: rpm/netavark.spec
+  netavark-eln:
+    specfile_path: rpm/netavark.spec
 
 srpm_build_deps:
   - cargo
@@ -22,12 +24,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 +50,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 +70,32 @@ jobs:
     project: podman-next
     enable_net: true
 
+  - 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
+
+  - 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
+
   # Sync to Fedora
   - job: propose_downstream
     trigger: release
diff --git a/plans/main.fmf b/plans/main.fmf
@@ -0,0 +1,20 @@
+discover:
+    how: fmf
+execute:
+    how: tmt
+
+/upstream:
+    summary: Run tests on upstream PRs
+    discover+:
+        filter: tag:upstream
+    adjust+:
+        enabled: false
+        when: initiator is not defined or initiator != packit
+
+/downstream:
+    summary: Run tests on bodhi / errata and dist-git PRs
+    discover+:
+        filter: tag:downstream
+    adjust+:
+        enabled: false
+        when: initiator == packit
diff --git a/rpm/netavark.spec b/rpm/netavark.spec
@@ -88,6 +88,30 @@ 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: bridge-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
@@ -110,12 +134,23 @@ NETAVARK_DEFAULT_FW=%{default_fw} %{__make} CARGO="%{__cargo}" build
 %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
@@ -137,5 +172,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
diff --git a/test-dhcp/tmt/main.fmf b/test-dhcp/tmt/main.fmf
@@ -0,0 +1,23 @@
+# Only common dependencies that are NOT required to run test_integration.sh are
+# specified here. Everything else is in test_integration.sh.
+require:
+    - cargo
+    - clippy
+    - go-md2man
+    - git-core
+    - make
+    - netavark-tests
+    - protobuf-compiler
+    - rustfmt
+
+adjust:
+    duration: 10m
+    when: arch == aarch64
+
+/integration:
+    tag: [ upstream, downstream ]
+    summary: Integration tests
+    test: bash test_integration.sh
+    environment:
+        NETAVARK: /usr/libexec/podman/netavark
+        TEST_PLUGINS: /usr/share/netavark/examples
diff --git a/test-dhcp/tmt/test_integration.sh b/test-dhcp/tmt/test_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
diff --git a/test/500-plugin.bats b/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" {
diff --git a/test/helpers.bash b/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})}
 
diff --git a/test/tmt/main.fmf b/test/tmt/main.fmf
@@ -0,0 +1,33 @@
+# Only common dependencies that are NOT required to run test_integration.sh are
+# specified here. Everything else is in test_integration.sh.
+require:
+    - cargo
+    - clippy
+    - go-md2man
+    - git-core
+    - make
+    - netavark-tests
+    - protobuf-compiler
+    - rustfmt
+
+adjust:
+    duration: 10m
+    when: arch == aarch64
+
+/validate:
+    tag: upstream
+    summary: Validate test
+    test: make -C $TMT_TREE validate
+
+/unit:
+    tag: upstream
+    summary: Unit test
+    test: make -C $TMT_TREE unit
+
+/integration:
+    tag: [ upstream, downstream ]
+    summary: Integration tests
+    test: bash test_integration.sh
+    environment:
+        NETAVARK: /usr/libexec/podman/netavark
+        TEST_PLUGINS: /usr/share/netavark/examples
diff --git a/test/tmt/test_integration.sh b/test/tmt/test_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

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ EOF`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`function run_netavark_plugins() {`
`36`		`- run_netavark --plugin-directory ./targets/release/examples/ "$@"`
	`36`	`+ run_netavark --plugin-directory $TEST_PLUGINS "$@"`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@test "plugin - test error message" {`