aboutsummaryrefslogtreecommitdiffstats
path: root/screwdriver/publish-unpublished-rpms-to-archive.sh
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@yahooinc.com>2023-11-08 13:49:32 +0100
committerArnstein Ressem <aressem@yahooinc.com>2023-11-08 13:49:32 +0100
commit1501ccb9efa3a5506cbd38f5f486db0d42bc25f8 (patch)
tree43e2fab9a16ba3da98697bb8c39ba25c81a5da14 /screwdriver/publish-unpublished-rpms-to-archive.sh
parent9f41363b07c2cee35e3ca0442217f40d38cb81b8 (diff)
Fix issues with sync and cleanup of archive artifacts.
Diffstat (limited to 'screwdriver/publish-unpublished-rpms-to-archive.sh')
-rwxr-xr-xscrewdriver/publish-unpublished-rpms-to-archive.sh11
1 files changed, 7 insertions, 4 deletions
diff --git a/screwdriver/publish-unpublished-rpms-to-archive.sh b/screwdriver/publish-unpublished-rpms-to-archive.sh
index 9804fc5eeec..32e1b07d3db 100755
--- a/screwdriver/publish-unpublished-rpms-to-archive.sh
+++ b/screwdriver/publish-unpublished-rpms-to-archive.sh
@@ -38,7 +38,7 @@ cd $DLDIR
readonly DNF="dnf -y -q --forcearch $RPMARCH"
-$DNF list --disablerepo='*' --enablerepo=copr:copr.fedorainfracloud.org:group_vespa:vespa --showduplicates 'vespa*' | grep "Available Packages" -A 100000 | tail -n +2 | sed '/\.src\ */d' | sed "s/\.$RPMARCH\ */-/" | awk '{print $1}' | grep -v '.src$' > $COPR_PACKAGES
+$DNF list --disablerepo='*' --enablerepo=copr:copr.fedorainfracloud.org:group_vespa:vespa --showduplicates 'vespa*' | grep "Available Packages" -A 100000 | tail -n +2 | sed '/\.src\ */d' | sed -E "s/\.($RPMARCH|noarch)\ */-/" | awk '{print $1}' | grep -v '.src$' > $COPR_PACKAGES
echo "Packages on Copr:"
cat $COPR_PACKAGES
@@ -46,9 +46,12 @@ echo
for pv in $(cat $COPR_PACKAGES); do
if ! $DNF list --disablerepo='*' --enablerepo=vespa-open-source-rpms $pv &> /dev/null; then
- echo "$pv not found on in archive. Downloading..."
- $DNF download --disablerepo='*' --enablerepo=copr:copr.fedorainfracloud.org:group_vespa:vespa $pv
- echo "$pv downloaded."
+ # Need one extra check here for noarch packages
+ if ! dnf -y -q --forcearch noarch list --disablerepo='*' --enablerepo=vespa-open-source-rpms $pv &> /dev/null; then
+ echo "$pv not found on in archive. Downloading..."
+ $DNF download --disablerepo='*' --enablerepo=copr:copr.fedorainfracloud.org:group_vespa:vespa $pv
+ echo "$pv downloaded."
+ fi
fi
done
echo