ci: adapt to 'dtrace' package split

Fedora has decided to separate dtrace out of the systemtap-sdt-devel
package: https://fedoraproject.org/wiki/Changes/Separate_dtrace_package

Similarly, these are split in OpenSUSE Tumbleweed, however in a
backward-compatbile way:
https://build.opensuse.org/package/show/openSUSE:Factory/systemtap

Require the new 'systemtap' package mapping, as well as the old
'dtrace'.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/ci/buildenv/fedora-rawhide.sh b/ci/buildenv/fedora-rawhide.sh
index cbfeb71c92b8d1024a817582d580c69c3b9bb122..d6dcf86733142cd783fa42bd4dc3d6990c120bcb 100644 (file)
--- a/ci/buildenv/fedora-rawhide.sh
+++ b/ci/buildenv/fedora-rawhide.sh
@@ -83,6 +83,7 @@ function install_buildenv() {
         systemd-devel \
         systemd-rpm-macros \
         systemtap-sdt-devel \
+        systemtap-sdt-dtrace \
         wireshark-devel \
         xen-devel
     rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED

diff --git a/ci/buildenv/opensuse-tumbleweed.sh b/ci/buildenv/opensuse-tumbleweed.sh
index 4e0f81262222c4b2f7b56951878b77da0fb18fa0..b3175fe4040fbfda5a24e402504c6ce57b34f38e 100644 (file)
--- a/ci/buildenv/opensuse-tumbleweed.sh
+++ b/ci/buildenv/opensuse-tumbleweed.sh
@@ -81,7 +81,8 @@ function install_buildenv() {
            sanlock-devel \
            sed \
            systemd-rpm-macros \
-           systemtap-sdt-devel \
+           systemtap-dtrace \
+           systemtap-headers \
            wireshark-devel \
            xen-devel
     rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED

diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile
index a673f82b4b2fa793e7120b7080b27d62b4d901e6..a1cb9ec978cdeca22ca2568630694d504930012f 100644 (file)
--- a/ci/containers/fedora-rawhide.Dockerfile
+++ b/ci/containers/fedora-rawhide.Dockerfile
@@ -94,6 +94,7 @@ exec "$@"\n' > /usr/bin/nosync && \
                systemd-devel \
                systemd-rpm-macros \
                systemtap-sdt-devel \
+               systemtap-sdt-dtrace \
                wireshark-devel \
                xen-devel && \
     nosync dnf autoremove -y && \

diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile
index 82b6aee14221068eca4ef4b1fe79a0ecaaa0ce51..d7cbc88e1a79adf8dbbf087ff88911bfcb816213 100644 (file)
--- a/ci/containers/opensuse-tumbleweed.Dockerfile
+++ b/ci/containers/opensuse-tumbleweed.Dockerfile
@@ -82,7 +82,8 @@ RUN zypper dist-upgrade -y && \
            sanlock-devel \
            sed \
            systemd-rpm-macros \
-           systemtap-sdt-devel \
+           systemtap-dtrace \
+           systemtap-headers \
            wireshark-devel \
            xen-devel && \
     zypper clean --all && \

diff --git a/ci/lcitool/projects/libvirt.yml b/ci/lcitool/projects/libvirt.yml
index b29fe227bb03d4f34fdd8b11b8fa5b2d3829877e..9f8fc06ce4ef02db8c6b423f0a38911cbf4f1ead 100644 (file)
--- a/ci/lcitool/projects/libvirt.yml
+++ b/ci/lcitool/projects/libvirt.yml
@@ -76,6 +76,7 @@ packages:
   - sed
   - showmount
   - systemd-rpm-macros
+  - systemtap
   - tc
   - wireshark
   - xen