Fedora: drop uname -r kernel devel

microsoft · Jan 18, 2024 · 00c47a2 · 00c47a2
1 parent 35166b7
commit 00c47a2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 22 deletions.
diff --git a/microsoft/testsuites/dpdk/dpdksuite.py b/microsoft/testsuites/dpdk/dpdksuite.py
@@ -84,7 +84,7 @@ def before_case(self, log: Logger, **kwargs: Any) -> None:
  min_core_count=8,
  min_nic_count=2,
  network_interface=Sriov(),
- unsupported_features=[Gpu, Infiniband],
+ # unsupported_features=[Gpu, Infiniband],
  ),
  )
  def verify_dpdk_build_netvsc(
@@ -106,7 +106,7 @@ def verify_dpdk_build_netvsc(
  min_core_count=8,
  min_nic_count=2,
  network_interface=Sriov(),
- unsupported_features=[Gpu, Infiniband],
+ # unsupported_features=[Gpu, Infiniband],
  ),
  )
  def verify_dpdk_build_gb_hugepages_netvsc(
@@ -128,7 +128,7 @@ def verify_dpdk_build_gb_hugepages_netvsc(
  min_core_count=8,
  min_nic_count=2,
  network_interface=Sriov(),
- unsupported_features=[Gpu, Infiniband],
+ # unsupported_features=[Gpu, Infiniband],
  ),
  )
  def verify_dpdk_build_failsafe(
@@ -150,7 +150,7 @@ def verify_dpdk_build_failsafe(
  min_core_count=8,
  min_nic_count=2,
  network_interface=Sriov(),
- unsupported_features=[Gpu, Infiniband],
+ # unsupported_features=[Gpu, Infiniband],
  ),
  )
  def verify_dpdk_build_gb_hugepages_failsafe(
@@ -167,7 +167,7 @@ def verify_dpdk_build_gb_hugepages_failsafe(
  min_core_count=8,
  min_nic_count=2,
  network_interface=Sriov(),
- unsupported_features=[Gpu, Infiniband],
+ # unsupported_features=[Gpu, Infiniband],
  disk=schema.DiskOptionSettings(
  data_disk_count=search_space.IntRange(min=1),
  data_disk_size=search_space.IntRange(min=64),
@@ -217,7 +217,7 @@ def verify_dpdk_ovs(
  min_core_count=8,
  min_nic_count=2,
  network_interface=Sriov(),
- unsupported_features=[Gpu, Infiniband],
+ # unsupported_features=[Gpu, Infiniband],
  supported_features=[IsolatedResource],
  ),
  )
@@ -243,7 +243,7 @@ def verify_dpdk_nff_go(
  requirement=simple_requirement(
  min_nic_count=3,
  network_interface=Sriov(),
- unsupported_features=[Gpu, Infiniband],
+ # unsupported_features=[Gpu, Infiniband],
  supported_features=[IsolatedResource],
  ),
  )
@@ -339,7 +339,7 @@ def verify_dpdk_multiprocess(
  min_core_count=8,
  min_nic_count=2,
  network_interface=Sriov(),
- unsupported_features=[Gpu, Infiniband],
+ # unsupported_features=[Gpu, Infiniband],
  min_count=2,
  supported_features=[IsolatedResource],
  ),
@@ -378,7 +378,7 @@ def verify_dpdk_sriov_rescind_failover_receiver(
  min_core_count=8,
  min_nic_count=2,
  network_interface=Sriov(),
- unsupported_features=[Gpu, Infiniband],
+ # unsupported_features=[Gpu, Infiniband],
  supported_features=[IsolatedResource],
  ),
  )
@@ -435,7 +435,7 @@ def _check_rx_or_tx_pps(
  min_core_count=8,
  min_nic_count=2,
  network_interface=Sriov(),
- unsupported_features=[Gpu, Infiniband],
+ # unsupported_features=[Gpu, Infiniband],
  ),
  )
  def verify_dpdk_vpp(
@@ -482,7 +482,7 @@ def verify_dpdk_vpp(
  min_core_count=8,
  min_nic_count=2,
  network_interface=Sriov(),
- unsupported_features=[Gpu, Infiniband],
+ # unsupported_features=[Gpu, Infiniband],
  supported_features=[IsolatedResource],
  ),
  )
@@ -556,7 +556,7 @@ def verify_dpdk_ring_ping(
  min_core_count=8,
  min_nic_count=2,
  network_interface=Sriov(),
- unsupported_features=[Gpu, Infiniband],
+ # unsupported_features=[Gpu, Infiniband],
  min_count=2,
  ),
  )
@@ -608,7 +608,7 @@ def verify_dpdk_send_receive_multi_txrx_queue_netvsc(
  min_core_count=8,
  min_nic_count=2,
  network_interface=Sriov(),
- unsupported_features=[Gpu, Infiniband],
+ # unsupported_features=[Gpu, Infiniband],
  min_count=2,
  ),
  )
@@ -634,7 +634,7 @@ def verify_dpdk_send_receive_failsafe(
  min_nic_count=2,
  network_interface=Sriov(),
  min_count=2,
- unsupported_features=[Gpu, Infiniband],
+ # unsupported_features=[Gpu, Infiniband],
  ),
  )
  def verify_dpdk_send_receive_gb_hugepages_failsafe(
@@ -659,7 +659,7 @@ def verify_dpdk_send_receive_gb_hugepages_failsafe(
  min_core_count=8,
  min_nic_count=2,
  network_interface=Sriov(),
- unsupported_features=[Gpu, Infiniband],
+ # unsupported_features=[Gpu, Infiniband],
  min_count=2,
  ),
  )
@@ -685,7 +685,7 @@ def verify_dpdk_send_receive_netvsc(
  min_nic_count=2,
  network_interface=Sriov(),
  min_count=2,
- unsupported_features=[Gpu, Infiniband],
+ # unsupported_features=[Gpu, Infiniband],
  ),
  )
  def verify_dpdk_send_receive_gb_hugepages_netvsc(
@@ -717,7 +717,7 @@ def verify_dpdk_send_receive_gb_hugepages_netvsc(
  min_count=3,
  min_nic_count=3,
  network_interface=Sriov(),
- unsupported_features=[Gpu, Infiniband],
+ # unsupported_features=[Gpu, Infiniband],
  ),
  )
  def verify_dpdk_l3fwd_ntttcp_tcp(
@@ -744,7 +744,7 @@ def verify_dpdk_l3fwd_ntttcp_tcp(
  min_count=3,
  min_nic_count=3,
  network_interface=Sriov(),
- unsupported_features=[Gpu, Infiniband],
+ # unsupported_features=[Gpu, Infiniband],
  ),
  )
  def verify_dpdk_l3fwd_ntttcp_tcp_gb_hugepages(
@@ -769,7 +769,7 @@ def verify_dpdk_l3fwd_ntttcp_tcp_gb_hugepages(
  requirement=simple_requirement(
  min_nic_count=2,
  network_interface=Sriov(),
- unsupported_features=[Gpu, Infiniband],
+ # unsupported_features=[Gpu, Infiniband],
  supported_features=[IsolatedResource],
  ),
  )

diff --git a/microsoft/testsuites/dpdk/dpdktestpmd.py b/microsoft/testsuites/dpdk/dpdktestpmd.py
@@ -887,10 +887,9 @@ def _install_fedora_dependencies(self) -> None:
  rhel.install_packages(["libmnl-devel", "libbpf-devel"])
 
  try:
- rhel.install_packages("kernel-devel-$(uname -r)")
- except MissingPackagesException:
- node.log.debug("kernel-devel-$(uname -r) not found. Trying kernel-devel")
  rhel.install_packages("kernel-devel")
+ except MissingPackagesException:
+ node.log.debug("Fedora: kernel-devel not found, attempting to continue")
 
  # RHEL 8 doesn't require special cases for installed packages.
  # TODO: RHEL9 may require updates upon release