Use ostree-rs-ext 0.5.0

Part of coreos/enhancements#7
cgwalters · Nov 6, 2021 · 1cacae0 · 1cacae0
1 parent 3a02d03
commit 1cacae0
Show file tree

Hide file tree

Showing 14 changed files with 304 additions and 125 deletions.
diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile
@@ -47,9 +47,7 @@ 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)
+          ${env.WORKSPACE}/ci/cosa-overrides.sh
           coreos-assembler fetch
           coreos-assembler build
            ${env.WORKSPACE}/ci/composepost-checks.sh

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -53,7 +53,7 @@ openat = "0.1.21"
 openat-ext = "^0.2.2"
 openssl = "0.10.38"
 os-release = "0.1.0"
-ostree-ext = "0.3.0"
+ostree-ext = { git = "https://github.com/ostreedev/ostree-rs-ext", branch = "main" }
 paste = "1.0"
 phf = { version = "0.10", features = ["macros"] }
 rand = "0.8.4"

diff --git a/ci/prow/Dockerfile b/ci/prow/Dockerfile
@@ -15,5 +15,7 @@ COPY --from=builder /cosa /cosa
 RUN rsync -rlv /cosa/component-install/ /
 # Merge installed tests
 RUN rsync -rlv /cosa/component-tests/ /
-COPY --from=builder /src/ci/prow/fcos-e2e.sh /usr/bin/fcos-e2e
+# Grab all of our ci scripts
+COPY --from=builder /src/ci/ /ci/
+RUN ln -sr /ci/fcos-e2e /usr/bin/fcos-e2e
 USER builder
diff --git a/ci/prow/fcos-e2e.sh b/ci/prow/fcos-e2e.sh
@@ -10,6 +10,7 @@ rpm-ostree --version
 cd $(mktemp -d)
 cosa init https://github.com/coreos/fedora-coreos-config/
 rsync -rlv /cosa/component-install/ overrides/rootfs/
+/ci/cosa-overrides.sh
 cosa fetch
 cosa build
 cosa kola run 'ext.rpm-ostree.*'
diff --git a/packaging/rpm-ostree.spec.in b/packaging/rpm-ostree.spec.in
@@ -48,7 +48,7 @@ BuildRequires: gnome-common
 BuildRequires: /usr/bin/g-ir-scanner
 # Core requirements
 # One way to check this: `objdump -p /path/to/rpm-ostree | grep LIBOSTREE` and pick the highest (though that might miss e.g. new struct members)
-BuildRequires: pkgconfig(ostree-1) >= 2021.1
+BuildRequires: pkgconfig(ostree-1) >= 2021.5
 BuildRequires: pkgconfig(polkit-gobject-1)
 BuildRequires: pkgconfig(json-glib-1.0)
 BuildRequires: pkgconfig(rpm) >= 4.14.0