diff --git a/roles/batcave/files/centos-8-sync b/roles/batcave/files/centos-8-sync deleted file mode 100644 index bf394baa9c..0000000000 --- a/roles/batcave/files/centos-8-sync +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -## Set up variables we use -RSYNC='/usr/bin/rsync' -RS_OPT="-avSHP --numeric-ids" -#RS_DEADLY="--delete --delete-excluded --delete-delay --delay-updates" -RS_DEADLY="--delete --delete-delay --delay-updates" -CENT_EXCLUDES="--exclude=isos --exclude=kickstart --exclude=s390x" - -SERVER=centos-master01.iad2.fedoraproject.org - -## Mirror CentOS-8-Stream - -RSYNC_DESTDIR=/mnt/fedora/app/fi-repo/centos/centos-8-stream/ -RSYNC_MOD="CentOS-community-cage/centos/8-stream/" - -mkdir -p ${RSYNC_DESTDIR} - - -${RSYNC} ${RS_OPT} ${RS_DEADLY} ${CENT_EXCLUDES} ${SERVER}::${RSYNC_MOD} ${RSYNC_DESTDIR} diff --git a/roles/batcave/files/sync-centos b/roles/batcave/files/sync-centos index 7f8a5f52cc..a79f3a4449 100644 --- a/roles/batcave/files/sync-centos +++ b/roles/batcave/files/sync-centos @@ -1,3 +1,2 @@ -30 4 * * * root /mnt/fedora/app/fi-repo/centos/centos-8-sync > /dev/null 50 4 * * * root /mnt/fedora/app/fi-repo/centos/centos-9s-sync > /dev/null 50 5 * * * root /mnt/fedora/app/fi-repo/centos/centos-10-sync > /dev/null diff --git a/roles/batcave/tasks/main.yml b/roles/batcave/tasks/main.yml index 18cdc396fa..5208f1d895 100644 --- a/roles/batcave/tasks/main.yml +++ b/roles/batcave/tasks/main.yml @@ -22,7 +22,7 @@ - ostree # Needed for rhn sync - bind # named-checkzone for dns repo - emacs-nox - - nano + - nano - rpm-sign # for the sign-and-import playbook - createrepo # for the sign-and-import playbook - unzip # general useful util @@ -323,17 +323,6 @@ when: inventory_hostname.startswith('batcave01') -# -# Setup centos sync script. -# - -- name: setup centos sync script - copy: src=centos-8-sync dest=/mnt/fedora/app/fi-repo/centos/centos-8-sync mode=0775 - tags: - - batcave - - config - when: inventory_hostname.startswith('batcave01') - # # sync-centos cron job # diff --git a/roles/grobisplitter/files/cents8-split.cron b/roles/grobisplitter/files/cents8-split.cron deleted file mode 100644 index fe48207603..0000000000 --- a/roles/grobisplitter/files/cents8-split.cron +++ /dev/null @@ -1,2 +0,0 @@ -10 10 * * * root /usr/local/bin/cents8-split.sh -0 0 * * 1 root /usr/bin/find /mnt/fedora/app/fi-repo/centos/stream8-kojitarget -mindepth 1 -maxdepth 1 -type d -mtime +14 -exec rm -rf '{}' \; diff --git a/roles/grobisplitter/files/cents8-split.sh b/roles/grobisplitter/files/cents8-split.sh deleted file mode 100755 index da053bd7db..0000000000 --- a/roles/grobisplitter/files/cents8-split.sh +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/bash - -## Setup basic environment variables. -HOMEDIR=/mnt/fedora/app/fi-repo/centos/centos-8-stream -BINDIR=/usr/local/bin - -ARCHES="aarch64 ppc64le x86_64" -DATE=$(date -Ih | sed 's/+.*//') - -KOJIDIR=/mnt/fedora/app/fi-repo/centos/stream8-kojitarget -DATEDIR=${KOJIDIR}/${DATE} -TIME_FILE=${DATEDIR}/timestamp - -## -## Make a directory for where the new tree will live. Use a new date -## so that we can roll back to an older release or stop updates for -## some time if needed. -if [ -d ${DATEDIR} ]; then - echo "Directory already exists. Please remove or fix" - exit -else - mkdir -p ${DATEDIR} - touch ${TIME_FILE} -fi - -## -## Go through each architecture and split out the trees. This is done -## differently than RHEL because we don't use reposync to get the files -## -for ARCH in ${ARCHES}; do - # The archdir is where we daily download updates for rhel8 - - # We consolidate all of the default repositories and remerge them - # in a daily tree. This allows us to point koji at a particular - # day if we have specific build concerns. - OUTDIR=${DATEDIR}/${ARCH} - mkdir -p ${OUTDIR} - if [ ! -d ${OUTDIR} ]; then - echo "Unable to find ${ARCHDIR}" - exit - else - cd ${OUTDIR} - fi - - # Begin splitting the various packages into their subtrees - ${BINDIR}/splitter.py --action hardlink --target CS-8-001 ${HOMEDIR}/BaseOS/${ARCH}/os/ --only-defaults &> /dev/null - if [ $? -ne 0 ]; then - echo "splitter ${ARCH} baseos failed" - exit - fi - ${BINDIR}/splitter.py --action hardlink --target CS-8-002 ${HOMEDIR}/AppStream/${ARCH}/os/ --only-defaults --hack-python39 &> /dev/null - if [ $? -ne 0 ]; then - echo "splitter ${ARCH} appstream failed" - exit - fi - ${BINDIR}/splitter.py --action hardlink --target CS-8-003 ${HOMEDIR}/PowerTools/${ARCH}/os/ &> /dev/null - if [ $? -ne 0 ]; then - echo "splitter ${ARCH} codeready failed" - exit - fi - ${BINDIR}/splitter.py --action hardlink --target CS-8-004 ${HOMEDIR}/Devel/${ARCH}/os/ &> /dev/null - if [ $? -ne 0 ]; then - echo "splitter ${ARCH} devel failed" - exit - fi - - # Copy the various module trees into CS-8-001 where we want them - # to work. - echo "Moving data to ${ARCH}/CS-8-001" - cp -anlr CS-8-002/* CS-8-001 - cp -anlr CS-8-003/* CS-8-001 - cp -anlr CS-8-004/* CS-8-001 - # Go into the main tree - pushd CS-8-001 - - find . -type f -print | xargs touch -r ${TIME_FILE} - # Mergerepo didn't work so lets just createrepo in the top directory. - createrepo_c . &> /dev/null - popd - - # Cleanup the trash - rm -rf CS-8-002 CS-8-003 CS-8-004 -#loop to the next -done - -## Set up the builds so they are pointing to the last working version -cd ${KOJIDIR} -if [[ -e latest ]]; then - if [[ -h latest ]]; then - rm -f latest - else - echo "Unable to remove staged. it is not a symbolic link. Trying to move to latest_${DATE}." - if [[ -d latest_${DATE} ]]; then - echo "latest_${DATE} exists. Exiting" - exit - else - mv latest latest_${DATE} - fi - fi -else - echo "No latest link found" -fi - -echo "Linking ${DATE} to latest" -ln -s ${DATE} latest - - -## Wish there was a clean way to tell koji to figure out the new repos -## from batcave. - diff --git a/roles/grobisplitter/tasks/main.yml b/roles/grobisplitter/tasks/main.yml index f6e0138534..db3012d41b 100644 --- a/roles/grobisplitter/tasks/main.yml +++ b/roles/grobisplitter/tasks/main.yml @@ -17,10 +17,9 @@ - name: copy local/bin files copy: src={{item}} dest=/usr/local/bin/ mode=0755 - with_items: + with_items: - splitter.py - rhel8-split.sh - - cents8-split.sh tags: - grobi @@ -28,6 +27,5 @@ copy: src={{item}} dest=/etc/cron.d/ mode=0644 with_items: - rhel8-split.cron - - cents8-split.cron tags: - grobi