From: Ansgar Burchardt Date: Sun, 28 Jul 2013 11:23:04 +0000 (+0200) Subject: Disable old buildd queues. X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=427ebd5e2bbfec74868ceed38b342cd2ef161259;p=dak.git Disable old buildd queues. Reference: --- diff --git a/config/debian-security/apache.conf b/config/debian-security/apache.conf index 7ace02f4..172cbcee 100644 --- a/config/debian-security/apache.conf +++ b/config/debian-security/apache.conf @@ -15,10 +15,6 @@ #RewriteEngine on #RewriteRule ^/$ http://www.debian.org/security/ - # New suite aliases - Alias /buildd-squeeze /srv/security-master.debian.org/buildd/squeeze/ - Alias /buildd-wheezy /srv/security-master.debian.org/buildd/wheezy/ - # BuildD access list order deny,allow diff --git a/config/debian-security/cron.unchecked b/config/debian-security/cron.unchecked index 130922dc..3b03a0dd 100755 --- a/config/debian-security/cron.unchecked +++ b/config/debian-security/cron.unchecked @@ -79,36 +79,6 @@ dak generate-packages-sources2 -a build-queues dak generate-releases -a build-queues >/dev/null ${scriptsdir}/update-buildd-archive ${base}/build-queues ${incoming}/debian-security-buildd -# export build queues in old format -# XXX: This should be removed later. -for suite in oldstable stable; do - overridecodename=$(dak admin suite show ${suite} | awk '$1 == "OverrideCodename:" { print $2 }') - rm -rf ${incoming}/${suite}.new - mkdir ${incoming}/${suite}.new - dak export-suite -s buildd-${suite} -d ${incoming}/${suite}.new - - cd ${incoming}/${suite}.new - apt-ftparchive packages . ${overridedir}/override.${overridecodename}.all3 >Packages - gzip -9c --rsyncable Packages.gz - apt-ftparchive sources . ${overridedir}/override.${overridecodename}.all3 >Sources - gzip -9c --rsyncable Sources.gz - rm -f Release - - cd ${incoming} - apt-ftparchive -qq -o APT::FTPArchive::Release::Origin="Debian" -o APT::FTPArchive::Release::Label="Debian" -o APT::FTPArchive::Release::Description="buildd $suite security" -o APT::FTPArchive::Release::Architectures="$archs" release ${suite}.new >${suite}.Release - - gpg --secret-keyring /srv/security-master.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/security-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 473041FA --detach-sign -o ${suite}.Release.gpg ${suite}.Release - - mv ${suite}.Release ${suite}.new/Release - mv ${suite}.Release.gpg ${suite}.new/Release.gpg - - if [ -d ${suite} ]; then - mv ${suite} ${suite}.old - fi - mv ${suite}.new ${suite} - rm -rf ${suite}.old -done - if [ "x${dopolicy}x" = "xtruex" ]; then # We had something approved from a policy queue, push out new archive dak dominate diff --git a/config/debian/apache.conf-incoming b/config/debian/apache.conf-incoming index 51650207..7055f777 100644 --- a/config/debian/apache.conf-incoming +++ b/config/debian/apache.conf-incoming @@ -25,12 +25,7 @@ Alias /debian-backports /srv/backports-master.debian.org/mirror Alias /debian-buildd /srv/incoming.debian.org/debian-buildd - # New suite aliases - Alias /buildd-unstable /srv/incoming.debian.org/dists/unstable/current/ - Alias /buildd-experimental /srv/incoming.debian.org/dists/experimental/current/ - Alias /buildd-squeeze-backports /srv/incoming.debian.org/dists/squeeze-backports/current/ - - + Order allow,deny Use DebianBuilddHostList diff --git a/config/debian/common b/config/debian/common index 886da457..116332b0 100644 --- a/config/debian/common +++ b/config/debian/common @@ -48,47 +48,6 @@ function make_buildd_dir () { done rm -f ${incoming}/public/* dak export-suite -s "accepted" -d "$incoming/public" - - # export to old build queue directories - # XXX: Remove once the buildds use the version generated above. - for suite in $(ls -1 $incoming/dists/); do - # Skip project trace directory - if [ "${suite}x" = "projectx" ]; then continue; fi - cd ${incoming}/dists/${suite}/buildd - - overridesuite=sid - if [ "${suite}" = "squeeze-backports" ]; then - overridesuite="${suite}" - fi - - apt-ftparchive packages . $overridedir/override.${overridesuite}.all3 >Packages - gzip -9c --rsyncable Packages.gz - apt-ftparchive sources . $overridedir/override.${overridesuite}.all3 >Sources - gzip -9c --rsyncable Sources.gz - - rm -f buildd/Release - cd .. - apt-ftparchive -qq -o APT::FTPArchive::Release::Origin="Debian" -o APT::FTPArchive::Release::Label="Debian" -o APT::FTPArchive::Release::Description="buildd $suite incoming" -o APT::FTPArchive::Release::Architectures="$archs" release buildd >Release - if [ "$suite" = "experimental" -o "${suite}" = "squeeze-backports" ]; then - echo "NotAutomatic: yes" >>Release - fi - - gpg --secret-keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 473041FA --detach-sign -o Release.gpg Release - - mv Release Release.gpg buildd/ - done - - STAMP=${STAMP:-$(date "+%Y%m%d%H%M")} - - for dist in $(ls -1 ${incoming}/dists/); do - # Skip project trace directory - if [ "${dist}x" = "projectx" ]; then continue; fi - cd ${incoming}/dists/${dist} - mkdir -p tree/${STAMP} - cp -al ${incoming}/dists/${dist}/buildd/. tree/${STAMP}/ - ln -sfT tree/${STAMP} ${incoming}/dists/${dist}/current - find ./tree -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf - done } # Process (oldstable)-proposed-updates "NEW" queue