manifest: url for remotes changed to url-base

This commit uses url-base instead of url to avoid confusion for users
as url in west section of manifest is full url, where url-base in manifest
section will be concatenated with project name to for clone url.

Signed-off-by: Torsten Rasmussen <torsten.rasmussen@nordicsemi.no>

src/west/manifest-schema.yml

@@ -54,9 +54,9 @@ mapping:
   #
   #   remotes:
   #     - name: zephyrproject-rtos
-  #       url: https://github.com/zephyrproject-rtos
+  #       url-base: https://github.com/zephyrproject-rtos
   #     - name: developer-fork
-  #       url: https://github.com/a-developer
+  #       url-base: https://github.com/a-developer
   remotes:
     required: true
     type: seq
@@ -66,7 +66,7 @@ mapping:
           name:
             required: true
             type: str
-          url:
+          url-base:
             required: true
             type: str
 
@@ -78,7 +78,7 @@ mapping:
   # Each project is a map with the following keys:
   #
   # - name: Mandatory, the name of the git repository. The clone
-  #   URL is formed by remote + '/' + name. The name cannot
+  #   URL is formed by remote url-base + '/' + name. The name cannot
   #   be one of the reserved values "west" and "manifest".
   # - remote: Optional, the name of the remote to pull it from.
   #   If the remote is missing, the remote'key in the top-level

src/west/manifest.py

@@ -183,7 +183,7 @@ class Manifest:
         manifest = data.get('manifest')
 
         # Map from each remote's name onto that remote's data in the manifest.
-        remotes = tuple(Remote(r['name'], r['url']) for r in
+        remotes = tuple(Remote(r['name'], r['url-base']) for r in
                         manifest['remotes'])
         remotes_dict = {r.name: r for r in remotes}
 

tests/west/manifest/invalid_bad_default_remote.yml

@@ -4,7 +4,7 @@ manifest:
 
   remotes:
     - name: testremote
-      url: https://example.com
+      url-base: https://example.com
 
   projects:
     - name: foo

tests/west/manifest/invalid_duplicate_project_path.yml

@@ -4,7 +4,7 @@ manifest:
 
   remotes:
     - name: testremote
-      url: https://example.com
+      url-base: https://example.com
 
   projects:
     - name: foo1

tests/west/manifest/invalid_ill_defined_project.yml

@@ -1,7 +1,7 @@
 manifest:
   remotes:
     - name: testremote
-      url: https://example.com
+      url-base: https://example.com
 
   projects:
     - name: ill_defined_no_remote

tests/west/manifest/invalid_no_projects.yml

@@ -1,4 +1,4 @@
 manifest:
   remotes:
     - name: testremote
-      url: https://example.com
+      url-base: https://example.com

tests/west/manifest/invalid_reserved_name_manifest.yml

@@ -1,7 +1,7 @@
 manifest:
   remotes:
     - name: testremote
-      url: https://example.com
+      url-base: https://example.com
 
   projects:
     - name: manifest

tests/west/manifest/invalid_reserved_name_west.yml

@@ -1,7 +1,7 @@
 manifest:
   remotes:
     - name: testremote
-      url: https://example.com
+      url-base: https://example.com
 
   projects:
     - name: west

tests/west/manifest/invalid_too_flat.yml

@@ -1,7 +1,7 @@
 # This invalid manifest is too flat.
 remotes:
   - name: testremote
-    url: https://example.com
+    url-base: https://example.com
 projects:
   - name: testproject
     remote: testremote

tests/west/manifest/invalid_west_section.yml

@@ -13,7 +13,7 @@ manifest:
 
   remotes:
     - name: upstream
-      url: https://example.com
+      url-base: https://example.com
 
   projects:
     - name: zephyr

tests/west/manifest/test_manifest.py

@@ -33,9 +33,9 @@ def test_no_defaults():
     manifest:
       remotes:
         - name: testremote1
-          url: https://example1.com
+          url-base: https://example1.com
         - name: testremote2
-          url: https://example2.com
+          url-base: https://example2.com
 
       projects:
         - name: testproject1
@@ -74,9 +74,9 @@ def test_default_clone_depth():
 
       remotes:
         - name: testremote1
-          url: https://example1.com
+          url-base: https://example1.com
         - name: testremote2
-          url: https://example2.com
+          url-base: https://example2.com
 
       projects:
         - name: testproject1
@@ -116,7 +116,7 @@ def test_path():
     manifest:
       remotes:
         - name: testremote
-          url: https://example.com
+          url-base: https://example.com
       projects:
         - name: testproject
           remote: testremote
@@ -137,7 +137,7 @@ def test_sections():
     manifest:
       remotes:
         - name: testremote
-          url: https://example.com
+          url-base: https://example.com
       projects:
         - name: testproject
           remote: testremote
@@ -155,7 +155,7 @@ def test_sections():
     manifest:
       remotes:
         - name: testremote
-          url: https://example.com
+          url-base: https://example.com
       projects:
         - name: testproject
           remote: testremote

tests/west/project/test_project.py

@@ -76,7 +76,7 @@ manifest:
 
   remotes:
     - name: repos
-      url: file://{}
+      url-base: file://{}
 
   projects:
     - name: net-tools