Merge pull request #1040 from cgwalters/curl-fail

build.sh: Use our embedded spec

Author: cgwalters

hack/Containerfile

@@ -7,6 +7,9 @@
 # https://tmt.readthedocs.io/en/stable/
 ARG base=quay.io/centos-bootc/centos-bootc:stream9
 FROM $base as build
+# Keep this stuff before the `COPY . /build` below to ensure that the packages
+# are cached, i.e. we don't invalidate the package install stage by editing the source.
+COPY contrib /contrib
 COPY hack/build.sh /build.sh
 RUN /build.sh && rm -v /build.sh
 COPY . /build

hack/build.sh

@@ -5,10 +5,6 @@ case $ID in
   centos|rhel) dnf config-manager --set-enabled crb;;
   fedora) dnf -y install dnf-utils ;;
 esac
-# Fetch the latest spec from fedora to ensure we've got the latest build deps
-t=$(mktemp --suffix .spec)
-curl -L -o ${t} https://src.fedoraproject.org/rpms/bootc/raw/rawhide/f/bootc.spec
-dnf -y builddep "${t}"
-rm -f "${t}"
+dnf -y builddep ./contrib/packaging/bootc.spec
 # Extra dependencies
 dnf -y install git-core

tests/containerfiles/lbi/Containerfile

@@ -7,6 +7,9 @@
 # https://tmt.readthedocs.io/en/stable/
 ARG base=quay.io/centos-bootc/centos-bootc:stream9
 FROM $base as build
+# Keep this stuff before the `COPY . /build` below to ensure that the packages
+# are cached, i.e. we don't invalidate the package install stage by editing the source.
+COPY contrib /contrib
 COPY hack/build.sh /build.sh
 RUN /build.sh && rm -v /build.sh
 COPY . /build