summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-02 12:29:03 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-21 11:35:37 +0000
commit87114e4ee908e76047fcfdfca589cfde0c2ac862 (patch)
treeef404b1ae21ae1c98f66e452ef16ab448e423b91
parenta80fc87db0cdffcc55691fe58e6eae066829e169 (diff)
downloadpoky-87114e4ee908e76047fcfdfca589cfde0c2ac862.tar.gz
bitbake: tests/fetch: Update github urls
(Bitbake rev: a95f05359e65c3336eeb8366c0c35a23d3821dda) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 07fca7e3ab696ba985b3ef86ab9031d688bf2df2) Signed-off-by: Anuj Mittal <anuj.mittal@intel.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 f5d557e8c0..c3e714ae89 100644
--- a/bitbake/lib/bb/tests/fetch.py
+++ b/bitbake/lib/bb/tests/fetch.py
@@ -491,7 +491,7 @@ class GitDownloadDirectoryNamingTest(FetcherTest):
491 super(GitDownloadDirectoryNamingTest, self).setUp() 491 super(GitDownloadDirectoryNamingTest, self).setUp()
492 self.recipe_url = "git://git.openembedded.org/bitbake" 492 self.recipe_url = "git://git.openembedded.org/bitbake"
493 self.recipe_dir = "git.openembedded.org.bitbake" 493 self.recipe_dir = "git.openembedded.org.bitbake"
494 self.mirror_url = "git://github.com/openembedded/bitbake.git" 494 self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https"
495 self.mirror_dir = "github.com.openembedded.bitbake.git" 495 self.mirror_dir = "github.com.openembedded.bitbake.git"
496 496
497 self.d.setVar('SRCREV', '82ea737a0b42a8b53e11c9cde141e9e9c0bd8c40') 497 self.d.setVar('SRCREV', '82ea737a0b42a8b53e11c9cde141e9e9c0bd8c40')
@@ -539,7 +539,7 @@ class TarballNamingTest(FetcherTest):
539 super(TarballNamingTest, self).setUp() 539 super(TarballNamingTest, self).setUp()
540 self.recipe_url = "git://git.openembedded.org/bitbake" 540 self.recipe_url = "git://git.openembedded.org/bitbake"
541 self.recipe_tarball = "git2_git.openembedded.org.bitbake.tar.gz" 541 self.recipe_tarball = "git2_git.openembedded.org.bitbake.tar.gz"
542 self.mirror_url = "git://github.com/openembedded/bitbake.git" 542 self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https"
543 self.mirror_tarball = "git2_github.com.openembedded.bitbake.git.tar.gz" 543 self.mirror_tarball = "git2_github.com.openembedded.bitbake.git.tar.gz"
544 544
545 self.d.setVar('BB_GENERATE_MIRROR_TARBALLS', '1') 545 self.d.setVar('BB_GENERATE_MIRROR_TARBALLS', '1')
@@ -573,7 +573,7 @@ class GitShallowTarballNamingTest(FetcherTest):
573 super(GitShallowTarballNamingTest, self).setUp() 573 super(GitShallowTarballNamingTest, self).setUp()
574 self.recipe_url = "git://git.openembedded.org/bitbake" 574 self.recipe_url = "git://git.openembedded.org/bitbake"
575 self.recipe_tarball = "gitshallow_git.openembedded.org.bitbake_82ea737-1_master.tar.gz" 575 self.recipe_tarball = "gitshallow_git.openembedded.org.bitbake_82ea737-1_master.tar.gz"
576 self.mirror_url = "git://github.com/openembedded/bitbake.git" 576 self.mirror_url = "git://github.com/openembedded/bitbake.git;protocol=https"
577 self.mirror_tarball = "gitshallow_github.com.openembedded.bitbake.git_82ea737-1_master.tar.gz" 577 self.mirror_tarball = "gitshallow_github.com.openembedded.bitbake.git_82ea737-1_master.tar.gz"
578 578
579 self.d.setVar('BB_GIT_SHALLOW', '1') 579 self.d.setVar('BB_GIT_SHALLOW', '1')
@@ -985,7 +985,7 @@ class FetcherNetworkTest(FetcherTest):
985 def test_git_submodule_dbus_broker(self): 985 def test_git_submodule_dbus_broker(self):
986 # The following external repositories have show failures in fetch and unpack operations 986 # The following external repositories have show failures in fetch and unpack operations
987 # We want to avoid regressions! 987 # We want to avoid regressions!
988 url = "gitsm://github.com/bus1/dbus-broker;protocol=git;rev=fc874afa0992d0c75ec25acb43d344679f0ee7d2;branch=main" 988 url = "gitsm://github.com/bus1/dbus-broker;protocol=https;rev=fc874afa0992d0c75ec25acb43d344679f0ee7d2;branch=main"
989 fetcher = bb.fetch.Fetch([url], self.d) 989 fetcher = bb.fetch.Fetch([url], self.d)
990 fetcher.download() 990 fetcher.download()
991 # Previous cwd has been deleted 991 # Previous cwd has been deleted
@@ -1001,7 +1001,7 @@ class FetcherNetworkTest(FetcherTest):
1001 1001
1002 @skipIfNoNetwork() 1002 @skipIfNoNetwork()
1003 def test_git_submodule_CLI11(self): 1003 def test_git_submodule_CLI11(self):
1004 url = "gitsm://github.com/CLIUtils/CLI11;protocol=git;rev=bd4dc911847d0cde7a6b41dfa626a85aab213baf;branch=main" 1004 url = "gitsm://github.com/CLIUtils/CLI11;protocol=https;rev=bd4dc911847d0cde7a6b41dfa626a85aab213baf;branch=main"
1005 fetcher = bb.fetch.Fetch([url], self.d) 1005 fetcher = bb.fetch.Fetch([url], self.d)
1006 fetcher.download() 1006 fetcher.download()
1007 # Previous cwd has been deleted 1007 # Previous cwd has been deleted
@@ -1016,12 +1016,12 @@ class FetcherNetworkTest(FetcherTest):
1016 @skipIfNoNetwork() 1016 @skipIfNoNetwork()
1017 def test_git_submodule_update_CLI11(self): 1017 def test_git_submodule_update_CLI11(self):
1018 """ Prevent regression on update detection not finding missing submodule, or modules without needed commits """ 1018 """ Prevent regression on update detection not finding missing submodule, or modules without needed commits """
1019 url = "gitsm://github.com/CLIUtils/CLI11;protocol=git;rev=cf6a99fa69aaefe477cc52e3ef4a7d2d7fa40714;branch=main" 1019 url = "gitsm://github.com/CLIUtils/CLI11;protocol=https;rev=cf6a99fa69aaefe477cc52e3ef4a7d2d7fa40714;branch=main"
1020 fetcher = bb.fetch.Fetch([url], self.d) 1020 fetcher = bb.fetch.Fetch([url], self.d)
1021 fetcher.download() 1021 fetcher.download()
1022 1022
1023 # CLI11 that pulls in a newer nlohmann-json 1023 # CLI11 that pulls in a newer nlohmann-json
1024 url = "gitsm://github.com/CLIUtils/CLI11;protocol=git;rev=49ac989a9527ee9bb496de9ded7b4872c2e0e5ca;branch=main" 1024 url = "gitsm://github.com/CLIUtils/CLI11;protocol=https;rev=49ac989a9527ee9bb496de9ded7b4872c2e0e5ca;branch=main"
1025 fetcher = bb.fetch.Fetch([url], self.d) 1025 fetcher = bb.fetch.Fetch([url], self.d)
1026 fetcher.download() 1026 fetcher.download()
1027 # Previous cwd has been deleted 1027 # Previous cwd has been deleted
@@ -1035,7 +1035,7 @@ class FetcherNetworkTest(FetcherTest):
1035 1035
1036 @skipIfNoNetwork() 1036 @skipIfNoNetwork()
1037 def test_git_submodule_aktualizr(self): 1037 def test_git_submodule_aktualizr(self):
1038 url = "gitsm://github.com/advancedtelematic/aktualizr;branch=master;protocol=git;rev=d00d1a04cc2366d1a5f143b84b9f507f8bd32c44" 1038 url = "gitsm://github.com/advancedtelematic/aktualizr;branch=master;protocol=https;rev=d00d1a04cc2366d1a5f143b84b9f507f8bd32c44"
1039 fetcher = bb.fetch.Fetch([url], self.d) 1039 fetcher = bb.fetch.Fetch([url], self.d)
1040 fetcher.download() 1040 fetcher.download()
1041 # Previous cwd has been deleted 1041 # Previous cwd has been deleted
@@ -1055,7 +1055,7 @@ class FetcherNetworkTest(FetcherTest):
1055 """ Prevent regression on deeply nested submodules not being checked out properly, even though they were fetched. """ 1055 """ Prevent regression on deeply nested submodules not being checked out properly, even though they were fetched. """
1056 1056
1057 # This repository also has submodules where the module (name), path and url do not align 1057 # This repository also has submodules where the module (name), path and url do not align
1058 url = "gitsm://github.com/azure/iotedge.git;protocol=git;rev=d76e0316c6f324345d77c48a83ce836d09392699" 1058 url = "gitsm://github.com/azure/iotedge.git;protocol=https;rev=d76e0316c6f324345d77c48a83ce836d09392699"
1059 fetcher = bb.fetch.Fetch([url], self.d) 1059 fetcher = bb.fetch.Fetch([url], self.d)
1060 fetcher.download() 1060 fetcher.download()
1061 # Previous cwd has been deleted 1061 # Previous cwd has been deleted
@@ -1231,7 +1231,7 @@ class FetchLatestVersionTest(FetcherTest):
1231 1231
1232 test_git_uris = { 1232 test_git_uris = {
1233 # version pattern "X.Y.Z" 1233 # version pattern "X.Y.Z"
1234 ("mx-1.0", "git://github.com/clutter-project/mx.git;branch=mx-1.4", "9b1db6b8060bd00b121a692f942404a24ae2960f", "") 1234 ("mx-1.0", "git://github.com/clutter-project/mx.git;branch=mx-1.4;protocol=https", "9b1db6b8060bd00b121a692f942404a24ae2960f", "")
1235 : "1.99.4", 1235 : "1.99.4",
1236 # version pattern "vX.Y" 1236 # version pattern "vX.Y"
1237 # mirror of git.infradead.org since network issues interfered with testing 1237 # mirror of git.infradead.org since network issues interfered with testing
@@ -1258,9 +1258,9 @@ class FetchLatestVersionTest(FetcherTest):
1258 : "0.4.3", 1258 : "0.4.3",
1259 ("build-appliance-image", "git://git.yoctoproject.org/poky", "b37dd451a52622d5b570183a81583cc34c2ff555", "(?P<pver>(([0-9][\.|_]?)+[0-9]))") 1259 ("build-appliance-image", "git://git.yoctoproject.org/poky", "b37dd451a52622d5b570183a81583cc34c2ff555", "(?P<pver>(([0-9][\.|_]?)+[0-9]))")
1260 : "11.0.0", 1260 : "11.0.0",
1261 ("chkconfig-alternatives-native", "git://github.com/kergoth/chkconfig;branch=sysroot", "cd437ecbd8986c894442f8fce1e0061e20f04dee", "chkconfig\-(?P<pver>((\d+[\.\-_]*)+))") 1261 ("chkconfig-alternatives-native", "git://github.com/kergoth/chkconfig;branch=sysroot;protocol=https", "cd437ecbd8986c894442f8fce1e0061e20f04dee", "chkconfig\-(?P<pver>((\d+[\.\-_]*)+))")
1262 : "1.3.59", 1262 : "1.3.59",
1263 ("remake", "git://github.com/rocky/remake.git", "f05508e521987c8494c92d9c2871aec46307d51d", "(?P<pver>(\d+\.(\d+\.)*\d*(\+dbg\d+(\.\d+)*)*))") 1263 ("remake", "git://github.com/rocky/remake.git;protocol=https", "f05508e521987c8494c92d9c2871aec46307d51d", "(?P<pver>(\d+\.(\d+\.)*\d*(\+dbg\d+(\.\d+)*)*))")
1264 : "3.82+dbg0.9", 1264 : "3.82+dbg0.9",
1265 } 1265 }
1266 1266
@@ -2047,7 +2047,7 @@ class GitShallowTest(FetcherTest):
2047 2047
2048 @skipIfNoNetwork() 2048 @skipIfNoNetwork()
2049 def test_bitbake(self): 2049 def test_bitbake(self):
2050 self.git('remote add --mirror=fetch origin git://github.com/openembedded/bitbake', cwd=self.srcdir) 2050 self.git('remote add --mirror=fetch origin https://github.com/openembedded/bitbake', cwd=self.srcdir)
2051 self.git('config core.bare true', cwd=self.srcdir) 2051 self.git('config core.bare true', cwd=self.srcdir)
2052 self.git('fetch', cwd=self.srcdir) 2052 self.git('fetch', cwd=self.srcdir)
2053 2053