Skip to content

Commit 9417822

Browse files
committed
Remove versionlock avoiding certain condor rc's
the bad RPMs have been removed from the repos
1 parent f339747 commit 9417822

File tree

1 file changed

+0
-19
lines changed

1 file changed

+0
-19
lines changed

Dockerfile

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -66,25 +66,6 @@ RUN \
6666
log "Installing crypto-policies-scripts (EL8)" && time \
6767
yum -y install crypto-policies-scripts; \
6868
fi && \
69-
# avoid condor 23.x release candidates and dailies until we get an all clear from the devs \
70-
# FIXME this code can be removed once the bad versions are gone \
71-
if [[ $OSG_RELEASE == 23 ]]; then \
72-
# OSG 23 implies el8+ \
73-
dnf -y install dnf-plugin-versionlock && \
74-
# versionlock locks globs, not ranges so this is annoying \
75-
# the issue got fixed in 23.4.0-0.706796 and 23.5.0-0.706930 \
76-
# \
77-
# handle 23.4.0 -- avoid [0.700000,0.706796): \
78-
dnf versionlock exclude "condor-0:23.4.0-0.70[0-6]*" --enablerepo="osg-upcoming*" && \
79-
dnf versionlock del "condor-0:23.4.0-0.70679[6-9]*" \
80-
"condor-0:23.4.0-0.706[8-9]*" --enablerepo="osg-upcoming*" && \
81-
# \
82-
# handle 23.5.* -- avoid [0.70000,0.706930): \
83-
dnf versionlock exclude "condor-0:23.5.0-0.70[0-6]*" --enablerepo="osg-upcoming*" && \
84-
dnf versionlock del "condor-0:23.5.0-0.7069[3-9]*" --enablerepo="osg-upcoming*" && \
85-
# verify the results \
86-
dnf versionlock list | sort; \
87-
fi && \
8869
log "Cleaning up YUM metadata" && time \
8970
yum clean all && \
9071
rm -rf /var/cache/yum/ && \

0 commit comments

Comments
 (0)