[v1 backport] Updating CI images & drgn 0.0.29 support

buildrpm/python-drgn-tools.spec

@@ -20,7 +20,7 @@ BuildRequires: python%{python3_pkgversion}-wheel
 
 # The drgn dependency can be fulfilled by drgn with, or without, CTF support.
 # However, drgn-tools is tied to specific drgn releases.
-Requires: drgn >= 0.0.25, drgn < 0.0.28
+Requires: drgn >= 0.0.25, drgn < 0.0.30
 
 %global _description %{expand:
 drgn-tools extends the drgn debugger with scripts & helpers developed by the

drgn_tools/nvme.py

@@ -215,7 +215,12 @@ def for_each_msi_desc(pdev: Object) -> Iterable[Object]:
  # structure.
  list = pdev.dev.msi.data.list
 
- if list is not None:
+ # Unfortunately, some of the commits below (which switch to an xarray) have
+ # been backported without deleting the list_heads above. This leaves a valid
+ # list in these structures, but with null next/prev fields. Detect NULL
+ # entries here and assume that's the case, falling through to the xarray
+ # case.
+ if list is not None and list.next:
  return list_for_each_entry(
  "struct msi_desc", list.address_of_(), "list"
  )

requirements-dev.txt

@@ -1,2 +1,2 @@
-drgn>=0.0.25,<0.0.28
+drgn>=0.0.25,<0.0.30
 pytest<7.1

setup.py

@@ -90,7 +90,7 @@ def get_version():
  description="drgn helper script repository",
  long_description=long_description,
  install_requires=[
- "drgn>=0.0.25,<0.0.28",
+ "drgn>=0.0.25,<0.0.30",
  ],
  url="https:/oracle-samples/drgn-tools",
  author="Oracle Linux Sustaining Engineering Team",

testing/heavyvm/images.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2024, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 """
 Describes the "heavy" images used for running tests
@@ -37,28 +37,28 @@ def ks_name(self) -> str:
  # OL9: UEK 7
  ImageInfo(
  9,
- 2,
+ 4,
  7,
  "x86_64",
- "https://yum.oracle.com/ISOS/OracleLinux/OL9/u1/x86_64/OracleLinux-R9-U1-x86_64-boot-uek.iso", # noqa
- [],
+ "https://yum.oracle.com/ISOS/OracleLinux/OL9/u4/x86_64/OracleLinux-R9-U4-x86_64-boot-uek.iso", # noqa
+ ["drgn-0.0.29-1.0.1.el9.x86_64.rpm"],
  ),
  # OL8: UEK 6-7
  ImageInfo(
  8,
- 8,
+ 10,
  7,
  "x86_64",
- "https://yum.oracle.com/ISOS/OracleLinux/OL8/u7/x86_64/x86_64-boot-uek.iso", # noqa
- [],
+ "https://yum.oracle.com/ISOS/OracleLinux/OL8/u10/x86_64/OracleLinux-R8-U10-x86_64-boot-uek.iso", # noqa
+ ["drgn-0.0.29-1.0.1.el8.x86_64.rpm"],
  ),
  ImageInfo(
  8,
- 8,
+ 10,
  6,
  "x86_64",
- "https://yum.oracle.com/ISOS/OracleLinux/OL8/u7/x86_64/x86_64-boot-uek.iso", # noqa
- [],
+ "https://yum.oracle.com/ISOS/OracleLinux/OL8/u10/x86_64/OracleLinux-R8-U10-x86_64-boot-uek.iso", # noqa
+ ["drgn-0.0.29-1.0.1.el8.x86_64.rpm"],
  ),
  # OL7: UEK 4-6
  ImageInfo(
@@ -67,23 +67,23 @@ def ks_name(self) -> str:
  6,
  "x86_64",
  "https://yum.oracle.com/ISOS/OracleLinux/OL7/u9/x86_64/x86_64-boot-uek.iso", # noqa
- ["drgn-0.0.25-1.0.2.el7.x86_64.rpm"],
+ ["drgn-0.0.29-1.0.1.el7.x86_64.rpm"],
  ),
  ImageInfo(
  7,
  9,
  5,
  "x86_64",
  "https://yum.oracle.com/ISOS/OracleLinux/OL7/u9/x86_64/x86_64-boot-uek.iso", # noqa
- ["drgn-0.0.25-1.0.2.el7.x86_64.rpm"],
+ ["drgn-0.0.29-1.0.1.el7.x86_64.rpm"],
  ),
  ImageInfo(
  7,
  9,
  4,
  "x86_64",
  "https://yum.oracle.com/ISOS/OracleLinux/OL7/u9/x86_64/x86_64-boot-uek.iso", # noqa
- ["drgn-0.0.25-1.0.2.el7.x86_64.rpm"],
+ ["drgn-0.0.29-1.0.1.el7.x86_64.rpm"],
  ),
 ]
 NAME_TO_CONFIGURATION = {i.name: i for i in CONFIGURATIONS}

testing/heavyvm/imgbuild.py

@@ -278,10 +278,7 @@ def run_post_install(ctx: Context) -> None:
  # Starting in OL9, it looks like fio engines are packaged separately
  install_packages.append("fio-engine-libaio")
 
- # Install drgn either from Yum repo (OL8+, or from RPMs hosted on kickstart
- # server)
- if ctx.image_info.ol >= 8:
- install_packages.append("drgn")
+ # Install drgn from RPMs hosted on kickstart server
  for filename in ctx.image_info.rpms:
  install_packages.append(ctx.ks_srv.url_for(Path(filename).absolute()))