From 9abc772b16344a57cffa10eb8aa46f0b6445ecad Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Thu, 28 May 2015 12:14:36 +0300 Subject: [PATCH] Change our flat repo for testing, old one is dead. --- system/files/flat.key | 30 ++++----- system/t04_mirror/CreateMirror14Test_gold | 12 ++-- .../t04_mirror/CreateMirror14Test_mirror_show | 14 ++-- system/t04_mirror/UpdateMirror10Test_gold | 34 ++++++---- system/t04_mirror/UpdateMirror7Test_gold | 42 ++++++++---- system/t04_mirror/UpdateMirror9Test_gold | 64 ++++++++++++++----- system/t04_mirror/create.py | 4 +- system/t04_mirror/update.py | 6 +- 8 files changed, 132 insertions(+), 74 deletions(-) diff --git a/system/files/flat.key b/system/files/flat.key index f40f79eb..b2a086af 100644 --- a/system/files/flat.key +++ b/system/files/flat.key @@ -1,19 +1,19 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.5 (GNU/Linux) -mQGiBE9p65cRBACFOL5YS4kW6xieXa98meE+RVu1hfBi1n7ajAy+ZQOfNa2Xb9if -H8WAcwJD4cTZYB19/O/xVxCYf1hnC/T34XGC5PUzMzBDKde86UDqvT4YNHDQA/E1 -I6UUzE0MgLINO4Dt7Mw62koVrlPXklc2Zn83ucZB7YgBzJOIBFUQLghikwCgnubS -n/9lw8Hm8CIsg4nWtHwHGPED/jXIsH7ON3PBx2wIdRsealsx5sPGHQSlq1grRHcN -YT5/glXmVqnexY/+IFhcpjjb3vMMQ5LYq8+bDWGVMQx3GZrJs66rwPbo4kZ92OdC -RTnY/nznJlf5gS86DaFl+NFuO7F1k8ju4CurXXGXPF7nk8cgV6CrYHz1AtNyLVqa -306IA/9j9rdD/MY9SYT16eFMo7C2ieIS0RxxU3q9w0e8EucQKiHWMtjTPJ0Ik0GO -TY5lAPasnD6ZBA15XSiTi2Ck2QoZQZCxdtId/nL7lNG4+vQ8HACNDkxxK4yHJiFa -frMdlWi5cYgAMYzbYPekbhaamDR7Gh4NU7z72QZTPELKyZD/pbRGaG9tZTpEZWVw -RGl2ZXIxOTc1IE9CUyBQcm9qZWN0IDxob21lOkRlZXBEaXZlcjE5NzVAYnVpbGQu -b3BlbnN1c2Uub3JnPohlBBMRAgAmBQJPaeuXAhsDBQkEHrAABgsJCAcDAgQVAggD -BBYCAwECHgECF4AACgkQuCWWGBBIwf+tEgCcDEzTAilZDvOr0OKHHmguuKFXoHMA -ljX7B6nKOYoiHoGpBeOwr8U5ZB6IRgQTEQIABgUCT2nrlwAKCRA7MBG3a51lI7Rt -AJ4mYeomQiHHfd+7c8T0JhbGKUIDlACglHyTlouU5vCpUEHDyLvwrHFylpk= -=b/6f +mQGiBEeWVfARBACqbIlXriK4+UO8FLwhziCYxrzYN0ylnNMqalhuNErq34ImPMqw +dzpKWYkZ9ZXU3DZm47+1yt8GISw+OJdQVlnIpAbFso4+FzFIPsjTv6TCGqBzdK9C +PiMDjo8egKQqtcOfAYverV1KvqIOa9txkGDxDYLO0x8wFC1g0l2oTEPiDwCgxFNh +YjBzj/R6X/sEbXDPwPlCZzkD/00q2YvD7C/Jsgn4tyxlXlpbfXn5EAxhpm87YWPT +kwOgPWb2rcJhsceV10iQf3caq18KLmNH1kOuWKAyM+7JZ7l1ah0pfNLFb5VW2moQ +0+ZuU5D3093Nod0mQ6T7274t9953EyiyBvs+CUv6m+2QlxqvHHDARWCLR+QrcsGK +C+v/A/9Sk49lkDx5/bKTHJOX7q54LYXoCaRBqXvZ/CeV51r7BS+j87SycDvBRp6a +Kz1+/BSwJZCoWTxNktV/wDps6RYH/tHLFM2jotDvfF1cU84EU5pQcEHM7E4jIX20 +yLw45+rd3X3R4yQXfG7KHdDSqj1WOgELQgPV/zYWoyn8s1pcE7QuQXBhY2hlIE9C +UyBQcm9qZWN0IDxBcGFjaGVAYnVpbGQub3BlbnN1c2Uub3JnPohmBBMRAgAmBQJV +KWTwAhsDBQkRsb8ABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQlYShZL1tEpqi +KQCfWOKaNGK5udClKDjqC5SvNBThu3UAoKiTK4OKSwxchflGTw4+TDD8uEcliEYE +ExECAAYFAkeWVfAACgkQOzARt2udZSOiKACfQJKztayUveOVDvNyZ5Cc2ervdP4A +niMvnUsXMYc/ze6wl02XE1HWFd4+ +=ksLt -----END PGP PUBLIC KEY BLOCK----- diff --git a/system/t04_mirror/CreateMirror14Test_gold b/system/t04_mirror/CreateMirror14Test_gold index 9022d63a..5beb0d88 100644 --- a/system/t04_mirror/CreateMirror14Test_gold +++ b/system/t04_mirror/CreateMirror14Test_gold @@ -1,8 +1,8 @@ -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/InRelease... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/Release... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/Release.gpg... -gpgv: Signature made Tue May 21 23:01:30 2013 MSK using DSA key ID 1048C1FF -gpgv: Good signature from "home:DeepDiver1975 OBS Project " +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/InRelease... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/Release... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/Release.gpg... +gpgv: DSA key ID BD6D129A +gpgv: Good signature from "Apache OBS Project " -Mirror [mirror14]: http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/ ./ successfully added. +Mirror [mirror14]: http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/ ./ successfully added. You can run 'aptly mirror update mirror14' to download repository contents. diff --git a/system/t04_mirror/CreateMirror14Test_mirror_show b/system/t04_mirror/CreateMirror14Test_mirror_show index 8f479d62..c124a040 100644 --- a/system/t04_mirror/CreateMirror14Test_mirror_show +++ b/system/t04_mirror/CreateMirror14Test_mirror_show @@ -1,5 +1,5 @@ Name: mirror14 -Archive Root URL: http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/ +Archive Root URL: http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/ Distribution: ./ Components: Architectures: @@ -8,9 +8,11 @@ Download .udebs: no Last update: never Information from release file: -Date: Tue May 21 21:01:30 2013 -Description: Open Build Service home:DeepDiver1975 xUbuntu_10.04 +Architectures: i386 amd64 +Archive: Debian_7.0 +Codename: Debian_7.0 +Date: Sun May 3 12:37:48 2015 +Description: MirrorBrain (Debian_7.0) -Label: DeepDiver1975's Home Project (xUbuntu_10.04) -Origin: Open Build Service home:DeepDiver1975 xUbuntu_10.04 -Version: 0.00 +Label: Apache:MirrorBrain +Origin: obs://build.opensuse.org/Apache:MirrorBrain/Debian_7.0 diff --git a/system/t04_mirror/UpdateMirror10Test_gold b/system/t04_mirror/UpdateMirror10Test_gold index e3e1b763..0bda9d6c 100644 --- a/system/t04_mirror/UpdateMirror10Test_gold +++ b/system/t04_mirror/UpdateMirror10Test_gold @@ -2,18 +2,26 @@ Applying filter... Building download queue... -Download queue: 2 items (17.38 KiB) +Download queue: 10 items (1.02 MiB) Downloading & parsing package files... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/InRelease... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/Packages.bz2... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/Packages.gz... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/Release... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/Release.gpg... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/Sources.bz2... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/Sources.gz... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/amd64/libiniparser_3.1-1_amd64.deb... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/i386/libiniparser_3.1-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/InRelease... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/Packages.bz2... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/Packages.gz... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/Release... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/Release.gpg... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/Sources.bz2... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/Sources.gz... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/mirrorbrain-scanner_2.18.1-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/mirrorbrain-tools_2.18.1-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/mirrorbrain_2.18.1-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/python-cmdln_1.1.2-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/python-mb_2.18.1-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/mirrorbrain-scanner_2.18.1-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/mirrorbrain-tools_2.18.1-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/mirrorbrain_2.18.1-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/python-cmdln_1.1.2-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/python-mb_2.18.1-1_i386.deb... Mirror `flat-src` has been successfully updated. -Packages filtered: 5 -> 2. -gpgv: Good signature from "home:DeepDiver1975 OBS Project " -gpgv: DSA key ID 1048C1FF \ No newline at end of file +Packages filtered: 27 -> 10. +gpgv: Good signature from "Apache OBS Project " +gpgv: DSA key ID BD6D129A \ No newline at end of file diff --git a/system/t04_mirror/UpdateMirror7Test_gold b/system/t04_mirror/UpdateMirror7Test_gold index 65213c6d..baa137dd 100644 --- a/system/t04_mirror/UpdateMirror7Test_gold +++ b/system/t04_mirror/UpdateMirror7Test_gold @@ -1,17 +1,35 @@ Building download queue... -Download queue: 4 items (58.20 KiB) +Download queue: 22 items (1.29 MiB) Downloading & parsing package files... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/InRelease... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/Packages.bz2... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/Packages.gz... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/Release... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/Release.gpg... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/amd64/libiniparser-dev_3.1-1_amd64.deb... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/amd64/libiniparser_3.1-1_amd64.deb... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/i386/libiniparser-dev_3.1-1_i386.deb... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/i386/libiniparser_3.1-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/InRelease... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/Packages.bz2... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/Packages.gz... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/Release... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/Release.gpg... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/libapache2-mod-asn_1.6-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/libapache2-mod-autoindex-mb_2.18.1-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/libapache2-mod-form-dev_0.1r146-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/libapache2-mod-form_0.1r146-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/libapache2-mod-geoip_1.2.9-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/libapache2-mod-mirrorbrain_2.18.1-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/mirrorbrain-scanner_2.18.1-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/mirrorbrain-tools_2.18.1-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/mirrorbrain_2.18.1-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/python-cmdln_1.1.2-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/python-mb_2.18.1-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/libapache2-mod-asn_1.6-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/libapache2-mod-autoindex-mb_2.18.1-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/libapache2-mod-form-dev_0.1r146-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/libapache2-mod-form_0.1r146-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/libapache2-mod-geoip_1.2.9-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/libapache2-mod-mirrorbrain_2.18.1-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/mirrorbrain-scanner_2.18.1-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/mirrorbrain-tools_2.18.1-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/mirrorbrain_2.18.1-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/python-cmdln_1.1.2-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/python-mb_2.18.1-1_i386.deb... Mirror `flat` has been successfully updated. -gpgv: Good signature from "home:DeepDiver1975 OBS Project " -gpgv: DSA key ID 1048C1FF \ No newline at end of file +gpgv: Good signature from "Apache OBS Project " +gpgv: DSA key ID BD6D129A \ No newline at end of file diff --git a/system/t04_mirror/UpdateMirror9Test_gold b/system/t04_mirror/UpdateMirror9Test_gold index 626ff9e5..6ce4bf5d 100644 --- a/system/t04_mirror/UpdateMirror9Test_gold +++ b/system/t04_mirror/UpdateMirror9Test_gold @@ -1,22 +1,52 @@ Building download queue... -Download queue: 7 items (97.48 KiB) +Download queue: 37 items (1.83 MiB) Downloading & parsing package files... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/InRelease... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/Packages.bz2... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/Packages.gz... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/Release... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/Release.gpg... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/Sources.bz2... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/Sources.gz... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/amd64/libiniparser-dev_3.1-1_amd64.deb... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/amd64/libiniparser_3.1-1_amd64.deb... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/i386/libiniparser-dev_3.1-1_i386.deb... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/i386/libiniparser_3.1-1_i386.deb... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/libiniparser_3.1-1.diff.gz... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/libiniparser_3.1-1.dsc... -Downloading http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/libiniparser_3.1.orig.tar.gz... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/InRelease... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/Packages.bz2... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/Packages.gz... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/Release... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/Release.gpg... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/Sources.bz2... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/Sources.gz... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/libapache2-mod-asn_1.6-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/libapache2-mod-autoindex-mb_2.18.1-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/libapache2-mod-form-dev_0.1r146-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/libapache2-mod-form_0.1r146-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/libapache2-mod-geoip_1.2.9-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/libapache2-mod-mirrorbrain_2.18.1-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/mirrorbrain-scanner_2.18.1-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/mirrorbrain-tools_2.18.1-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/mirrorbrain_2.18.1-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/python-cmdln_1.1.2-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/amd64/python-mb_2.18.1-1_amd64.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/cmdln_1.1.2-1.diff.gz... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/cmdln_1.1.2-1.dsc... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/cmdln_1.1.2.orig.tar.gz... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/libapache2-mod-asn_1.6-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/libapache2-mod-autoindex-mb_2.18.1-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/libapache2-mod-form-dev_0.1r146-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/libapache2-mod-form_0.1r146-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/libapache2-mod-geoip_1.2.9-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/libapache2-mod-mirrorbrain_2.18.1-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/mirrorbrain-scanner_2.18.1-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/mirrorbrain-tools_2.18.1-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/mirrorbrain_2.18.1-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/python-cmdln_1.1.2-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/i386/python-mb_2.18.1-1_i386.deb... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/libapache2-mod-asn_1.6-1.diff.gz... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/libapache2-mod-asn_1.6-1.dsc... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/libapache2-mod-asn_1.6.orig.tar.gz... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/libapache2-mod-form_0.1r146-1.diff.gz... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/libapache2-mod-form_0.1r146-1.dsc... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/libapache2-mod-form_0.1r146.orig.tar.gz... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/libapache2-mod-geoip_1.2.9-1.diff.gz... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/libapache2-mod-geoip_1.2.9-1.dsc... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/libapache2-mod-geoip_1.2.9.orig.tar.gz... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/mirrorbrain_2.18.1-1.diff.gz... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/mirrorbrain_2.18.1-1.dsc... +Downloading http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/mirrorbrain_2.18.1.orig.tar.gz... Mirror `flat-src` has been successfully updated. -gpgv: Good signature from "home:DeepDiver1975 OBS Project " -gpgv: DSA key ID 1048C1FF \ No newline at end of file +gpgv: Good signature from "Apache OBS Project " +gpgv: DSA key ID BD6D129A \ No newline at end of file diff --git a/system/t04_mirror/create.py b/system/t04_mirror/create.py index 77986642..8f8decb4 100644 --- a/system/t04_mirror/create.py +++ b/system/t04_mirror/create.py @@ -153,7 +153,7 @@ class CreateMirror14Test(BaseTest): """ create mirror: flat repository """ - runCmd = "aptly mirror create -keyring=aptlytest.gpg mirror14 http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/ ./" + runCmd = "aptly mirror create -keyring=aptlytest.gpg mirror14 http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/ ./" fixtureGpg = True outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using', '', s) @@ -166,7 +166,7 @@ class CreateMirror15Test(BaseTest): """ create mirror: flat repository + components """ - runCmd = "aptly mirror create -keyring=aptlytest.gpg mirror14 http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/ ./ main" + runCmd = "aptly mirror create -keyring=aptlytest.gpg mirror14 http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/ ./ main" expectedCode = 1 diff --git a/system/t04_mirror/update.py b/system/t04_mirror/update.py index 5a57aded..5b6e2bf3 100644 --- a/system/t04_mirror/update.py +++ b/system/t04_mirror/update.py @@ -90,7 +90,7 @@ class UpdateMirror7Test(BaseTest): """ fixtureGpg = True fixtureCmds = [ - "aptly mirror create --keyring=aptlytest.gpg flat http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/ ./", + "aptly mirror create --keyring=aptlytest.gpg flat http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/ ./", ] runCmd = "aptly mirror update --keyring=aptlytest.gpg flat" outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using', '', s) @@ -118,7 +118,7 @@ class UpdateMirror9Test(BaseTest): """ fixtureGpg = True fixtureCmds = [ - "aptly mirror create --keyring=aptlytest.gpg -with-sources flat-src http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/ ./", + "aptly mirror create --keyring=aptlytest.gpg -with-sources flat-src http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/ ./", ] runCmd = "aptly mirror update --keyring=aptlytest.gpg flat-src" outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using', '', s) @@ -133,7 +133,7 @@ class UpdateMirror10Test(BaseTest): """ fixtureGpg = True fixtureCmds = [ - "aptly mirror create -keyring=aptlytest.gpg -with-sources -filter='!(Name (% *-dev)), !($$PackageType (source))' flat-src http://download.opensuse.org/repositories/home:/DeepDiver1975/xUbuntu_10.04/ ./", + "aptly mirror create -keyring=aptlytest.gpg -with-sources -filter='!(Name (% libapache2-*)), !($$PackageType (source))' flat-src http://download.opensuse.org/repositories/Apache:/MirrorBrain/Debian_7.0/ ./", ] runCmd = "aptly mirror update --keyring=aptlytest.gpg flat-src" outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using', '', s)