mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
selftest/scripts: Update old git protocol references
git protocol accesses to our infrastructure are currently struggling and this has highlighted a number of places we're making those obsolete access forms. Update them to use https instead of the git protocol since it is preferred and more reliable. The devtool test needed quoting to handle the ';' in the url. The -f option to devtool also shows a deprecation warning so remove that. There were internal references to git protocol urls inside the nested git submodules test report, which means those repos need updating to use new git revisions. (From OE-Core rev: f40351639cc9b94afc590b73b57c2764a4429f4f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 1ceba42623c5187d2f5a100d6a523abcdc75d34e) Signed-off-by: Yoann Congal <yoann.congal@smile.fr> Signed-off-by: Paul Barker <paul@pbarker.dev>
This commit is contained in:
committed by
Paul Barker
parent
7d6d05fbed
commit
5071393867
@@ -11,7 +11,7 @@ SRCREV = "1a3e1343761b30750bed70e0fd688f6d3c7b3717"
|
||||
PV = "0.1+git${SRCPV}"
|
||||
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"
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ DEPENDS = "dbus"
|
||||
SRCREV = "6cc6077a36fe2648a5f993fe7c16c9632f946517"
|
||||
PV = "0.1+git${SRCPV}"
|
||||
|
||||
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"
|
||||
|
||||
|
||||
@@ -517,7 +517,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'
|
||||
@@ -526,7 +526,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
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -31,7 +31,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)
|
||||
|
||||
Reference in New Issue
Block a user