mirrors: Disable YP mirrors on autobuilder

The YP mirrors (and hence some bits of kernel.org) are initially populated by the
autobuilder, so having it reference itself creates a log of stress and delay when
things go wrong (such as a missing kernel revision).

Trying to remove those but not the others is hard to maintain, so add a
variable specifically to allow it. Use that variable from the autobuilder
configuration.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes-global/mirrors.bbclass b/meta/classes-global/mirrors.bbclass
index 50db29ae3a217f30d189a16fd030601895cef3dd..04b7a25106e6946d1f8ceb3b18679e0f6454f797 100644 (file)
--- a/meta/classes-global/mirrors.bbclass
+++ b/meta/classes-global/mirrors.bbclass
@@ -5,6 +5,7 @@
 #
 
 MIRRORS += "\
+${YOCTO_MIRRORS} \
 ${DEBIAN_MIRROR}       http://snapshot.debian.org/archive/debian/20180310T215105Z/pool \
 ${DEBIAN_MIRROR}       http://snapshot.debian.org/archive/debian/20250101T023759Z/pool \
 ${DEBIAN_MIRROR}       http://snapshot.debian.org/archive/debian-archive/20120328T092752Z/debian/pool \
@@ -29,6 +30,11 @@ ${SAVANNAH_NONGNU_MIRROR} http://download-mirror.savannah.nongnu.org/releases \
 ftp://sourceware.org/pub http://mirrors.edge.kernel.org/sourceware \
 ftp://sourceware.org/pub http://gd.tuwien.ac.at/gnu/sourceware \
 ftp://sourceware.org/pub http://ftp.gwdg.de/pub/linux/sources.redhat.com/sourceware \
+${CPAN_MIRROR}  https://cpan.metacpan.org/ \
+"
+
+# Having a way to disable the Yocto Project related mirrors for YP CI purposes is valuable.
+YOCTO_MIRRORS ??= "\
 svn://.*/.*     https://downloads.yoctoproject.org/mirror/sources/ \
 git://.*/.*     https://downloads.yoctoproject.org/mirror/sources/ \
 gitsm://.*/.*   https://downloads.yoctoproject.org/mirror/sources/ \
@@ -36,7 +42,6 @@ hg://.*/.*      https://downloads.yoctoproject.org/mirror/sources/ \
 https?://.*/.*  https://downloads.yoctoproject.org/mirror/sources/ \
 ftp://.*/.*     https://downloads.yoctoproject.org/mirror/sources/ \
 npm://.*/?.*    https://downloads.yoctoproject.org/mirror/sources/ \
-${CPAN_MIRROR}  https://cpan.metacpan.org/ \
 https?://downloads.yoctoproject.org/releases/uninative/ https://mirrors.edge.kernel.org/yocto/uninative/ \
 https?://downloads.yoctoproject.org/mirror/sources/ https://mirrors.edge.kernel.org/yocto-sources/ \
 "

diff --git a/meta/conf/fragments/yocto-autobuilder/autobuilder.conf b/meta/conf/fragments/yocto-autobuilder/autobuilder.conf
index a9ae99a451e6ebb57f325f500d83781f7c82950e..ad874384a9f3d0de94d1648ff6e40b80fb07755a 100644 (file)
--- a/meta/conf/fragments/yocto-autobuilder/autobuilder.conf
+++ b/meta/conf/fragments/yocto-autobuilder/autobuilder.conf
@@ -11,4 +11,5 @@ SDK_INCLUDE_TOOLCHAIN = '1'
 ESDK_LOCALCONF_REMOVE:append = 'BB_HASHSERVE'
 SDK_TOOLCHAIN_LANGS += 'go rust'
 PTEST_EXPECT_FAILURE = '1'
+YOCTO_MIRRORS = ""