From 26098f6c8db1b094b10f51914b058003d7a967c3 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Fri, 2 Aug 2019 21:40:37 +0300 Subject: [PATCH] Print redirects being followed, drop mirror.yandex.ru. Use CDN-backed Debian mirror to make tests run faster hopefully for everyone. Redirects might be important to know what exactly is going on when items are being downloaded. --- http/download.go | 9 ++ system/t04_mirror/CreateMirror10Test_gold | 6 +- system/t04_mirror/CreateMirror11Test_gold | 8 +- .../t04_mirror/CreateMirror11Test_mirror_show | 2 +- system/t04_mirror/CreateMirror12Test_gold | 6 +- system/t04_mirror/CreateMirror13Test_gold | 4 +- .../t04_mirror/CreateMirror13Test_mirror_show | 2 +- system/t04_mirror/CreateMirror16Test_gold | 4 +- system/t04_mirror/CreateMirror17Test_gold | 4 +- .../t04_mirror/CreateMirror17Test_mirror_show | 2 +- system/t04_mirror/CreateMirror19Test_gold | 1 + system/t04_mirror/CreateMirror1Test_gold | 4 +- .../t04_mirror/CreateMirror1Test_mirror_show | 2 +- system/t04_mirror/CreateMirror22Test_gold | 1 + system/t04_mirror/CreateMirror24Test_gold | 1 + system/t04_mirror/CreateMirror25Test_gold | 4 +- .../t04_mirror/CreateMirror25Test_mirror_show | 2 +- system/t04_mirror/CreateMirror29Test_gold | 4 +- system/t04_mirror/CreateMirror2Test_gold | 4 +- .../t04_mirror/CreateMirror2Test_mirror_show | 2 +- system/t04_mirror/CreateMirror30Test_gold | 10 +-- system/t04_mirror/CreateMirror31Test_gold | 8 +- system/t04_mirror/CreateMirror32Test_gold | 8 +- .../t04_mirror/CreateMirror32Test_mirror_show | 2 +- system/t04_mirror/CreateMirror3Test_gold | 4 +- .../t04_mirror/CreateMirror3Test_mirror_show | 2 +- system/t04_mirror/CreateMirror4Test_gold | 4 +- system/t04_mirror/CreateMirror5Test_gold | 4 +- system/t04_mirror/CreateMirror6Test_gold | 6 +- system/t04_mirror/CreateMirror7Test_gold | 4 +- .../t04_mirror/CreateMirror7Test_mirror_show | 2 +- system/t04_mirror/CreateMirror8Test_gold | 2 +- system/t04_mirror/CreateMirror9Test_gold | 4 +- .../t04_mirror/CreateMirror9Test_mirror_show | 2 +- system/t04_mirror/EditMirror6Test_gold | 4 +- system/t04_mirror/EditMirror6Test_mirror_show | 2 +- system/t04_mirror/EditMirror7Test_gold | 4 +- system/t04_mirror/ListMirror1Test_gold | 6 +- system/t04_mirror/ShowMirror1Test_gold | 2 +- system/t04_mirror/UpdateMirror12Test_gold | 62 ++++++------- system/t04_mirror/UpdateMirror17Test_gold | 4 +- system/t04_mirror/UpdateMirror18Test_gold | 6 +- system/t04_mirror/UpdateMirror23Test_gold | 30 +++---- system/t04_mirror/UpdateMirror24Test_gold | 90 +++++++++---------- system/t04_mirror/create.py | 42 ++++----- system/t04_mirror/drop.py | 2 +- system/t04_mirror/edit.py | 4 +- system/t04_mirror/list.py | 6 +- system/t04_mirror/show.py | 2 +- system/t04_mirror/update.py | 17 ++-- system/t06_publish/snapshot.py | 6 +- system/t09_repo/cmdimport.py | 2 +- 52 files changed, 222 insertions(+), 203 deletions(-) diff --git a/http/download.go b/http/download.go index b517fefc0..45c297b04 100644 --- a/http/download.go +++ b/http/download.go @@ -53,6 +53,7 @@ func NewDownloader(downLimit int64, maxTries int, progress aptly.Progress) aptly }, } + downloader.client.CheckRedirect = downloader.checkRedirect if downLimit > 0 { downloader.aggWriter = flowrate.NewWriter(progress, downLimit) } else { @@ -62,6 +63,14 @@ func NewDownloader(downLimit int64, maxTries int, progress aptly.Progress) aptly return downloader } +func (downloader *downloaderImpl) checkRedirect(req *http.Request, via []*http.Request) error { + if downloader.progress != nil { + downloader.progress.Printf("Following redirect to %s...\n", req.URL) + } + + return nil +} + // GetProgress returns Progress object func (downloader *downloaderImpl) GetProgress() aptly.Progress { return downloader.progress diff --git a/system/t04_mirror/CreateMirror10Test_gold b/system/t04_mirror/CreateMirror10Test_gold index 4de7b2fbe..2559b8aca 100644 --- a/system/t04_mirror/CreateMirror10Test_gold +++ b/system/t04_mirror/CreateMirror10Test_gold @@ -1,11 +1,11 @@ -Downloading http://mirror.yandex.ru/debian/dists/stretch-backports/InRelease... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch-backports/InRelease... gpgv: RSA key ID 2B90D010 gpgv: RSA key ID B7D453EC -Downloading http://mirror.yandex.ru/debian/dists/stretch-backports/Release... -Downloading http://mirror.yandex.ru/debian/dists/stretch-backports/Release.gpg... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch-backports/Release... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch-backports/Release.gpg... gpgv: RSA key ID 2B90D010 diff --git a/system/t04_mirror/CreateMirror11Test_gold b/system/t04_mirror/CreateMirror11Test_gold index 54d167d23..d1d5c3c94 100644 --- a/system/t04_mirror/CreateMirror11Test_gold +++ b/system/t04_mirror/CreateMirror11Test_gold @@ -1,9 +1,9 @@ -Downloading http://mirror.yandex.ru/debian/dists/stretch/InRelease... -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release.gpg... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/InRelease... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release.gpg... gpgv: WARNING: multiple signatures detected. Only the first will be checked. gpgv: RSA key ID 2B90D010 gpgv: Good signature from "Debian Archive Automatic Signing Key (8/jessie) " -Mirror [mirror11]: http://mirror.yandex.ru/debian/ stretch successfully added. +Mirror [mirror11]: http://cdn-fastly.deb.debian.org/debian/ stretch successfully added. You can run 'aptly mirror update mirror11' to download repository contents. diff --git a/system/t04_mirror/CreateMirror11Test_mirror_show b/system/t04_mirror/CreateMirror11Test_mirror_show index 89fea47c2..2b9e1cea6 100644 --- a/system/t04_mirror/CreateMirror11Test_mirror_show +++ b/system/t04_mirror/CreateMirror11Test_mirror_show @@ -1,5 +1,5 @@ Name: mirror11 -Archive Root URL: http://mirror.yandex.ru/debian/ +Archive Root URL: http://cdn-fastly.deb.debian.org/debian/ Distribution: stretch Components: main, contrib, non-free Architectures: amd64, arm64, armel, armhf, i386, mips, mips64el, mipsel, ppc64el, s390x diff --git a/system/t04_mirror/CreateMirror12Test_gold b/system/t04_mirror/CreateMirror12Test_gold index 4cfbda9a3..7b1161f84 100644 --- a/system/t04_mirror/CreateMirror12Test_gold +++ b/system/t04_mirror/CreateMirror12Test_gold @@ -1,6 +1,6 @@ -Downloading http://mirror.yandex.ru/debian/dists/stretch/InRelease... -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release.gpg... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/InRelease... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release.gpg... gpgv: WARNING: multiple signatures detected. Only the first will be checked. gpgv: RSA key ID 2B90D010 diff --git a/system/t04_mirror/CreateMirror13Test_gold b/system/t04_mirror/CreateMirror13Test_gold index 794f60013..74f2c2792 100644 --- a/system/t04_mirror/CreateMirror13Test_gold +++ b/system/t04_mirror/CreateMirror13Test_gold @@ -1,4 +1,4 @@ -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release... -Mirror [mirror13]: http://mirror.yandex.ru/debian/ stretch successfully added. +Mirror [mirror13]: http://cdn-fastly.deb.debian.org/debian/ stretch successfully added. You can run 'aptly mirror update mirror13' to download repository contents. diff --git a/system/t04_mirror/CreateMirror13Test_mirror_show b/system/t04_mirror/CreateMirror13Test_mirror_show index e33f70505..c22bcb571 100644 --- a/system/t04_mirror/CreateMirror13Test_mirror_show +++ b/system/t04_mirror/CreateMirror13Test_mirror_show @@ -1,5 +1,5 @@ Name: mirror13 -Archive Root URL: http://mirror.yandex.ru/debian/ +Archive Root URL: http://cdn-fastly.deb.debian.org/debian/ Distribution: stretch Components: main, contrib, non-free Architectures: amd64, arm64, armel, armhf, i386, mips, mips64el, mipsel, ppc64el, s390x diff --git a/system/t04_mirror/CreateMirror16Test_gold b/system/t04_mirror/CreateMirror16Test_gold index f5aeae3e9..c75df26de 100644 --- a/system/t04_mirror/CreateMirror16Test_gold +++ b/system/t04_mirror/CreateMirror16Test_gold @@ -1,2 +1,2 @@ -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... -ERROR: unable to fetch mirror: architecture source not available in repo [mirror16]: http://mirror.yandex.ru/debian/ stretch, use -force-architectures to override +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release... +ERROR: unable to fetch mirror: architecture source not available in repo [mirror16]: http://cdn-fastly.deb.debian.org/debian/ stretch, use -force-architectures to override diff --git a/system/t04_mirror/CreateMirror17Test_gold b/system/t04_mirror/CreateMirror17Test_gold index c192043e4..837d37a01 100644 --- a/system/t04_mirror/CreateMirror17Test_gold +++ b/system/t04_mirror/CreateMirror17Test_gold @@ -1,4 +1,4 @@ -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release... -Mirror [mirror17]: http://mirror.yandex.ru/debian/ stretch [src] successfully added. +Mirror [mirror17]: http://cdn-fastly.deb.debian.org/debian/ stretch [src] successfully added. You can run 'aptly mirror update mirror17' to download repository contents. diff --git a/system/t04_mirror/CreateMirror17Test_mirror_show b/system/t04_mirror/CreateMirror17Test_mirror_show index 7d9b41742..6907d11c1 100644 --- a/system/t04_mirror/CreateMirror17Test_mirror_show +++ b/system/t04_mirror/CreateMirror17Test_mirror_show @@ -1,5 +1,5 @@ Name: mirror17 -Archive Root URL: http://mirror.yandex.ru/debian/ +Archive Root URL: http://cdn-fastly.deb.debian.org/debian/ Distribution: stretch Components: main, contrib, non-free Architectures: i386 diff --git a/system/t04_mirror/CreateMirror19Test_gold b/system/t04_mirror/CreateMirror19Test_gold index 61eebd098..eff5a9f25 100644 --- a/system/t04_mirror/CreateMirror19Test_gold +++ b/system/t04_mirror/CreateMirror19Test_gold @@ -1,4 +1,5 @@ Downloading http://security.debian.org/dists/stretch/updates/InRelease... +Following redirect to http://security-cdn.debian.org/dists/stretch/updates/InRelease... gpgv: RSA key ID C857C906 gpgv: Good signature from "Debian Security Archive Automatic Signing Key (8/jessie) " gpgv: RSA key ID 331F7F50 diff --git a/system/t04_mirror/CreateMirror1Test_gold b/system/t04_mirror/CreateMirror1Test_gold index a512163bd..38b02b48d 100644 --- a/system/t04_mirror/CreateMirror1Test_gold +++ b/system/t04_mirror/CreateMirror1Test_gold @@ -1,4 +1,4 @@ -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release... -Mirror [mirror1]: http://mirror.yandex.ru/debian/ stretch successfully added. +Mirror [mirror1]: http://cdn-fastly.deb.debian.org/debian/ stretch successfully added. You can run 'aptly mirror update mirror1' to download repository contents. diff --git a/system/t04_mirror/CreateMirror1Test_mirror_show b/system/t04_mirror/CreateMirror1Test_mirror_show index d1dcf469e..000ca5969 100644 --- a/system/t04_mirror/CreateMirror1Test_mirror_show +++ b/system/t04_mirror/CreateMirror1Test_mirror_show @@ -1,5 +1,5 @@ Name: mirror1 -Archive Root URL: http://mirror.yandex.ru/debian/ +Archive Root URL: http://cdn-fastly.deb.debian.org/debian/ Distribution: stretch Components: main, contrib, non-free Architectures: amd64, arm64, armel, armhf, i386, mips, mips64el, mipsel, ppc64el, s390x diff --git a/system/t04_mirror/CreateMirror22Test_gold b/system/t04_mirror/CreateMirror22Test_gold index 1bbe150d7..96de473b6 100644 --- a/system/t04_mirror/CreateMirror22Test_gold +++ b/system/t04_mirror/CreateMirror22Test_gold @@ -1,4 +1,5 @@ Downloading http://security.debian.org/dists/stretch/updates/Release... +Following redirect to http://security-cdn.debian.org/dists/stretch/updates/Release... Mirror [mirror22]: http://security.debian.org/ stretch/updates successfully added. You can run 'aptly mirror update mirror22' to download repository contents. diff --git a/system/t04_mirror/CreateMirror24Test_gold b/system/t04_mirror/CreateMirror24Test_gold index 0ad30a4f2..c0c98d13b 100644 --- a/system/t04_mirror/CreateMirror24Test_gold +++ b/system/t04_mirror/CreateMirror24Test_gold @@ -1,4 +1,5 @@ Downloading http://security.debian.org/dists/stretch/updates/InRelease... +Following redirect to http://security-cdn.debian.org/dists/stretch/updates/InRelease... gpgv: RSA key ID C857C906 gpgv: Good signature from "Debian Security Archive Automatic Signing Key (8/jessie) " gpgv: RSA key ID 331F7F50 diff --git a/system/t04_mirror/CreateMirror25Test_gold b/system/t04_mirror/CreateMirror25Test_gold index 4909b5e43..7071f5233 100644 --- a/system/t04_mirror/CreateMirror25Test_gold +++ b/system/t04_mirror/CreateMirror25Test_gold @@ -1,4 +1,4 @@ -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release... -Mirror [mirror25]: http://mirror.yandex.ru/debian/ stretch [udeb] successfully added. +Mirror [mirror25]: http://cdn-fastly.deb.debian.org/debian/ stretch [udeb] successfully added. You can run 'aptly mirror update mirror25' to download repository contents. diff --git a/system/t04_mirror/CreateMirror25Test_mirror_show b/system/t04_mirror/CreateMirror25Test_mirror_show index ceb1d3105..9faea86cb 100644 --- a/system/t04_mirror/CreateMirror25Test_mirror_show +++ b/system/t04_mirror/CreateMirror25Test_mirror_show @@ -1,5 +1,5 @@ Name: mirror25 -Archive Root URL: http://mirror.yandex.ru/debian/ +Archive Root URL: http://cdn-fastly.deb.debian.org/debian/ Distribution: stretch Components: main, contrib, non-free Architectures: i386 diff --git a/system/t04_mirror/CreateMirror29Test_gold b/system/t04_mirror/CreateMirror29Test_gold index c41b9ff08..d5b6483a8 100644 --- a/system/t04_mirror/CreateMirror29Test_gold +++ b/system/t04_mirror/CreateMirror29Test_gold @@ -1,8 +1,8 @@ -Downloading http://mirror.yandex.ru/debian/dists/stretch-backports/InRelease... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch-backports/InRelease... openpgp: RSA key ID 7638D0442B90D010 openpgp: Good signature from "Debian Archive Automatic Signing Key (8/jessie) " openpgp: RSA key ID 04EE7237B7D453EC openpgp: Good signature from "Debian Archive Automatic Signing Key (9/stretch) " -Mirror [mirror9]: http://mirror.yandex.ru/debian/ stretch-backports successfully added. +Mirror [mirror9]: http://cdn-fastly.deb.debian.org/debian/ stretch-backports successfully added. You can run 'aptly mirror update mirror9' to download repository contents. diff --git a/system/t04_mirror/CreateMirror2Test_gold b/system/t04_mirror/CreateMirror2Test_gold index c2ed4446a..c8c20aa74 100644 --- a/system/t04_mirror/CreateMirror2Test_gold +++ b/system/t04_mirror/CreateMirror2Test_gold @@ -1,4 +1,4 @@ -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release... -Mirror [mirror2]: http://mirror.yandex.ru/debian/ stretch successfully added. +Mirror [mirror2]: http://cdn-fastly.deb.debian.org/debian/ stretch successfully added. You can run 'aptly mirror update mirror2' to download repository contents. diff --git a/system/t04_mirror/CreateMirror2Test_mirror_show b/system/t04_mirror/CreateMirror2Test_mirror_show index f7015a86a..f1f32201e 100644 --- a/system/t04_mirror/CreateMirror2Test_mirror_show +++ b/system/t04_mirror/CreateMirror2Test_mirror_show @@ -1,5 +1,5 @@ Name: mirror2 -Archive Root URL: http://mirror.yandex.ru/debian/ +Archive Root URL: http://cdn-fastly.deb.debian.org/debian/ Distribution: stretch Components: main Architectures: amd64, arm64, armel, armhf, i386, mips, mips64el, mipsel, ppc64el, s390x diff --git a/system/t04_mirror/CreateMirror30Test_gold b/system/t04_mirror/CreateMirror30Test_gold index 94ee222b1..247309a2c 100644 --- a/system/t04_mirror/CreateMirror30Test_gold +++ b/system/t04_mirror/CreateMirror30Test_gold @@ -1,11 +1,11 @@ opengpg: failure opening keyring '${HOME}/.gnupg/aptlytest.gpg': open ${HOME}/.gnupg/aptlytest.gpg: no such file or directory Looks like your keyring with trusted keys is empty. You might consider importing some keys. -Downloading http://mirror.yandex.ru/debian-backports/dists/squeeze-backports/InRelease... -openpgp: RSA key ID 8B48AD6246925553 +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/InRelease... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release.gpg... +openpgp: RSA key ID 7638D0442B90D010 openpgp: Can't check signature: public key not found -Downloading http://mirror.yandex.ru/debian-backports/dists/squeeze-backports/Release... -Downloading http://mirror.yandex.ru/debian-backports/dists/squeeze-backports/Release.gpg... -openpgp: RSA key ID 8B48AD6246925553 +openpgp: RSA key ID 04EE7237B7D453EC openpgp: Can't check signature: public key not found ERROR: unable to fetch mirror: failed to verify detached signature: openpgp: signature made by unknown entity diff --git a/system/t04_mirror/CreateMirror31Test_gold b/system/t04_mirror/CreateMirror31Test_gold index 1a8210b7c..3a171eb08 100644 --- a/system/t04_mirror/CreateMirror31Test_gold +++ b/system/t04_mirror/CreateMirror31Test_gold @@ -1,10 +1,10 @@ -Downloading http://mirror.yandex.ru/debian/dists/stretch/InRelease... -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release.gpg... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/InRelease... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release.gpg... openpgp: RSA key ID 7638D0442B90D010 openpgp: Good signature from "Debian Archive Automatic Signing Key (8/jessie) " openpgp: RSA key ID 04EE7237B7D453EC openpgp: Good signature from "Debian Archive Automatic Signing Key (9/stretch) " -Mirror [mirror11]: http://mirror.yandex.ru/debian/ stretch successfully added. +Mirror [mirror11]: http://cdn-fastly.deb.debian.org/debian/ stretch successfully added. You can run 'aptly mirror update mirror11' to download repository contents. diff --git a/system/t04_mirror/CreateMirror32Test_gold b/system/t04_mirror/CreateMirror32Test_gold index 9e941179f..0c08be980 100644 --- a/system/t04_mirror/CreateMirror32Test_gold +++ b/system/t04_mirror/CreateMirror32Test_gold @@ -1,8 +1,8 @@ -Downloading http://mirror.yandex.ru/debian/dists/stretch/InRelease... -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release.gpg... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/InRelease... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release.gpg... gpgv: WARNING: multiple signatures detected. Only the first will be checked. gpgv: Good signature from "Debian Archive Automatic Signing Key (8/jessie) " -Mirror [mirror32]: http://mirror.yandex.ru/debian/ stretch successfully added. +Mirror [mirror32]: http://cdn-fastly.deb.debian.org/debian/ stretch successfully added. You can run 'aptly mirror update mirror32' to download repository contents. diff --git a/system/t04_mirror/CreateMirror32Test_mirror_show b/system/t04_mirror/CreateMirror32Test_mirror_show index 445443e8a..30636c0c9 100644 --- a/system/t04_mirror/CreateMirror32Test_mirror_show +++ b/system/t04_mirror/CreateMirror32Test_mirror_show @@ -1,5 +1,5 @@ Name: mirror32 -Archive Root URL: http://mirror.yandex.ru/debian/ +Archive Root URL: http://cdn-fastly.deb.debian.org/debian/ Distribution: stretch Components: main, contrib, non-free Architectures: amd64, arm64, armel, armhf, i386, mips, mips64el, mipsel, ppc64el, s390x diff --git a/system/t04_mirror/CreateMirror3Test_gold b/system/t04_mirror/CreateMirror3Test_gold index 68d303e10..db292edf4 100644 --- a/system/t04_mirror/CreateMirror3Test_gold +++ b/system/t04_mirror/CreateMirror3Test_gold @@ -1,4 +1,4 @@ -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release... -Mirror [mirror3]: http://mirror.yandex.ru/debian/ stretch successfully added. +Mirror [mirror3]: http://cdn-fastly.deb.debian.org/debian/ stretch successfully added. You can run 'aptly mirror update mirror3' to download repository contents. diff --git a/system/t04_mirror/CreateMirror3Test_mirror_show b/system/t04_mirror/CreateMirror3Test_mirror_show index 5087cfbb6..253e29ca4 100644 --- a/system/t04_mirror/CreateMirror3Test_mirror_show +++ b/system/t04_mirror/CreateMirror3Test_mirror_show @@ -1,5 +1,5 @@ Name: mirror3 -Archive Root URL: http://mirror.yandex.ru/debian/ +Archive Root URL: http://cdn-fastly.deb.debian.org/debian/ Distribution: stretch Components: main, contrib Architectures: i386, amd64 diff --git a/system/t04_mirror/CreateMirror4Test_gold b/system/t04_mirror/CreateMirror4Test_gold index fb504f5f6..7923c8cab 100644 --- a/system/t04_mirror/CreateMirror4Test_gold +++ b/system/t04_mirror/CreateMirror4Test_gold @@ -1,2 +1,2 @@ -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... -ERROR: unable to fetch mirror: component life not available in repo [mirror4]: http://mirror.yandex.ru/debian/ stretch, use -force-components to override +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release... +ERROR: unable to fetch mirror: component life not available in repo [mirror4]: http://cdn-fastly.deb.debian.org/debian/ stretch, use -force-components to override diff --git a/system/t04_mirror/CreateMirror5Test_gold b/system/t04_mirror/CreateMirror5Test_gold index 8cf78c21e..b859fe2be 100644 --- a/system/t04_mirror/CreateMirror5Test_gold +++ b/system/t04_mirror/CreateMirror5Test_gold @@ -1,2 +1,2 @@ -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... -ERROR: unable to fetch mirror: architecture nano68 not available in repo [mirror5]: http://mirror.yandex.ru/debian/ stretch, use -force-architectures to override +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release... +ERROR: unable to fetch mirror: architecture nano68 not available in repo [mirror5]: http://cdn-fastly.deb.debian.org/debian/ stretch, use -force-architectures to override diff --git a/system/t04_mirror/CreateMirror6Test_gold b/system/t04_mirror/CreateMirror6Test_gold index 166dcc13a..91b3f58b4 100644 --- a/system/t04_mirror/CreateMirror6Test_gold +++ b/system/t04_mirror/CreateMirror6Test_gold @@ -1,3 +1,3 @@ -Downloading http://mirror.yandex.ru/debian/dists/suslik/InRelease... -Downloading http://mirror.yandex.ru/debian/dists/suslik/Release... -ERROR: unable to fetch mirror: HTTP code 404 while fetching http://mirror.yandex.ru/debian/dists/suslik/Release +Downloading http://cdn-fastly.deb.debian.org/debian/dists/suslik/InRelease... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/suslik/Release... +ERROR: unable to fetch mirror: HTTP code 404 while fetching http://cdn-fastly.deb.debian.org/debian/dists/suslik/Release diff --git a/system/t04_mirror/CreateMirror7Test_gold b/system/t04_mirror/CreateMirror7Test_gold index b92d5dc00..ace393ab1 100644 --- a/system/t04_mirror/CreateMirror7Test_gold +++ b/system/t04_mirror/CreateMirror7Test_gold @@ -1,4 +1,4 @@ -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release... -Mirror [mirror7]: http://mirror.yandex.ru/debian/ stretch successfully added. +Mirror [mirror7]: http://cdn-fastly.deb.debian.org/debian/ stretch successfully added. You can run 'aptly mirror update mirror7' to download repository contents. diff --git a/system/t04_mirror/CreateMirror7Test_mirror_show b/system/t04_mirror/CreateMirror7Test_mirror_show index 9ab426074..683252878 100644 --- a/system/t04_mirror/CreateMirror7Test_mirror_show +++ b/system/t04_mirror/CreateMirror7Test_mirror_show @@ -1,5 +1,5 @@ Name: mirror7 -Archive Root URL: http://mirror.yandex.ru/debian/ +Archive Root URL: http://cdn-fastly.deb.debian.org/debian/ Distribution: stretch Components: main, contrib Architectures: i386, amd64 diff --git a/system/t04_mirror/CreateMirror8Test_gold b/system/t04_mirror/CreateMirror8Test_gold index 4232e0f8d..e4e2e8359 100644 --- a/system/t04_mirror/CreateMirror8Test_gold +++ b/system/t04_mirror/CreateMirror8Test_gold @@ -1,2 +1,2 @@ -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release... ERROR: unable to add mirror: mirror with name mirror8 already exists diff --git a/system/t04_mirror/CreateMirror9Test_gold b/system/t04_mirror/CreateMirror9Test_gold index 30b955a48..2f7be6d40 100644 --- a/system/t04_mirror/CreateMirror9Test_gold +++ b/system/t04_mirror/CreateMirror9Test_gold @@ -1,8 +1,8 @@ -Downloading http://mirror.yandex.ru/debian/dists/stretch-backports/InRelease... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch-backports/InRelease... gpgv: RSA key ID 2B90D010 gpgv: Good signature from "Debian Archive Automatic Signing Key (8/jessie) " gpgv: RSA key ID B7D453EC gpgv: Good signature from "Debian Archive Automatic Signing Key (9/stretch) " -Mirror [mirror9]: http://mirror.yandex.ru/debian/ stretch-backports successfully added. +Mirror [mirror9]: http://cdn-fastly.deb.debian.org/debian/ stretch-backports successfully added. You can run 'aptly mirror update mirror9' to download repository contents. diff --git a/system/t04_mirror/CreateMirror9Test_mirror_show b/system/t04_mirror/CreateMirror9Test_mirror_show index ea2d520ca..37039266e 100644 --- a/system/t04_mirror/CreateMirror9Test_mirror_show +++ b/system/t04_mirror/CreateMirror9Test_mirror_show @@ -1,5 +1,5 @@ Name: mirror9 -Archive Root URL: http://mirror.yandex.ru/debian/ +Archive Root URL: http://cdn-fastly.deb.debian.org/debian/ Distribution: stretch-backports Components: main, contrib, non-free Architectures: amd64, arm64, armel, armhf, i386, mips, mips64el, mipsel, ppc64el, s390x diff --git a/system/t04_mirror/EditMirror6Test_gold b/system/t04_mirror/EditMirror6Test_gold index 4bd26ea39..a092c6fdd 100644 --- a/system/t04_mirror/EditMirror6Test_gold +++ b/system/t04_mirror/EditMirror6Test_gold @@ -1,2 +1,2 @@ -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... -Mirror [mirror6]: http://mirror.yandex.ru/debian/ stretch successfully updated. +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release... +Mirror [mirror6]: http://cdn-fastly.deb.debian.org/debian/ stretch successfully updated. diff --git a/system/t04_mirror/EditMirror6Test_mirror_show b/system/t04_mirror/EditMirror6Test_mirror_show index 03f31a523..2b5db6149 100644 --- a/system/t04_mirror/EditMirror6Test_mirror_show +++ b/system/t04_mirror/EditMirror6Test_mirror_show @@ -1,5 +1,5 @@ Name: mirror6 -Archive Root URL: http://mirror.yandex.ru/debian/ +Archive Root URL: http://cdn-fastly.deb.debian.org/debian/ Distribution: stretch Components: main Architectures: amd64, i386 diff --git a/system/t04_mirror/EditMirror7Test_gold b/system/t04_mirror/EditMirror7Test_gold index 6d7c88b1d..b7de541d2 100644 --- a/system/t04_mirror/EditMirror7Test_gold +++ b/system/t04_mirror/EditMirror7Test_gold @@ -1,2 +1,2 @@ -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... -ERROR: unable to edit: architecture x56 not available in repo [stretch]: http://mirror.yandex.ru/debian/ stretch, use -force-architectures to override +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release... +ERROR: unable to edit: architecture x56 not available in repo [stretch]: http://cdn-fastly.deb.debian.org/debian/ stretch, use -force-architectures to override diff --git a/system/t04_mirror/ListMirror1Test_gold b/system/t04_mirror/ListMirror1Test_gold index 6eaa6dd3f..f618902fe 100644 --- a/system/t04_mirror/ListMirror1Test_gold +++ b/system/t04_mirror/ListMirror1Test_gold @@ -1,7 +1,7 @@ List of mirrors: - * [mirror1]: http://mirror.yandex.ru/debian/ stretch - * [mirror2]: http://mirror.yandex.ru/debian/ stretch [src] - * [mirror3]: http://mirror.yandex.ru/debian/ stretch + * [mirror1]: http://cdn-fastly.deb.debian.org/debian/ stretch + * [mirror2]: http://cdn-fastly.deb.debian.org/debian/ stretch [src] + * [mirror3]: http://cdn-fastly.deb.debian.org/debian/ stretch * [mirror4]: http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_9.0/ ./ To get more information about mirror, run `aptly mirror show `. diff --git a/system/t04_mirror/ShowMirror1Test_gold b/system/t04_mirror/ShowMirror1Test_gold index d1dcf469e..000ca5969 100644 --- a/system/t04_mirror/ShowMirror1Test_gold +++ b/system/t04_mirror/ShowMirror1Test_gold @@ -1,5 +1,5 @@ Name: mirror1 -Archive Root URL: http://mirror.yandex.ru/debian/ +Archive Root URL: http://cdn-fastly.deb.debian.org/debian/ Distribution: stretch Components: main, contrib, non-free Architectures: amd64, arm64, armel, armhf, i386, mips, mips64el, mipsel, ppc64el, s390x diff --git a/system/t04_mirror/UpdateMirror12Test_gold b/system/t04_mirror/UpdateMirror12Test_gold index 43a7aa36b..755138d97 100644 --- a/system/t04_mirror/UpdateMirror12Test_gold +++ b/system/t04_mirror/UpdateMirror12Test_gold @@ -4,37 +4,37 @@ Applying filter... Building download queue... Download queue: 20 items (11.93 MiB) Downloading & parsing package files... -Downloading http://mirror.yandex.ru/debian/dists/stretch/InRelease... -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release.gpg... -Downloading http://mirror.yandex.ru/debian/dists/stretch/main/binary-amd64/Packages.gz... -Downloading http://mirror.yandex.ru/debian/dists/stretch/main/binary-i386/Packages.gz... -Downloading http://mirror.yandex.ru/debian/dists/stretch/main/debian-installer/binary-amd64/Packages.gz... -Downloading http://mirror.yandex.ru/debian/dists/stretch/main/debian-installer/binary-i386/Packages.gz... -Downloading http://mirror.yandex.ru/debian/dists/stretch/non-free/binary-amd64/Packages.gz... -Downloading http://mirror.yandex.ru/debian/dists/stretch/non-free/binary-i386/Packages.gz... -Downloading http://mirror.yandex.ru/debian/dists/stretch/non-free/debian-installer/binary-amd64/Packages.gz... -Downloading http://mirror.yandex.ru/debian/dists/stretch/non-free/debian-installer/binary-i386/Packages.gz... -Downloading http://mirror.yandex.ru/debian/pool/main/g/gnupg2/dirmngr_2.1.18-8~deb9u4_amd64.deb... -Downloading http://mirror.yandex.ru/debian/pool/main/g/gnupg2/dirmngr_2.1.18-8~deb9u4_i386.deb... -Downloading http://mirror.yandex.ru/debian/pool/main/g/gnupg2/gnupg-agent_2.1.18-8~deb9u4_amd64.deb... -Downloading http://mirror.yandex.ru/debian/pool/main/g/gnupg2/gnupg-agent_2.1.18-8~deb9u4_i386.deb... -Downloading http://mirror.yandex.ru/debian/pool/main/g/gnupg2/gnupg-l10n_2.1.18-8~deb9u4_all.deb... -Downloading http://mirror.yandex.ru/debian/pool/main/g/gnupg2/gnupg2_2.1.18-8~deb9u4_all.deb... -Downloading http://mirror.yandex.ru/debian/pool/main/g/gnupg2/gnupg_2.1.18-8~deb9u4_amd64.deb... -Downloading http://mirror.yandex.ru/debian/pool/main/g/gnupg2/gnupg_2.1.18-8~deb9u4_i386.deb... -Downloading http://mirror.yandex.ru/debian/pool/main/g/gnupg2/gpgsm_2.1.18-8~deb9u4_amd64.deb... -Downloading http://mirror.yandex.ru/debian/pool/main/g/gnupg2/gpgsm_2.1.18-8~deb9u4_i386.deb... -Downloading http://mirror.yandex.ru/debian/pool/main/g/gnupg2/gpgv-static_2.1.18-8~deb9u4_amd64.deb... -Downloading http://mirror.yandex.ru/debian/pool/main/g/gnupg2/gpgv-static_2.1.18-8~deb9u4_i386.deb... -Downloading http://mirror.yandex.ru/debian/pool/main/g/gnupg2/gpgv-udeb_2.1.18-8~deb9u4_amd64.udeb... -Downloading http://mirror.yandex.ru/debian/pool/main/g/gnupg2/gpgv-udeb_2.1.18-8~deb9u4_i386.udeb... -Downloading http://mirror.yandex.ru/debian/pool/main/g/gnupg2/gpgv-win32_2.1.18-8~deb9u4_all.deb... -Downloading http://mirror.yandex.ru/debian/pool/main/g/gnupg2/gpgv2_2.1.18-8~deb9u4_all.deb... -Downloading http://mirror.yandex.ru/debian/pool/main/g/gnupg2/gpgv_2.1.18-8~deb9u4_amd64.deb... -Downloading http://mirror.yandex.ru/debian/pool/main/g/gnupg2/gpgv_2.1.18-8~deb9u4_i386.deb... -Downloading http://mirror.yandex.ru/debian/pool/main/g/gnupg2/scdaemon_2.1.18-8~deb9u4_amd64.deb... -Downloading http://mirror.yandex.ru/debian/pool/main/g/gnupg2/scdaemon_2.1.18-8~deb9u4_i386.deb... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/InRelease... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release.gpg... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/main/binary-amd64/Packages.gz... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/main/binary-i386/Packages.gz... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/main/debian-installer/binary-amd64/Packages.gz... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/main/debian-installer/binary-i386/Packages.gz... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/non-free/binary-amd64/Packages.gz... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/non-free/binary-i386/Packages.gz... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/non-free/debian-installer/binary-amd64/Packages.gz... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/non-free/debian-installer/binary-i386/Packages.gz... +Downloading http://cdn-fastly.deb.debian.org/debian/pool/main/g/gnupg2/dirmngr_2.1.18-8~deb9u4_amd64.deb... +Downloading http://cdn-fastly.deb.debian.org/debian/pool/main/g/gnupg2/dirmngr_2.1.18-8~deb9u4_i386.deb... +Downloading http://cdn-fastly.deb.debian.org/debian/pool/main/g/gnupg2/gnupg-agent_2.1.18-8~deb9u4_amd64.deb... +Downloading http://cdn-fastly.deb.debian.org/debian/pool/main/g/gnupg2/gnupg-agent_2.1.18-8~deb9u4_i386.deb... +Downloading http://cdn-fastly.deb.debian.org/debian/pool/main/g/gnupg2/gnupg-l10n_2.1.18-8~deb9u4_all.deb... +Downloading http://cdn-fastly.deb.debian.org/debian/pool/main/g/gnupg2/gnupg2_2.1.18-8~deb9u4_all.deb... +Downloading http://cdn-fastly.deb.debian.org/debian/pool/main/g/gnupg2/gnupg_2.1.18-8~deb9u4_amd64.deb... +Downloading http://cdn-fastly.deb.debian.org/debian/pool/main/g/gnupg2/gnupg_2.1.18-8~deb9u4_i386.deb... +Downloading http://cdn-fastly.deb.debian.org/debian/pool/main/g/gnupg2/gpgsm_2.1.18-8~deb9u4_amd64.deb... +Downloading http://cdn-fastly.deb.debian.org/debian/pool/main/g/gnupg2/gpgsm_2.1.18-8~deb9u4_i386.deb... +Downloading http://cdn-fastly.deb.debian.org/debian/pool/main/g/gnupg2/gpgv-static_2.1.18-8~deb9u4_amd64.deb... +Downloading http://cdn-fastly.deb.debian.org/debian/pool/main/g/gnupg2/gpgv-static_2.1.18-8~deb9u4_i386.deb... +Downloading http://cdn-fastly.deb.debian.org/debian/pool/main/g/gnupg2/gpgv-udeb_2.1.18-8~deb9u4_amd64.udeb... +Downloading http://cdn-fastly.deb.debian.org/debian/pool/main/g/gnupg2/gpgv-udeb_2.1.18-8~deb9u4_i386.udeb... +Downloading http://cdn-fastly.deb.debian.org/debian/pool/main/g/gnupg2/gpgv-win32_2.1.18-8~deb9u4_all.deb... +Downloading http://cdn-fastly.deb.debian.org/debian/pool/main/g/gnupg2/gpgv2_2.1.18-8~deb9u4_all.deb... +Downloading http://cdn-fastly.deb.debian.org/debian/pool/main/g/gnupg2/gpgv_2.1.18-8~deb9u4_amd64.deb... +Downloading http://cdn-fastly.deb.debian.org/debian/pool/main/g/gnupg2/gpgv_2.1.18-8~deb9u4_i386.deb... +Downloading http://cdn-fastly.deb.debian.org/debian/pool/main/g/gnupg2/scdaemon_2.1.18-8~deb9u4_amd64.deb... +Downloading http://cdn-fastly.deb.debian.org/debian/pool/main/g/gnupg2/scdaemon_2.1.18-8~deb9u4_i386.deb... Mirror `stretch` has been successfully updated. Packages filtered: 78253 -> 20. gpgv: Good signature from "Debian Archive Automatic Signing Key (8/jessie) " diff --git a/system/t04_mirror/UpdateMirror17Test_gold b/system/t04_mirror/UpdateMirror17Test_gold index 680de5bfa..d287e6f39 100644 --- a/system/t04_mirror/UpdateMirror17Test_gold +++ b/system/t04_mirror/UpdateMirror17Test_gold @@ -4,7 +4,7 @@ Applying filter... Building download queue... Download queue: 0 items (0 B) Downloading & parsing package files... -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... -Downloading http://mirror.yandex.ru/debian/dists/stretch/main/binary-i386/Packages.gz... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/main/binary-i386/Packages.gz... Mirror `stretch` has been successfully updated. Packages filtered: 50621 -> 1. \ No newline at end of file diff --git a/system/t04_mirror/UpdateMirror18Test_gold b/system/t04_mirror/UpdateMirror18Test_gold index f95782c42..c49e5b51a 100644 --- a/system/t04_mirror/UpdateMirror18Test_gold +++ b/system/t04_mirror/UpdateMirror18Test_gold @@ -4,8 +4,8 @@ Applying filter... Building download queue... Download queue: 1 items (3.35 KiB) Downloading & parsing package files... -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... -Downloading http://mirror.yandex.ru/debian/dists/stretch/main/binary-i386/Packages.gz... -Downloading http://mirror.yandex.ru/debian/pool/main/b/boost-defaults/libboost-program-options-dev_1.62.0.1_i386.deb... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/main/binary-i386/Packages.gz... +Downloading http://cdn-fastly.deb.debian.org/debian/pool/main/b/boost-defaults/libboost-program-options-dev_1.62.0.1_i386.deb... Mirror `stretch` has been successfully updated. Packages filtered: 50621 -> 1. \ No newline at end of file diff --git a/system/t04_mirror/UpdateMirror23Test_gold b/system/t04_mirror/UpdateMirror23Test_gold index 029bd8188..2f6f7e699 100644 --- a/system/t04_mirror/UpdateMirror23Test_gold +++ b/system/t04_mirror/UpdateMirror23Test_gold @@ -4,21 +4,21 @@ Applying filter... Building download queue... Download queue: 8 items (20.92 MiB) Downloading & parsing package files... -Downloading http://mirror.yandex.ru/debian/dists/stretch/InRelease... -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release... -Downloading http://mirror.yandex.ru/debian/dists/stretch/Release.gpg... -Downloading http://mirror.yandex.ru/debian/dists/stretch/main/binary-s390x/Packages.gz... -Downloading http://mirror.yandex.ru/debian/dists/stretch/main/installer-s390x/current/images/MANIFEST... -Downloading http://mirror.yandex.ru/debian/dists/stretch/main/installer-s390x/current/images/MANIFEST.udebs... -Downloading http://mirror.yandex.ru/debian/dists/stretch/main/installer-s390x/current/images/MD5SUMS... -Downloading http://mirror.yandex.ru/debian/dists/stretch/main/installer-s390x/current/images/SHA256SUMS... -Downloading http://mirror.yandex.ru/debian/dists/stretch/main/installer-s390x/current/images/generic/debian.exec... -Downloading http://mirror.yandex.ru/debian/dists/stretch/main/installer-s390x/current/images/generic/initrd.debian... -Downloading http://mirror.yandex.ru/debian/dists/stretch/main/installer-s390x/current/images/generic/kernel.debian... -Downloading http://mirror.yandex.ru/debian/dists/stretch/main/installer-s390x/current/images/generic/parmfile.debian... -Downloading http://mirror.yandex.ru/debian/dists/stretch/main/installer-s390x/current/images/udeb.list... -Downloading http://mirror.yandex.ru/debian/dists/stretch/non-free/binary-s390x/Packages.gz... -Downloading http://mirror.yandex.ru/debian/dists/stretch/non-free/installer-s390x/current/images/SHA256SUMS... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/InRelease... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/Release.gpg... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/main/binary-s390x/Packages.gz... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/main/installer-s390x/current/images/MANIFEST... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/main/installer-s390x/current/images/MANIFEST.udebs... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/main/installer-s390x/current/images/MD5SUMS... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/main/installer-s390x/current/images/SHA256SUMS... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/main/installer-s390x/current/images/generic/debian.exec... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/main/installer-s390x/current/images/generic/initrd.debian... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/main/installer-s390x/current/images/generic/kernel.debian... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/main/installer-s390x/current/images/generic/parmfile.debian... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/main/installer-s390x/current/images/udeb.list... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/non-free/binary-s390x/Packages.gz... +Downloading http://cdn-fastly.deb.debian.org/debian/dists/stretch/non-free/installer-s390x/current/images/SHA256SUMS... Mirror `stretch` has been successfully updated. Packages filtered: 49279 -> 1. gpgv: Good signature from "Debian Archive Automatic Signing Key (8/jessie) " diff --git a/system/t04_mirror/UpdateMirror24Test_gold b/system/t04_mirror/UpdateMirror24Test_gold index ff280c291..cca37431b 100644 --- a/system/t04_mirror/UpdateMirror24Test_gold +++ b/system/t04_mirror/UpdateMirror24Test_gold @@ -4,51 +4,51 @@ Applying filter... Building download queue... Download queue: 37 items (166.14 MiB) Downloading & parsing package files... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/InRelease... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/Release... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/Release.gpg... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/binary-amd64/Packages.bz2... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/MANIFEST... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/MANIFEST.udebs... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/SHA256SUMS... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/SHA256SUMS.gpg... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/cdrom/debian-cd_info.tar.gz... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/cdrom/initrd.gz... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/cdrom/vmlinuz... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/cdrom/xen/xm-debian.cfg... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/hd-media/boot.img.gz... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/hd-media/initrd.gz... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/hd-media/vmlinuz... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/boot.img.gz... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/mini.iso... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/netboot.tar.gz... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/adtxt.cfg... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/exithelp.cfg... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/f1.txt... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/f10.txt... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/f2.txt... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/f3.txt... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/f4.txt... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/f5.txt... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/f6.txt... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/f7.txt... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/f8.txt... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/f9.txt... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/menu.cfg... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/prompt.cfg... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/rqtxt.cfg... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/splash.png... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/stdmenu.cfg... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/syslinux.cfg... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/txt.cfg... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/vesamenu.c32... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/initrd.gz... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/linux... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/pxelinux.0... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/xen/xm-debian.cfg... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/main/installer-amd64/current/images/udeb.list... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/restricted/binary-amd64/Packages.bz2... -Downloading http://mirror.yandex.ru/ubuntu/dists/trusty/restricted/installer-amd64/current/images/SHA256SUMS... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/InRelease... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/Release... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/Release.gpg... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/binary-amd64/Packages.bz2... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/MANIFEST... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/MANIFEST.udebs... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/SHA256SUMS... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/SHA256SUMS.gpg... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/cdrom/debian-cd_info.tar.gz... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/cdrom/initrd.gz... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/cdrom/vmlinuz... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/cdrom/xen/xm-debian.cfg... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/hd-media/boot.img.gz... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/hd-media/initrd.gz... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/hd-media/vmlinuz... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/boot.img.gz... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/mini.iso... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/netboot.tar.gz... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/adtxt.cfg... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/exithelp.cfg... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/f1.txt... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/f10.txt... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/f2.txt... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/f3.txt... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/f4.txt... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/f5.txt... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/f6.txt... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/f7.txt... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/f8.txt... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/f9.txt... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/menu.cfg... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/prompt.cfg... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/rqtxt.cfg... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/splash.png... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/stdmenu.cfg... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/syslinux.cfg... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/txt.cfg... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/boot-screens/vesamenu.c32... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/initrd.gz... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/linux... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/pxelinux.0... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/xen/xm-debian.cfg... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/udeb.list... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/restricted/binary-amd64/Packages.bz2... +Downloading http://mirror.enzu.com/ubuntu/dists/trusty/restricted/installer-amd64/current/images/SHA256SUMS... Mirror `trusty` has been successfully updated. Packages filtered: 8616 -> 1. gpgv: Good signature from "Ubuntu Archive Automatic Signing Key (2012) " diff --git a/system/t04_mirror/create.py b/system/t04_mirror/create.py index 8f1ab6ff7..12bc8d9cc 100644 --- a/system/t04_mirror/create.py +++ b/system/t04_mirror/create.py @@ -7,7 +7,7 @@ class CreateMirror1Test(BaseTest): """ create mirror: all architectures + all components """ - runCmd = "aptly mirror create --ignore-signatures mirror1 http://mirror.yandex.ru/debian/ stretch" + runCmd = "aptly mirror create --ignore-signatures mirror1 http://cdn-fastly.deb.debian.org/debian/ stretch" def check(self): self.check_output() @@ -18,7 +18,7 @@ class CreateMirror2Test(BaseTest): """ create mirror: all architectures and 1 component """ - runCmd = "aptly mirror create --ignore-signatures mirror2 http://mirror.yandex.ru/debian/ stretch main" + runCmd = "aptly mirror create --ignore-signatures mirror2 http://cdn-fastly.deb.debian.org/debian/ stretch main" def check(self): self.check_output() @@ -29,7 +29,7 @@ class CreateMirror3Test(BaseTest): """ create mirror: some architectures and 2 components """ - runCmd = "aptly -architectures=i386,amd64 mirror create --ignore-signatures mirror3 http://mirror.yandex.ru/debian/ stretch main contrib" + runCmd = "aptly -architectures=i386,amd64 mirror create --ignore-signatures mirror3 http://cdn-fastly.deb.debian.org/debian/ stretch main contrib" def check(self): self.check_output() @@ -42,7 +42,7 @@ class CreateMirror4Test(BaseTest): """ expectedCode = 1 - runCmd = "aptly -architectures=i386,amd64 mirror create --ignore-signatures mirror4 http://mirror.yandex.ru/debian/ stretch life" + runCmd = "aptly -architectures=i386,amd64 mirror create --ignore-signatures mirror4 http://cdn-fastly.deb.debian.org/debian/ stretch life" class CreateMirror5Test(BaseTest): @@ -51,7 +51,7 @@ class CreateMirror5Test(BaseTest): """ expectedCode = 1 - runCmd = "aptly -architectures=i386,nano68 mirror create --ignore-signatures mirror5 http://mirror.yandex.ru/debian/ stretch" + runCmd = "aptly -architectures=i386,nano68 mirror create --ignore-signatures mirror5 http://cdn-fastly.deb.debian.org/debian/ stretch" class CreateMirror6Test(BaseTest): @@ -61,14 +61,14 @@ class CreateMirror6Test(BaseTest): expectedCode = 1 requiresGPG1 = True - runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror6 http://mirror.yandex.ru/debian/ suslik" + runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror6 http://cdn-fastly.deb.debian.org/debian/ suslik" class CreateMirror7Test(BaseTest): """ create mirror: architectures fixed via config file """ - runCmd = "aptly mirror create --ignore-signatures mirror7 http://mirror.yandex.ru/debian/ stretch main contrib" + runCmd = "aptly mirror create --ignore-signatures mirror7 http://cdn-fastly.deb.debian.org/debian/ stretch main contrib" configOverride = {"architectures": ["i386", "amd64"]} def check(self): @@ -81,9 +81,9 @@ class CreateMirror8Test(BaseTest): create mirror: already exists """ fixtureCmds = [ - "aptly mirror create --ignore-signatures mirror8 http://mirror.yandex.ru/debian/ stretch main contrib" + "aptly mirror create --ignore-signatures mirror8 http://cdn-fastly.deb.debian.org/debian/ stretch main contrib" ] - runCmd = "aptly mirror create --ignore-signatures mirror8 http://mirror.yandex.ru/debian/ stretch main contrib" + runCmd = "aptly mirror create --ignore-signatures mirror8 http://cdn-fastly.deb.debian.org/debian/ stretch main contrib" expectedCode = 1 @@ -91,7 +91,7 @@ class CreateMirror9Test(BaseTest): """ create mirror: repo with InRelease verification """ - runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror9 http://mirror.yandex.ru/debian/ stretch-backports" + runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror9 http://cdn-fastly.deb.debian.org/debian/ stretch-backports" fixtureGpg = True requiresGPG1 = True @@ -111,7 +111,7 @@ class CreateMirror10Test(BaseTest): """ create mirror: repo with InRelease verification, failure """ - runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror10 http://mirror.yandex.ru/debian/ stretch-backports" + runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror10 http://cdn-fastly.deb.debian.org/debian/ stretch-backports" fixtureGpg = False gold_processor = BaseTest.expand_environ expectedCode = 1 @@ -124,7 +124,7 @@ class CreateMirror11Test(BaseTest): """ create mirror: repo with Release + Release.gpg verification """ - runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror11 http://mirror.yandex.ru/debian/ stretch" + runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror11 http://cdn-fastly.deb.debian.org/debian/ stretch" fixtureGpg = True def outputMatchPrepare(self, s): @@ -139,7 +139,7 @@ class CreateMirror12Test(BaseTest): """ create mirror: repo with Release+Release.gpg verification, failure """ - runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror12 http://mirror.yandex.ru/debian/ stretch" + runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror12 http://cdn-fastly.deb.debian.org/debian/ stretch" fixtureGpg = False gold_processor = BaseTest.expand_environ expectedCode = 1 @@ -152,7 +152,7 @@ class CreateMirror13Test(BaseTest): """ create mirror: skip verification using config file """ - runCmd = "aptly mirror create mirror13 http://mirror.yandex.ru/debian/ stretch" + runCmd = "aptly mirror create mirror13 http://cdn-fastly.deb.debian.org/debian/ stretch" configOverride = {"gpgDisableVerify": True} def check(self): @@ -193,14 +193,14 @@ class CreateMirror16Test(BaseTest): """ expectedCode = 1 - runCmd = "aptly -architectures=source mirror create -ignore-signatures mirror16 http://mirror.yandex.ru/debian/ stretch" + runCmd = "aptly -architectures=source mirror create -ignore-signatures mirror16 http://cdn-fastly.deb.debian.org/debian/ stretch" class CreateMirror17Test(BaseTest): """ create mirror: mirror with sources enabled """ - runCmd = "aptly -architectures=i386 mirror create -ignore-signatures -with-sources mirror17 http://mirror.yandex.ru/debian/ stretch" + runCmd = "aptly -architectures=i386 mirror create -ignore-signatures -with-sources mirror17 http://cdn-fastly.deb.debian.org/debian/ stretch" def check(self): self.check_output() @@ -327,7 +327,7 @@ class CreateMirror25Test(BaseTest): """ create mirror: mirror with udebs enabled """ - runCmd = "aptly -architectures=i386 mirror create -ignore-signatures -with-udebs mirror25 http://mirror.yandex.ru/debian/ stretch" + runCmd = "aptly -architectures=i386 mirror create -ignore-signatures -with-udebs mirror25 http://cdn-fastly.deb.debian.org/debian/ stretch" def check(self): self.check_output() @@ -373,7 +373,7 @@ class CreateMirror29Test(BaseTest): """ create mirror: repo with InRelease verification (internal GPG implementation) """ - runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror9 http://mirror.yandex.ru/debian/ stretch-backports" + runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror9 http://cdn-fastly.deb.debian.org/debian/ stretch-backports" configOverride = {"gpgProvider": "internal"} fixtureGpg = True @@ -385,7 +385,7 @@ class CreateMirror30Test(BaseTest): """ create mirror: repo with InRelease verification, failure (internal GPG implementation) """ - runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror10 http://mirror.yandex.ru/debian-backports/ squeeze-backports" + runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror10 http://cdn-fastly.deb.debian.org/debian/ stretch" configOverride = {"gpgProvider": "internal"} gold_processor = BaseTest.expand_environ fixtureGpg = False @@ -399,7 +399,7 @@ class CreateMirror31Test(BaseTest): """ create mirror: repo with Release + Release.gpg verification (internal GPG implementation) """ - runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror11 http://mirror.yandex.ru/debian/ stretch" + runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror11 http://cdn-fastly.deb.debian.org/debian/ stretch" configOverride = {"gpgProvider": "internal"} fixtureGpg = True @@ -411,7 +411,7 @@ class CreateMirror32Test(BaseTest): """ create mirror: repo with Release + Release.gpg verification (gpg2) """ - runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror32 http://mirror.yandex.ru/debian/ stretch" + runCmd = "aptly mirror create --keyring=aptlytest.gpg mirror32 http://cdn-fastly.deb.debian.org/debian/ stretch" fixtureGpg = True requiresGPG2 = True diff --git a/system/t04_mirror/drop.py b/system/t04_mirror/drop.py index 953059d0c..36a16f6df 100644 --- a/system/t04_mirror/drop.py +++ b/system/t04_mirror/drop.py @@ -6,7 +6,7 @@ class DropMirror1Test(BaseTest): drop mirror: regular list """ fixtureCmds = [ - "aptly mirror create --ignore-signatures mirror1 http://mirror.yandex.ru/debian/ stretch", + "aptly mirror create --ignore-signatures mirror1 http://cdn-fastly.deb.debian.org/debian/ stretch", ] runCmd = "aptly mirror drop mirror1" diff --git a/system/t04_mirror/edit.py b/system/t04_mirror/edit.py index 4a27506c3..ad274a685 100644 --- a/system/t04_mirror/edit.py +++ b/system/t04_mirror/edit.py @@ -65,7 +65,7 @@ class EditMirror6Test(BaseTest): edit mirror: change architectures """ fixtureCmds = [ - "aptly mirror create -ignore-signatures -architectures=amd64 mirror6 http://mirror.yandex.ru/debian stretch main" + "aptly mirror create -ignore-signatures -architectures=amd64 mirror6 http://cdn-fastly.deb.debian.org/debian stretch main" ] runCmd = "aptly mirror edit -ignore-signatures -architectures=amd64,i386 mirror6" @@ -79,7 +79,7 @@ class EditMirror7Test(BaseTest): edit mirror: change architectures to missing archs """ fixtureCmds = [ - "aptly mirror create -ignore-signatures -architectures=amd64 stretch http://mirror.yandex.ru/debian stretch main" + "aptly mirror create -ignore-signatures -architectures=amd64 stretch http://cdn-fastly.deb.debian.org/debian stretch main" ] runCmd = "aptly mirror edit -ignore-signatures -architectures=amd64,x56 stretch" expectedCode = 1 diff --git a/system/t04_mirror/list.py b/system/t04_mirror/list.py index 0e8e529fa..75697972b 100644 --- a/system/t04_mirror/list.py +++ b/system/t04_mirror/list.py @@ -6,9 +6,9 @@ class ListMirror1Test(BaseTest): list mirrors: regular list """ fixtureCmds = [ - "aptly mirror create --ignore-signatures mirror1 http://mirror.yandex.ru/debian/ stretch", - "aptly mirror create -with-sources --ignore-signatures mirror2 http://mirror.yandex.ru/debian/ stretch contrib", - "aptly -architectures=i386 mirror create --ignore-signatures mirror3 http://mirror.yandex.ru/debian/ stretch non-free", + "aptly mirror create --ignore-signatures mirror1 http://cdn-fastly.deb.debian.org/debian/ stretch", + "aptly mirror create -with-sources --ignore-signatures mirror2 http://cdn-fastly.deb.debian.org/debian/ stretch contrib", + "aptly -architectures=i386 mirror create --ignore-signatures mirror3 http://cdn-fastly.deb.debian.org/debian/ stretch non-free", "aptly mirror create -ignore-signatures mirror4 http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_9.0/ ./", ] runCmd = "aptly mirror list" diff --git a/system/t04_mirror/show.py b/system/t04_mirror/show.py index e6407ea67..34aa3404c 100644 --- a/system/t04_mirror/show.py +++ b/system/t04_mirror/show.py @@ -6,7 +6,7 @@ class ShowMirror1Test(BaseTest): """ show mirror: regular mirror """ - fixtureCmds = ["aptly mirror create --ignore-signatures mirror1 http://mirror.yandex.ru/debian/ stretch"] + fixtureCmds = ["aptly mirror create --ignore-signatures mirror1 http://cdn-fastly.deb.debian.org/debian/ stretch"] runCmd = "aptly mirror show mirror1" diff --git a/system/t04_mirror/update.py b/system/t04_mirror/update.py index e4404510b..22dc91eaa 100644 --- a/system/t04_mirror/update.py +++ b/system/t04_mirror/update.py @@ -10,6 +10,10 @@ def filterOutSignature(_, s): return re.sub(r'Signature made .* using', '', s) +def filterOutRedirects(_, s): + return re.sub(r'Following redirect to .+?\n', '', s) + + class UpdateMirror1Test(BaseTest): """ update mirrors: regular update @@ -19,6 +23,7 @@ class UpdateMirror1Test(BaseTest): "aptly -architectures=i386,amd64 mirror create --ignore-signatures varnish https://packagecloud.io/varnishcache/varnish30/debian/ wheezy main", ] runCmd = "aptly mirror update --ignore-signatures varnish" + outputMatchPrepare = filterOutRedirects def output_processor(self, output): return "\n".join(sorted(output.split("\n"))) @@ -173,7 +178,7 @@ class UpdateMirror12Test(BaseTest): longTest = False fixtureGpg = True fixtureCmds = [ - "aptly -architectures=i386,amd64 mirror create -keyring=aptlytest.gpg -filter='$$Source (gnupg2)' -with-udebs stretch http://mirror.yandex.ru/debian/ stretch main non-free", + "aptly -architectures=i386,amd64 mirror create -keyring=aptlytest.gpg -filter='$$Source (gnupg2)' -with-udebs stretch http://cdn-fastly.deb.debian.org/debian/ stretch main non-free", ] runCmd = "aptly mirror update -keyring=aptlytest.gpg stretch" outputMatchPrepare = filterOutSignature @@ -191,6 +196,7 @@ class UpdateMirror13Test(BaseTest): "aptly -architectures=i386,amd64 mirror create --ignore-signatures varnish https://packagecloud.io/varnishcache/varnish30/debian/ wheezy main", ] runCmd = "aptly mirror update --ignore-signatures --skip-existing-packages varnish" + outputMatchPrepare = filterOutRedirects def output_processor(self, output): return "\n".join(sorted(output.split("\n"))) @@ -206,6 +212,7 @@ class UpdateMirror14Test(BaseTest): "aptly mirror update --ignore-signatures --skip-existing-packages varnish" ] runCmd = "aptly mirror update --ignore-signatures --skip-existing-packages varnish" + outputMatchPrepare = filterOutRedirects def output_processor(self, output): return "\n".join(sorted(output.split("\n"))) @@ -268,7 +275,7 @@ class UpdateMirror17Test(BaseTest): """ longTest = False fixtureCmds = [ - "aptly mirror create -ignore-signatures -architectures=i386 -filter=libboost-program-options-dev stretch http://mirror.yandex.ru/debian stretch main", + "aptly mirror create -ignore-signatures -architectures=i386 -filter=libboost-program-options-dev stretch http://cdn-fastly.deb.debian.org/debian stretch main", ] runCmd = "aptly mirror update -ignore-signatures stretch" @@ -297,7 +304,7 @@ class UpdateMirror18Test(BaseTest): """ longTest = False fixtureCmds = [ - "aptly mirror create -ignore-signatures -architectures=i386 -filter=libboost-program-options-dev stretch http://mirror.yandex.ru/debian stretch main", + "aptly mirror create -ignore-signatures -architectures=i386 -filter=libboost-program-options-dev stretch http://cdn-fastly.deb.debian.org/debian stretch main", ] runCmd = "aptly mirror update -ignore-signatures stretch" configOverride = {'skipLegacyPool': True} @@ -392,7 +399,7 @@ class UpdateMirror23Test(BaseTest): longTest = False fixtureGpg = True fixtureCmds = [ - "aptly -architectures=s390x mirror create -keyring=aptlytest.gpg -filter='installer' -with-installer stretch http://mirror.yandex.ru/debian/ stretch main non-free", + "aptly -architectures=s390x mirror create -keyring=aptlytest.gpg -filter='installer' -with-installer stretch http://cdn-fastly.deb.debian.org/debian/ stretch main non-free", ] runCmd = "aptly mirror update -keyring=aptlytest.gpg stretch" outputMatchPrepare = filterOutSignature @@ -408,7 +415,7 @@ class UpdateMirror24Test(BaseTest): longTest = False fixtureGpg = True fixtureCmds = [ - "aptly -architectures=amd64 mirror create -keyring=aptlytest.gpg -filter='installer' -with-installer trusty http://mirror.yandex.ru/ubuntu/ trusty main restricted", + "aptly -architectures=amd64 mirror create -keyring=aptlytest.gpg -filter='installer' -with-installer trusty http://mirror.enzu.com/ubuntu/ trusty main restricted", ] runCmd = "aptly mirror update -keyring=aptlytest.gpg trusty" outputMatchPrepare = filterOutSignature diff --git a/system/t06_publish/snapshot.py b/system/t06_publish/snapshot.py index 0e827e854..fa9264dd7 100644 --- a/system/t06_publish/snapshot.py +++ b/system/t06_publish/snapshot.py @@ -896,7 +896,7 @@ class PublishSnapshot35Test(BaseTest): """ fixtureGpg = True fixtureCmds = [ - "aptly -architectures=i386,amd64 mirror create -keyring=aptlytest.gpg -filter='$$Source (gnupg2)' -with-udebs stretch http://mirror.yandex.ru/debian/ stretch main non-free", + "aptly -architectures=i386,amd64 mirror create -keyring=aptlytest.gpg -filter='$$Source (gnupg2)' -with-udebs stretch http://cdn-fastly.deb.debian.org/debian/ stretch main non-free", "aptly mirror update -keyring=aptlytest.gpg stretch", "aptly snapshot create stretch from mirror stretch", ] @@ -1026,7 +1026,7 @@ class PublishSnapshot37Test(BaseTest): """ fixtureGpg = True fixtureCmds = [ - "aptly -architectures=i386,amd64 mirror create -keyring=aptlytest.gpg -filter='$$Source (gnupg2)' -with-udebs stretch http://mirror.yandex.ru/debian/ stretch main non-free", + "aptly -architectures=i386,amd64 mirror create -keyring=aptlytest.gpg -filter='$$Source (gnupg2)' -with-udebs stretch http://cdn-fastly.deb.debian.org/debian/ stretch main non-free", "aptly mirror update -keyring=aptlytest.gpg stretch", "aptly mirror update -keyring=aptlytest.gpg stretch", "aptly snapshot create stretch from mirror stretch", @@ -1041,7 +1041,7 @@ class PublishSnapshot38Test(BaseTest): """ fixtureGpg = True fixtureCmds = [ - "aptly -architectures=s390x mirror create -keyring=aptlytest.gpg -filter='installer' -with-installer stretch http://mirror.yandex.ru/debian/ stretch main", + "aptly -architectures=s390x mirror create -keyring=aptlytest.gpg -filter='installer' -with-installer stretch http://cdn-fastly.deb.debian.org/debian/ stretch main", "aptly mirror update -keyring=aptlytest.gpg stretch", "aptly snapshot create stretch from mirror stretch", ] diff --git a/system/t09_repo/cmdimport.py b/system/t09_repo/cmdimport.py index b3019dd6d..d879d0e41 100644 --- a/system/t09_repo/cmdimport.py +++ b/system/t09_repo/cmdimport.py @@ -93,7 +93,7 @@ class ImportRepo6Test(BaseTest): """ fixtureCmds = [ "aptly repo create -comment=Cool -distribution=squeeze repo1", - "aptly mirror create --ignore-signatures mirror1 http://mirror.yandex.ru/debian/ stretch", + "aptly mirror create --ignore-signatures mirror1 http://cdn-fastly.deb.debian.org/debian/ stretch", ] runCmd = "aptly repo import mirror1 repo1 nginx" expectedCode = 1