Use ostree-rs-ext 0.5.0

Part of coreos/enhancements#7

.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

.dockerignore

@@ -1,2 +1,3 @@
 .cosa
 target
+compose-cache/

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"

ci/cosa-overrides.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+# Inject ideally temporary overrides into our cosa build
+# skopeo for containers https://github.com/containers/skopeo/pull/1476
+cd overrides/rpm
+curl -L --remote-name-all \
+  https://kojipkgs.fedoraproject.org//packages/skopeo/1.5.1/1.fc35/x86_64/skopeo-1.5.1-1.fc35.x86_64.rpm

ci/prow/Dockerfile

@@ -4,7 +4,7 @@ COPY . .
 RUN ./ci/build.sh && make install DESTDIR=/cosa/component-install
 RUN make -C tests/kolainst install DESTDIR=/cosa/component-tests
 # Uncomment this to fake a build to test the code below
-# RUN mkdir -p /cosa/component-install/usr/bin && echo foo > /cosa/component-install/usr/bin/foo
+@RUN mkdir -p /cosa/component-install/usr/bin && echo foo > /cosa/component-install/usr/bin/foo
 
 FROM quay.io/coreos-assembler/coreos-assembler:latest
 WORKDIR /srv
@@ -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/prow/fcos-e2e /usr/bin/fcos-e2e
 USER builder