Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

fix rhelX-sync to pull down noarch packages and sub-arch for x86_64

Browse source
This commit is contained in:
Stephen Smoogen 2020-08-12 11:31:00 -04:00
parent 93b621de39
commit 29e454091c
2 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
roles/batcave/files/rhel6-sync
View file

@ -13,16 +13,17 @@ for i in i686 x86_64 ppc64; do
mkdir -p ${RHEL6CACHEDIR}/${i} mkdir -p ${RHEL6CACHEDIR}/${i}
done done
dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-i386.conf ${DNFOPTS} --repoid=rhel-6-server-i386 -p i386 -a i686 --metadata-path ${RHEL6CACHEDIR}/i686 #dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-i386.conf ${DNFOPTS} --repoid=rhel-6-server-i386 -p i386 -a i686 --metadata-path ${RHEL6CACHEDIR}/i686
dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-i386.conf ${DNFOPTS} --repoid rhel-6-server-optional-i386 -p i386 -a i686 --metadata-path ${RHEL6CACHEDIR}/i686 #dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-i386.conf ${DNFOPTS} --repoid rhel-6-server-optional-i386 -p i386 -a i686 --metadata-path ${RHEL6CACHEDIR}/i686
dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-x86_64.conf ${DNFOPTS} --repoid rhel-6-server-x86_64 -p x86_64 --metadata-path ${RHEL6CACHEDIR}/x86_64 DNF_ARCH="-p x86_64 -a x86_64 -a i686 -a noarch"
dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-x86_64.conf ${DNFOPTS} --repoid rhel-6-server-optional-x86_64 -p x86_64 --metadata-path ${RHEL6CACHEDIR}/x86_64 dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-x86_64.conf ${DNFOPTS} --repoid rhel-6-server-x86_64 ${DNF_ARCH} --metadata-path ${RHEL6CACHEDIR}/x86_64
dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-x86_64.conf ${DNFOPTS} --repoid rhel-6-server-ha-x86_64 -p x86_64 --metadata-path ${RHEL6CACHEDIR}/x86_64 dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-x86_64.conf ${DNFOPTS} --repoid rhel-6-server-optional-x86_64 ${DNF_ARCH} --metadata-path ${RHEL6CACHEDIR}/x86_64
dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-x86_64.conf ${DNFOPTS} --repoid rhel-6-server-lb-x86_64 -p x86_64 --metadata-path ${RHEL6CACHEDIR}/x86_64 dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-x86_64.conf ${DNFOPTS} --repoid rhel-6-server-ha-x86_64 ${DNF_ARCH} --metadata-path ${RHEL6CACHEDIR}/x86_64
dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-x86_64.conf ${DNFOPTS} --repoid rhel-6-server-lb-x86_64 ${DNF_ARCH} --metadata-path ${RHEL6CACHEDIR}/x86_64
dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-ppc64.conf ${DNFOPTS} --repoid rhel-6-server-ppc64 -p ppc64 -a ppc64 --metadata-path ${RHEL6CACHEDIR}/ppc64 dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-ppc64.conf ${DNFOPTS} --repoid rhel-6-server-ppc64 -p ppc64 -a ppc64 -a noarch --metadata-path ${RHEL6CACHEDIR}/ppc64
dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-ppc64.conf ${DNFOPTS} --repoid rhel-6-server-optional-ppc64 -p ppc64 -a ppc64 --metadata-path ${RHEL6CACHEDIR}/ppc64 dnf reposync -c $RHEL6SYNCDIR/yum-lockbox-rhel6-ppc64.conf ${DNFOPTS} --repoid rhel-6-server-optional-ppc64 -p ppc64 -a ppc64 -a noarch --metadata-path ${RHEL6CACHEDIR}/ppc64
for i in `ls -d /srv/web/repo/rhel/rhel6/i386/*` for i in `ls -d /srv/web/repo/rhel/rhel6/i386/*`
do do

13
roles/batcave/files/rhel7-sync
View file

@ -5,9 +5,8 @@ SYNCDIR=/var/cache/reposync/
YUMDIR=/var/tmp/reposync-rhel7/ YUMDIR=/var/tmp/reposync-rhel7/
## Need to download the metadata and the modular data ## Need to download the metadata and the modular data
DNFOPTS='--download-metadata -m ' DNFOPTS='--download-metadata --remote-time --delete'
# s390 isnt working yet
ARCHES="ppc64le s390x x86_64" ARCHES="ppc64le s390x x86_64"
#ARCHES="x86_64" #ARCHES="x86_64"
@ -21,19 +20,23 @@ cd $RHEL7SYNCDIR
## ##
## Sync out RHEL-7 for appropriate arches ## Sync out RHEL-7 for appropriate arches
for A in ${ARCHES}; do for A in ${ARCHES}; do
if [[ ${A} == 'x86_64' ]]; then
DNF_ARCH='-p ${A} -a ${A} -a noarch -a i686'
else
DNF_ARCH='-p ${A} -a ${A} -a noarch'
fi
rm -rf ${SYNCDIR}/${A} rm -rf ${SYNCDIR}/${A}
CONF=yum-batcave-rhel7-${A}.conf CONF=yum-batcave-rhel7-${A}.conf
REPOS="rhel-7-for-${A}-server-rpms rhel-7-ha-for-${A}-server-rpms rhel-7-extras-for-${A}-server-rpms rhel-7-optional-for-${A}-server-rpms rhel-7-devtools-for-${A}-server-rpms rhel-7-rhscl-for-${A}-server-rpms" REPOS="rhel-7-for-${A}-server-rpms rhel-7-ha-for-${A}-server-rpms rhel-7-extras-for-${A}-server-rpms rhel-7-optional-for-${A}-server-rpms rhel-7-devtools-for-${A}-server-rpms rhel-7-rhscl-for-${A}-server-rpms"
# REPOS="rhel-7-rhscl-for-${A}-server-rpms"
for R in ${REPOS}; do for R in ${REPOS}; do
rm -rf ${YUMDIR}/${R} rm -rf ${YUMDIR}/${R}
# Test to see if we have this repository in our tree # Test to see if we have this repository in our tree
grep -q ${R} ${RHEL7SYNCDIR}/${CONF} grep -q ${R} ${RHEL7SYNCDIR}/${CONF}
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
echo "Syncing ${R} for ${A}" echo "Syncing ${R} for ${A}"
dnf reposync -c ${RHEL7SYNCDIR}/${CONF} ${DNFOPTS} --repoid ${R} -a ${A} -p ${A} --metadata-path ${YUMDIR}/${A} dnf reposync -c ${RHEL7SYNCDIR}/${CONF} ${DNFOPTS} --repoid ${R} ${DNF_ARCH} --metadata-path ${YUMDIR}/${A}
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
echo "Something went wrong with reposync -c ${RHEL7SYNCDIR}/${CONF} ${DNFOPTS} --repoid ${R} -a ${A} -a noarch -p ${A} --metadata-path ${YUMDIR}/${A}" echo "Something went wrong with reposync -c ${RHEL7SYNCDIR}/${CONF} ${DNFOPTS} --repoid ${R} ${DNF_ARCH} --metadata-path ${YUMDIR}/${A}"
continue continue
fi fi
## Try to create repo ## Try to create repo