[meta-oe,thud] layerindexlib: change LAYERSERIES_COMPAT to thud

Submitted by Oleksandr Kravchuk on Nov. 28, 2018, 10:51 p.m. | Patch ID: 156715

Details

Message ID 20181128225109.110590-1-oleksandr.kravchuk@pelagicore.com
State New
Headers show

Commit Message

Oleksandr Kravchuk Nov. 28, 2018, 10:51 p.m.
Signed-off-by: Oleksandr Kravchuk <oleksandr.kravchuk@pelagicore.com>
---
 bitbake/lib/layerindexlib/tests/restapi.py                    | 2 +-
 .../lib/layerindexlib/tests/testdata/build/conf/bblayers.conf | 2 +-
 .../lib/layerindexlib/tests/testdata/layer1/conf/layer.conf   | 4 ++--
 .../lib/layerindexlib/tests/testdata/layer2/conf/layer.conf   | 2 +-
 .../lib/layerindexlib/tests/testdata/layer3/conf/layer.conf   | 2 +-
 .../lib/layerindexlib/tests/testdata/layer4/conf/layer.conf   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

Patch hide | download patch | download mbox

diff --git a/bitbake/lib/layerindexlib/tests/restapi.py b/bitbake/lib/layerindexlib/tests/restapi.py
index 58766950ce..4febd23609 100644
--- a/bitbake/lib/layerindexlib/tests/restapi.py
+++ b/bitbake/lib/layerindexlib/tests/restapi.py
@@ -35,7 +35,7 @@  class LayerIndexWebRestApiTest(LayersTest):
         self.assertFalse(os.environ.get("BB_SKIP_NETTESTS") == "yes", msg="BB_SKIP_NETTESTS set, but we tried to test anyway")
         LayersTest.setUp(self)
         self.layerindex = layerindexlib.LayerIndex(self.d)
-        self.layerindex.load_layerindex('http://layers.openembedded.org/layerindex/api/;branch=sumo', load=['layerDependencies'])
+        self.layerindex.load_layerindex('http://layers.openembedded.org/layerindex/api/;branch=thud', load=['layerDependencies'])
 
     @skipIfNoNetwork()
     def test_layerindex_is_empty(self):
diff --git a/bitbake/lib/layerindexlib/tests/testdata/build/conf/bblayers.conf b/bitbake/lib/layerindexlib/tests/testdata/build/conf/bblayers.conf
index 40429b2f66..4f06ca7b70 100644
--- a/bitbake/lib/layerindexlib/tests/testdata/build/conf/bblayers.conf
+++ b/bitbake/lib/layerindexlib/tests/testdata/build/conf/bblayers.conf
@@ -1,4 +1,4 @@ 
-LAYERSERIES_CORENAMES = "sumo"
+LAYERSERIES_CORENAMES = "thud"
 
 # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf b/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf
index 966d531959..8e979e0c65 100644
--- a/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf
+++ b/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf
@@ -7,11 +7,11 @@  BBFILE_COLLECTIONS += "core"
 BBFILE_PATTERN_core = "^${LAYERDIR}/"
 BBFILE_PRIORITY_core = "5"
 
-LAYERSERIES_CORENAMES = "sumo"
+LAYERSERIES_CORENAMES = "thud"
 
 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers
 LAYERVERSION_core = "11"
-LAYERSERIES_COMPAT_core = "sumo"
+LAYERSERIES_COMPAT_core = "thud"
 
 BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core"
diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf b/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf
index 7569d1c217..a59cdf3a45 100644
--- a/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf
+++ b/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf
@@ -17,4 +17,4 @@  LAYERDEPENDS_networking-layer = "core"
 LAYERDEPENDS_networking-layer += "openembedded-layer"
 LAYERDEPENDS_networking-layer += "meta-python"
 
-LAYERSERIES_COMPAT_networking-layer = "sumo"
+LAYERSERIES_COMPAT_networking-layer = "thud"
diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf b/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf
index 7089071faf..321d51bee7 100644
--- a/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf
+++ b/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf
@@ -14,6 +14,6 @@  LAYERVERSION_meta-python = "1"
 
 LAYERDEPENDS_meta-python = "core openembedded-layer"
 
-LAYERSERIES_COMPAT_meta-python = "sumo"
+LAYERSERIES_COMPAT_meta-python = "thud"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf b/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf
index 6649ee0208..86f689491e 100644
--- a/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf
+++ b/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf
@@ -19,4 +19,4 @@  LAYERVERSION_openembedded-layer = "1"
 
 LAYERDEPENDS_openembedded-layer = "core"
 
-LAYERSERIES_COMPAT_openembedded-layer = "sumo"
+LAYERSERIES_COMPAT_openembedded-layer = "thud"

Comments

Mark Hatle Nov. 28, 2018, 11:10 p.m.
Does this actually matter?  The test cases, just care that the layer branch has
valid contents -- but they don't care what branch it's on.

--Mark

On 11/28/18 4:51 PM, Oleksandr Kravchuk wrote:
> Signed-off-by: Oleksandr Kravchuk <oleksandr.kravchuk@pelagicore.com>
> ---
>  bitbake/lib/layerindexlib/tests/restapi.py                    | 2 +-
>  .../lib/layerindexlib/tests/testdata/build/conf/bblayers.conf | 2 +-
>  .../lib/layerindexlib/tests/testdata/layer1/conf/layer.conf   | 4 ++--
>  .../lib/layerindexlib/tests/testdata/layer2/conf/layer.conf   | 2 +-
>  .../lib/layerindexlib/tests/testdata/layer3/conf/layer.conf   | 2 +-
>  .../lib/layerindexlib/tests/testdata/layer4/conf/layer.conf   | 2 +-
>  6 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/bitbake/lib/layerindexlib/tests/restapi.py b/bitbake/lib/layerindexlib/tests/restapi.py
> index 58766950ce..4febd23609 100644
> --- a/bitbake/lib/layerindexlib/tests/restapi.py
> +++ b/bitbake/lib/layerindexlib/tests/restapi.py
> @@ -35,7 +35,7 @@ class LayerIndexWebRestApiTest(LayersTest):
>          self.assertFalse(os.environ.get("BB_SKIP_NETTESTS") == "yes", msg="BB_SKIP_NETTESTS set, but we tried to test anyway")
>          LayersTest.setUp(self)
>          self.layerindex = layerindexlib.LayerIndex(self.d)
> -        self.layerindex.load_layerindex('http://layers.openembedded.org/layerindex/api/;branch=sumo', load=['layerDependencies'])
> +        self.layerindex.load_layerindex('http://layers.openembedded.org/layerindex/api/;branch=thud', load=['layerDependencies'])
>  
>      @skipIfNoNetwork()
>      def test_layerindex_is_empty(self):
> diff --git a/bitbake/lib/layerindexlib/tests/testdata/build/conf/bblayers.conf b/bitbake/lib/layerindexlib/tests/testdata/build/conf/bblayers.conf
> index 40429b2f66..4f06ca7b70 100644
> --- a/bitbake/lib/layerindexlib/tests/testdata/build/conf/bblayers.conf
> +++ b/bitbake/lib/layerindexlib/tests/testdata/build/conf/bblayers.conf
> @@ -1,4 +1,4 @@
> -LAYERSERIES_CORENAMES = "sumo"
> +LAYERSERIES_CORENAMES = "thud"
>  
>  # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
>  # changes incompatibly
> diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf b/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf
> index 966d531959..8e979e0c65 100644
> --- a/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf
> +++ b/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf
> @@ -7,11 +7,11 @@ BBFILE_COLLECTIONS += "core"
>  BBFILE_PATTERN_core = "^${LAYERDIR}/"
>  BBFILE_PRIORITY_core = "5"
>  
> -LAYERSERIES_CORENAMES = "sumo"
> +LAYERSERIES_CORENAMES = "thud"
>  
>  # This should only be incremented on significant changes that will
>  # cause compatibility issues with other layers
>  LAYERVERSION_core = "11"
> -LAYERSERIES_COMPAT_core = "sumo"
> +LAYERSERIES_COMPAT_core = "thud"
>  
>  BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core"
> diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf b/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf
> index 7569d1c217..a59cdf3a45 100644
> --- a/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf
> +++ b/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf
> @@ -17,4 +17,4 @@ LAYERDEPENDS_networking-layer = "core"
>  LAYERDEPENDS_networking-layer += "openembedded-layer"
>  LAYERDEPENDS_networking-layer += "meta-python"
>  
> -LAYERSERIES_COMPAT_networking-layer = "sumo"
> +LAYERSERIES_COMPAT_networking-layer = "thud"
> diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf b/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf
> index 7089071faf..321d51bee7 100644
> --- a/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf
> +++ b/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf
> @@ -14,6 +14,6 @@ LAYERVERSION_meta-python = "1"
>  
>  LAYERDEPENDS_meta-python = "core openembedded-layer"
>  
> -LAYERSERIES_COMPAT_meta-python = "sumo"
> +LAYERSERIES_COMPAT_meta-python = "thud"
>  
>  LICENSE_PATH += "${LAYERDIR}/licenses"
> diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf b/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf
> index 6649ee0208..86f689491e 100644
> --- a/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf
> +++ b/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf
> @@ -19,4 +19,4 @@ LAYERVERSION_openembedded-layer = "1"
>  
>  LAYERDEPENDS_openembedded-layer = "core"
>  
> -LAYERSERIES_COMPAT_openembedded-layer = "sumo"
> +LAYERSERIES_COMPAT_openembedded-layer = "thud"
>