Skip to content

Commit

Permalink
Fix dnf update installing netavark/aardvark-dns
Browse files Browse the repository at this point in the history
These packages should _never_ be pre-installed in the CI images for
testing in the netavark & aardvark-dns repositories.  Ensure they aren't
brought in by a package update in addition to the install.

Signed-off-by: Chris Evich <[email protected]>
  • Loading branch information
cevich committed Jul 14, 2022
1 parent c4b1e45 commit 1b2ff3a
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions cache_images/fedora-netavark_packaging.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,17 @@ INSTALL_PACKAGES=(\
zip
)

# Downstream users of this image are specifically testing netavark & aardvark-dns.
# They will take care of either building or obtaining the relelvent binaries
# at runtime. Similar for cargo and rust. Ensure these are absent, to allow
# runtime install of newer bits.
EXARG="--exclude=netavark --exclude=aardvark-dns --exclude=cargo --exclude=rust"

msg "Installing general build/test dependencies"
bigto $SUDO dnf install -y $EXARG "${INSTALL_PACKAGES[@]}"

# It was observed in F33, dnf install doesn't always get you the latest/greatest
lilto $SUDO dnf update -y
# It was observed in F33, dnf install doesn't always get you the latest/greatest.
lilto $SUDO dnf update -y $EXARG

msg "Initializing upstream rust environment."
export CARGO_HOME="/var/cache/cargo" # must match .cirrus.yml in netavark repo
Expand Down

0 comments on commit 1b2ff3a

Please sign in to comment.