diff --git a/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb b/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb index 2558a22ce5..deb3dfb82e 100644 --- a/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb +++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb @@ -11,7 +11,7 @@ SRCREV = "1a3e1343761b30750bed70e0fd688f6d3c7b3717" PV = "0.1+git" PR = "r2" -SRC_URI = "git://git.yoctoproject.org/dbus-wait;branch=master" +SRC_URI = "git://git.yoctoproject.org/dbus-wait;branch=master;protocol=https" UPSTREAM_CHECK_COMMITS = "1" RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature" diff --git a/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded b/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded index eaa8bd898d..5e3d510f29 100644 --- a/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded +++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded @@ -10,7 +10,7 @@ DEPENDS = "dbus" SRCREV = "6cc6077a36fe2648a5f993fe7c16c9632f946517" PV = "0.1+git" -SRC_URI = "git://git.yoctoproject.org/dbus-wait;branch=master" +SRC_URI = "git://git.yoctoproject.org/dbus-wait;branch=master;protocol=https" UPSTREAM_CHECK_COMMITS = "1" RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature" diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 55048830bf..d56696c10d 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -585,7 +585,7 @@ class DevtoolAddTests(DevtoolBase): def test_devtool_add_fetch_git(self): tempdir = tempfile.mkdtemp(prefix='devtoolqa') self.track_for_cleanup(tempdir) - url = 'gitsm://git.yoctoproject.org/mraa' + url = 'gitsm://git.yoctoproject.org/mraa;protocol=https' url_branch = '%s;branch=master' % url checkrev = 'ae127b19a50aa54255e4330ccfdd9a5d058e581d' testrecipe = 'mraa' @@ -594,7 +594,7 @@ class DevtoolAddTests(DevtoolBase): self.track_for_cleanup(self.workspacedir) self.add_command_to_tearDown('bitbake -c cleansstate %s' % testrecipe) self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') - result = runCmd('devtool add %s %s -a -f %s' % (testrecipe, srcdir, url)) + result = runCmd('devtool add %s %s -a "%s"' % (testrecipe, srcdir, url)) self.assertExists(os.path.join(self.workspacedir, 'conf', 'layer.conf'), 'Workspace directory not created: %s' % result.output) self.assertTrue(os.path.isfile(os.path.join(srcdir, 'imraa', 'imraa.c')), 'Unable to find imraa/imraa.c in source directory') # Test devtool status diff --git a/meta/lib/oeqa/selftest/cases/externalsrc.py b/meta/lib/oeqa/selftest/cases/externalsrc.py index 1d800dc82c..c127d254e3 100644 --- a/meta/lib/oeqa/selftest/cases/externalsrc.py +++ b/meta/lib/oeqa/selftest/cases/externalsrc.py @@ -17,7 +17,7 @@ class ExternalSrc(OESelftestTestCase): # so we check only that a recipe with externalsrc can be parsed def test_externalsrc_srctree_hash_files(self): test_recipe = "git-submodule-test" - git_url = "git://git.yoctoproject.org/git-submodule-test" + git_url = "https://git.yoctoproject.org/git-submodule-test" externalsrc_dir = tempfile.TemporaryDirectory(prefix="externalsrc").name self.write_config( diff --git a/meta/lib/oeqa/selftest/cases/gitarchivetests.py b/meta/lib/oeqa/selftest/cases/gitarchivetests.py index 71382089c1..c40adf2581 100644 --- a/meta/lib/oeqa/selftest/cases/gitarchivetests.py +++ b/meta/lib/oeqa/selftest/cases/gitarchivetests.py @@ -105,7 +105,7 @@ class GitArchiveTests(OESelftestTestCase): delete_fake_repository(path) def test_get_tags_without_valid_remote(self): - url = 'git://git.yoctoproject.org/poky' + url = 'https://git.yoctoproject.org/poky' path, git_obj = create_fake_repository(False, None, False) tags = ga.get_tags(git_obj, self.log, pattern="yocto-*", url=url) diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py index 4a2c425ac8..42a481500a 100644 --- a/meta/lib/oeqa/selftest/cases/sstatetests.py +++ b/meta/lib/oeqa/selftest/cases/sstatetests.py @@ -228,7 +228,7 @@ class SStateTests(SStateBase): # Use dbus-wait as a local git repo we can add a commit between two builds in pn = 'dbus-wait' srcrev = '6cc6077a36fe2648a5f993fe7c16c9632f946517' - url = 'git://git.yoctoproject.org/dbus-wait' + url = 'https://git.yoctoproject.org/dbus-wait' result = runCmd('git clone %s noname' % url, cwd=tempdir) srcdir = os.path.join(tempdir, 'noname') result = runCmd('git reset --hard %s' % srcrev, cwd=srcdir) diff --git a/meta/lib/oeqa/selftest/cases/yoctotestresultsquerytests.py b/meta/lib/oeqa/selftest/cases/yoctotestresultsquerytests.py index 312edb6431..05a7f99809 100644 --- a/meta/lib/oeqa/selftest/cases/yoctotestresultsquerytests.py +++ b/meta/lib/oeqa/selftest/cases/yoctotestresultsquerytests.py @@ -36,4 +36,4 @@ class TestResultsQueryTests(OESelftestTestCase): shutil.rmtree(workdir, ignore_errors=True) self.fail(f"Can not execute git commands in {workdir}") shutil.rmtree(workdir) - self.assertEqual(url, "git://git.yoctoproject.org/yocto-testresults") + self.assertEqual(url, "https://git.yoctoproject.org/yocto-testresults") diff --git a/scripts/yocto_testresults_query.py b/scripts/yocto_testresults_query.py index 521ead8473..08bd8cbff1 100755 --- a/scripts/yocto_testresults_query.py +++ b/scripts/yocto_testresults_query.py @@ -21,7 +21,7 @@ script_path = os.path.dirname(os.path.realpath(__file__)) poky_path = os.path.abspath(os.path.join(script_path, "..")) resulttool = os.path.abspath(os.path.join(script_path, "resulttool")) logger = scriptutils.logger_create(sys.argv[0]) -testresults_default_url="git://git.yoctoproject.org/yocto-testresults" +testresults_default_url="https://git.yoctoproject.org/yocto-testresults" def create_workdir(): workdir = tempfile.mkdtemp(prefix='yocto-testresults-query.')