summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-04 04:11:14 -1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-08 14:06:04 +0000
commit96a85854fedfd6b3a882ce6394a10ea5ca521689 (patch)
treebb2cd5a1df6e0be4474e28407f5587d7205251fe
parent1354f0f0ab00f783b266c97cebe0b7ce1d514ac7 (diff)
downloadpoky-96a85854fedfd6b3a882ce6394a10ea5ca521689.tar.gz
bitbake: tests/fetch: Update github urls
(Bitbake rev: f1a3e9d22b5f4fb01c4a0e4ba03afb1afbba47f1) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 07fca7e3ab696ba985b3ef86ab9031d688bf2df2) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/tests/fetch.py26
1 files changed, 13 insertions, 13 deletions
diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py
index afa071bfb1..9144c9d177 100644
--- a/bitbake/lib/bb/tests/fetch.py
+++ b/bitbake/lib/bb/tests/fetch.py
@@ -472,7 +472,7 @@ class GitDownloadDirectoryNamingTest(FetcherTest):
472 super(GitDownloadDirectoryNamingTest, self).setUp() 472 super(GitDownloadDirectoryNamingTest, self).setUp()
473 self.recipe_url = "git://git.openembedded.org/bitbake" 473 self.recipe_url = "git://git.openembedded.org/bitbake"
474 self.recipe_dir = "git.openembedded.org.bitbake" 474 self.recipe_dir = "git.openembedded.org.bitbake"
475 self.mirror_url = "git://github.com/openembedded/bitbake.git" 475 self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https"
476 self.mirror_dir = "github.com.openembedded.bitbake.git" 476 self.mirror_dir = "github.com.openembedded.bitbake.git"
477 477
478 self.d.setVar('SRCREV', '82ea737a0b42a8b53e11c9cde141e9e9c0bd8c40') 478 self.d.setVar('SRCREV', '82ea737a0b42a8b53e11c9cde141e9e9c0bd8c40')
@@ -520,7 +520,7 @@ class TarballNamingTest(FetcherTest):
520 super(TarballNamingTest, self).setUp() 520 super(TarballNamingTest, self).setUp()
521 self.recipe_url = "git://git.openembedded.org/bitbake" 521 self.recipe_url = "git://git.openembedded.org/bitbake"
522 self.recipe_tarball = "git2_git.openembedded.org.bitbake.tar.gz" 522 self.recipe_tarball = "git2_git.openembedded.org.bitbake.tar.gz"
523 self.mirror_url = "git://github.com/openembedded/bitbake.git" 523 self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https"
524 self.mirror_tarball = "git2_github.com.openembedded.bitbake.git.tar.gz" 524 self.mirror_tarball = "git2_github.com.openembedded.bitbake.git.tar.gz"
525 525
526 self.d.setVar('BB_GENERATE_MIRROR_TARBALLS', '1') 526 self.d.setVar('BB_GENERATE_MIRROR_TARBALLS', '1')
@@ -554,7 +554,7 @@ class GitShallowTarballNamingTest(FetcherTest):
554 super(GitShallowTarballNamingTest, self).setUp() 554 super(GitShallowTarballNamingTest, self).setUp()
555 self.recipe_url = "git://git.openembedded.org/bitbake" 555 self.recipe_url = "git://git.openembedded.org/bitbake"
556 self.recipe_tarball = "gitshallow_git.openembedded.org.bitbake_82ea737-1_master.tar.gz" 556 self.recipe_tarball = "gitshallow_git.openembedded.org.bitbake_82ea737-1_master.tar.gz"
557 self.mirror_url = "git://github.com/openembedded/bitbake.git" 557 self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https"
558 self.mirror_tarball = "gitshallow_github.com.openembedded.bitbake.git_82ea737-1_master.tar.gz" 558 self.mirror_tarball = "gitshallow_github.com.openembedded.bitbake.git_82ea737-1_master.tar.gz"
559 559
560 self.d.setVar('BB_GIT_SHALLOW', '1') 560 self.d.setVar('BB_GIT_SHALLOW', '1')
@@ -921,7 +921,7 @@ class FetcherNetworkTest(FetcherTest):
921 def test_git_submodule_dbus_broker(self): 921 def test_git_submodule_dbus_broker(self):
922 # The following external repositories have show failures in fetch and unpack operations 922 # The following external repositories have show failures in fetch and unpack operations
923 # We want to avoid regressions! 923 # We want to avoid regressions!
924 url = "gitsm://github.com/bus1/dbus-broker;protocol=git;rev=fc874afa0992d0c75ec25acb43d344679f0ee7d2;branch=main" 924 url = "gitsm://github.com/bus1/dbus-broker;protocol=https;rev=fc874afa0992d0c75ec25acb43d344679f0ee7d2;branch=main"
925 fetcher = bb.fetch.Fetch([url], self.d) 925 fetcher = bb.fetch.Fetch([url], self.d)
926 fetcher.download() 926 fetcher.download()
927 # Previous cwd has been deleted 927 # Previous cwd has been deleted
@@ -937,7 +937,7 @@ class FetcherNetworkTest(FetcherTest):
937 937
938 @skipIfNoNetwork() 938 @skipIfNoNetwork()
939 def test_git_submodule_CLI11(self): 939 def test_git_submodule_CLI11(self):
940 url = "gitsm://github.com/CLIUtils/CLI11;protocol=git;rev=bd4dc911847d0cde7a6b41dfa626a85aab213baf;branch=main" 940 url = "gitsm://github.com/CLIUtils/CLI11;protocol=https;rev=bd4dc911847d0cde7a6b41dfa626a85aab213baf;branch=main"
941 fetcher = bb.fetch.Fetch([url], self.d) 941 fetcher = bb.fetch.Fetch([url], self.d)
942 fetcher.download() 942 fetcher.download()
943 # Previous cwd has been deleted 943 # Previous cwd has been deleted
@@ -952,12 +952,12 @@ class FetcherNetworkTest(FetcherTest):
952 @skipIfNoNetwork() 952 @skipIfNoNetwork()
953 def test_git_submodule_update_CLI11(self): 953 def test_git_submodule_update_CLI11(self):
954 """ Prevent regression on update detection not finding missing submodule, or modules without needed commits """ 954 """ Prevent regression on update detection not finding missing submodule, or modules without needed commits """
955 url = "gitsm://github.com/CLIUtils/CLI11;protocol=git;rev=cf6a99fa69aaefe477cc52e3ef4a7d2d7fa40714;branch=main" 955 url = "gitsm://github.com/CLIUtils/CLI11;protocol=https;rev=cf6a99fa69aaefe477cc52e3ef4a7d2d7fa40714;branch=main"
956 fetcher = bb.fetch.Fetch([url], self.d) 956 fetcher = bb.fetch.Fetch([url], self.d)
957 fetcher.download() 957 fetcher.download()
958 958
959 # CLI11 that pulls in a newer nlohmann-json 959 # CLI11 that pulls in a newer nlohmann-json
960 url = "gitsm://github.com/CLIUtils/CLI11;protocol=git;rev=49ac989a9527ee9bb496de9ded7b4872c2e0e5ca;branch=main" 960 url = "gitsm://github.com/CLIUtils/CLI11;protocol=https;rev=49ac989a9527ee9bb496de9ded7b4872c2e0e5ca;branch=main"
961 fetcher = bb.fetch.Fetch([url], self.d) 961 fetcher = bb.fetch.Fetch([url], self.d)
962 fetcher.download() 962 fetcher.download()
963 # Previous cwd has been deleted 963 # Previous cwd has been deleted
@@ -971,7 +971,7 @@ class FetcherNetworkTest(FetcherTest):
971 971
972 @skipIfNoNetwork() 972 @skipIfNoNetwork()
973 def test_git_submodule_aktualizr(self): 973 def test_git_submodule_aktualizr(self):
974 url = "gitsm://github.com/advancedtelematic/aktualizr;branch=master;protocol=git;rev=d00d1a04cc2366d1a5f143b84b9f507f8bd32c44" 974 url = "gitsm://github.com/advancedtelematic/aktualizr;branch=master;protocol=https;rev=d00d1a04cc2366d1a5f143b84b9f507f8bd32c44"
975 fetcher = bb.fetch.Fetch([url], self.d) 975 fetcher = bb.fetch.Fetch([url], self.d)
976 fetcher.download() 976 fetcher.download()
977 # Previous cwd has been deleted 977 # Previous cwd has been deleted
@@ -991,7 +991,7 @@ class FetcherNetworkTest(FetcherTest):
991 """ Prevent regression on deeply nested submodules not being checked out properly, even though they were fetched. """ 991 """ Prevent regression on deeply nested submodules not being checked out properly, even though they were fetched. """
992 992
993 # This repository also has submodules where the module (name), path and url do not align 993 # This repository also has submodules where the module (name), path and url do not align
994 url = "gitsm://github.com/azure/iotedge.git;protocol=git;rev=d76e0316c6f324345d77c48a83ce836d09392699" 994 url = "gitsm://github.com/azure/iotedge.git;protocol=https;rev=d76e0316c6f324345d77c48a83ce836d09392699"
995 fetcher = bb.fetch.Fetch([url], self.d) 995 fetcher = bb.fetch.Fetch([url], self.d)
996 fetcher.download() 996 fetcher.download()
997 # Previous cwd has been deleted 997 # Previous cwd has been deleted
@@ -1167,7 +1167,7 @@ class FetchLatestVersionTest(FetcherTest):
1167 1167
1168 test_git_uris = { 1168 test_git_uris = {
1169 # version pattern "X.Y.Z" 1169 # version pattern "X.Y.Z"
1170 ("mx-1.0", "git://github.com/clutter-project/mx.git;branch=mx-1.4", "9b1db6b8060bd00b121a692f942404a24ae2960f", "") 1170 ("mx-1.0", "git://github.com/clutter-project/mx.git;branch=mx-1.4;protocol=https", "9b1db6b8060bd00b121a692f942404a24ae2960f", "")
1171 : "1.99.4", 1171 : "1.99.4",
1172 # version pattern "vX.Y" 1172 # version pattern "vX.Y"
1173 # mirror of git.infradead.org since network issues interfered with testing 1173 # mirror of git.infradead.org since network issues interfered with testing
@@ -1194,9 +1194,9 @@ class FetchLatestVersionTest(FetcherTest):
1194 : "0.4.3", 1194 : "0.4.3",
1195 ("build-appliance-image", "git://git.yoctoproject.org/poky", "b37dd451a52622d5b570183a81583cc34c2ff555", r"(?P<pver>(([0-9][\.|_]?)+[0-9]))") 1195 ("build-appliance-image", "git://git.yoctoproject.org/poky", "b37dd451a52622d5b570183a81583cc34c2ff555", r"(?P<pver>(([0-9][\.|_]?)+[0-9]))")
1196 : "11.0.0", 1196 : "11.0.0",
1197 ("chkconfig-alternatives-native", "git://github.com/kergoth/chkconfig;branch=sysroot", "cd437ecbd8986c894442f8fce1e0061e20f04dee", r"chkconfig\-(?P<pver>((\d+[\.\-_]*)+))") 1197 ("chkconfig-alternatives-native", "git://github.com/kergoth/chkconfig;branch=sysroot;protocol=https", "cd437ecbd8986c894442f8fce1e0061e20f04dee", r"chkconfig\-(?P<pver>((\d+[\.\-_]*)+))")
1198 : "1.3.59", 1198 : "1.3.59",
1199 ("remake", "git://github.com/rocky/remake.git", "f05508e521987c8494c92d9c2871aec46307d51d", r"(?P<pver>(\d+\.(\d+\.)*\d*(\+dbg\d+(\.\d+)*)*))") 1199 ("remake", "git://github.com/rocky/remake.git;protocol=https", "f05508e521987c8494c92d9c2871aec46307d51d", r"(?P<pver>(\d+\.(\d+\.)*\d*(\+dbg\d+(\.\d+)*)*))")
1200 : "3.82+dbg0.9", 1200 : "3.82+dbg0.9",
1201 } 1201 }
1202 1202
@@ -1983,7 +1983,7 @@ class GitShallowTest(FetcherTest):
1983 1983
1984 @skipIfNoNetwork() 1984 @skipIfNoNetwork()
1985 def test_bitbake(self): 1985 def test_bitbake(self):
1986 self.git('remote add --mirror=fetch origin git://github.com/openembedded/bitbake', cwd=self.srcdir) 1986 self.git('remote add --mirror=fetch origin https://github.com/openembedded/bitbake', cwd=self.srcdir)
1987 self.git('config core.bare true', cwd=self.srcdir) 1987 self.git('config core.bare true', cwd=self.srcdir)
1988 self.git('fetch', cwd=self.srcdir) 1988 self.git('fetch', cwd=self.srcdir)
1989 1989