X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6943789309488520fddce83d0918e4c3261e779a..5b0d61f40100d50a53b460e397667d1ac85e174d:/build/package-testing/rpm-common-test-packages.sh diff --git a/build/package-testing/rpm-common-test-packages.sh b/build/package-testing/rpm-common-test-packages.sh index fb13eff33c..cd41f1d920 100755 --- a/build/package-testing/rpm-common-test-packages.sh +++ b/build/package-testing/rpm-common-test-packages.sh @@ -17,41 +17,16 @@ fi target="$(basename "$0" .sh)" target="${target##*-}" -case "$target" in - centos*) yum -q clean all ;; - rocky*) microdnf --assumeyes clean all ;; -esac +microdnf --assumeyes clean all touch /var/lib/rpm/* export ARV_PACKAGES_DIR="/arvados/packages/$target" rpm -qa | sort > "$ARV_PACKAGES_DIR/$1.before" - -case "$target" in - centos*) yum install --assumeyes -e 0 $1 ;; - rocky*) microdnf --assumeyes install $1 ;; -esac - +microdnf --assumeyes install "$1" rpm -qa | sort > "$ARV_PACKAGES_DIR/$1.after" - diff "$ARV_PACKAGES_DIR/$1".{before,after} >"$ARV_PACKAGES_DIR/$1.diff" || true -# Enable any Software Collections that the package depended on. -if [[ -d /opt/rh ]]; then - # We have to stage the list to a file, because `ls | while read` would - # make a subshell, causing the `source` lines to have no effect. - scl_list=$(mktemp) - ls /opt/rh >"$scl_list" - - # SCL scripts aren't designed to run with -eu. - set +eu - while read scl; do - source scl_source enable "$scl" - done <"$scl_list" - set -eu - rm "$scl_list" -fi - mkdir -p /tmp/opts cd /tmp/opts