From 8ab604d098d86a94eca6d91af72c25773b678c0c Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Mon, 8 Feb 2021 11:53:33 -0500
Subject: [PATCH] ci: Temporarily use libsolv-0.7.17

We need to make sure that we can work with newer libsolv, which changed
how the rpmdb is found (see #2548).
---
 .cci.jenkinsfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile
index bfd89297..d41b8fbb 100644
--- a/.cci.jenkinsfile
+++ b/.cci.jenkinsfile
@@ -41,6 +41,9 @@ parallel insttests: {
           # include our built rpm-ostree in the image
           mkdir -p overrides/rpm
           mv *.rpm overrides/rpm
+          # for now, we cherry-pick newer libsolv to test that it correctly detects our rpmdb
+          # https://github.com/coreos/rpm-ostree/issues/2548
+          (cd overrides/rpm && curl -LO https://kojipkgs.fedoraproject.org//packages/libsolv/0.7.17/1.fc33/x86_64/libsolv-0.7.17-1.fc33.x86_64.rpm)
           coreos-assembler fetch
           coreos-assembler build
         """)