[PATCH 0/3][1.32] Add morty/2.2/1.32 release information to toaster

[PATCH 0/3][1.32] Add morty/2.2/1.32 release information to toaster

[Michael Wood]

From Brian:

This changes the fixtures for toaster in Morty so that
1) We only allow the morty branch for new projects
2) we default to morty when making a new project.

This release we do not support building older releases due to
the Python 2.7 -> Python 3 change Morty represents.

This patch set updates both the poky and oe-core fixtures.

Note: this only applies to the Morty branch and should *not* be applied to
master.

-bavery

Changes by me:
 - Fix branch name in oe-core for bitbake
 - Add "2.2" as part of the description


brian avery (3):
  toaster: Update oe-core fixture for Morty release
  toaster: Update poky fixture for Morty release
  toaster: Update default release to Morty

 lib/toaster/orm/fixtures/oe-core.xml  | 16 ++++++++--------
 lib/toaster/orm/fixtures/poky.xml     | 12 ++++++------
 lib/toaster/orm/fixtures/settings.xml |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

-- 
2.7.4

[PATCH 1/3] toaster: Update oe-core fixture for Morty release

[Michael Wood]

From: brian avery <brian.avery@intel.com>

Update the oe-core fixture to the Morty release.  This removes the
master branch from the release and limits it to the morty branch.
Normally, we would also support at least one past branch but the change
from Python 2.7 -> Python 3 makes that infeasible.

Signed-off-by: brian avery <brian.avery@intel.com>
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
---
 lib/toaster/orm/fixtures/oe-core.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/toaster/orm/fixtures/oe-core.xml b/lib/toaster/orm/fixtures/oe-core.xml
index d062de5..a6c834f 100644
--- a/lib/toaster/orm/fixtures/oe-core.xml
+++ b/lib/toaster/orm/fixtures/oe-core.xml
@@ -8,9 +8,9 @@
 
   <!-- Bitbake versions which correspond to the metadata release -->
   <object model="orm.bitbakeversion" pk="1">
-    <field type="CharField" name="name">master</field>
+    <field type="CharField" name="name">morty</field>
     <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field>
-    <field type="CharField" name="branch">master</field>
+    <field type="CharField" name="branch">1.32</field>
   </object>
   <object model="orm.bitbakeversion" pk="2">
     <field type="CharField" name="name">HEAD</field>
@@ -18,11 +18,11 @@
 
   <!-- Releases available -->
   <object model="orm.release" pk="1">
-    <field type="CharField" name="name">master</field>
-    <field type="CharField" name="description">Openembedded master</field>
+    <field type="CharField" name="name">morty</field>
+    <field type="CharField" name="description">Openembedded Morty</field>
     <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field>
-    <field type="CharField" name="branch_name">master</field>
-    <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href=\"http://cgit.openembedded.org/openembedded-core/log/\"&gt;OpenEmbedded master&lt;/a&gt; branch, where active development takes place. This is not a stable branch, so your builds might not work as expected.</field>
+    <field type="CharField" name="branch_name">morty</field>
+    <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href=\"http://cgit.openembedded.org/openembedded-core/log/?h=morty\"&gt;OpenEmbedded Morty&lt;/a&gt; branch.</field>
   </object>
   <object model="orm.release" pk="2">
     <field type="CharField" name="name">local</field>
@@ -41,12 +41,12 @@
     <field rel="ManyToOneRel" to="orm.release" name="release">2</field>
     <field type="CharField" name="layer_name">openembedded-core</field>
   </object>
-  
+
   <!-- TYPE_LOCAL = 0 Layers for the Local release -->
   <object model="orm.layer" pk="1">
     <field type="CharField" name="name">openembedded-core</field>
     <field type="CharField" name="vcs_url">git://git.openembedded.org/openembedded-core</field>
-  </object> 
+  </object>
   <object model="orm.layer_version" pk="1">
     <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field>
     <field rel="ManyToOneRel" to="orm.release" name="release">2</field>
-- 
2.7.4

[PATCH 2/3] toaster: Update poky fixture for Morty release

[Michael Wood]

From: brian avery <brian.avery@intel.com>

Update the poky fixture to the Morty release.  This removes the
master branch from the release and limits it to the morty branch.
Normally, we would also support at least one past branch but the change
from Python 2.7 -> Python 3 makes that infeasible.

Signed-off-by: brian avery <brian.avery@intel.com>
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
---
 lib/toaster/orm/fixtures/poky.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/toaster/orm/fixtures/poky.xml b/lib/toaster/orm/fixtures/poky.xml
index 75a2916..c192baa 100644
--- a/lib/toaster/orm/fixtures/poky.xml
+++ b/lib/toaster/orm/fixtures/poky.xml
@@ -8,9 +8,9 @@
 
   <!-- Bitbake versions which correspond to the metadata release -->
   <object model="orm.bitbakeversion" pk="1">
-    <field type="CharField" name="name">master</field>
+    <field type="CharField" name="name">morty</field>
     <field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field>
-    <field type="CharField" name="branch">master</field>
+    <field type="CharField" name="branch">morty</field>
     <field type="CharField" name="dirpath">bitbake</field>
   </object>
   <object model="orm.bitbakeversion" pk="2">
@@ -22,11 +22,11 @@
 
   <!-- Releases available -->
   <object model="orm.release" pk="1">
-    <field type="CharField" name="name">master</field>
-    <field type="CharField" name="description">Yocto Project master</field>
+    <field type="CharField" name="name">morty</field>
+    <field type="CharField" name="description">Yocto Project 2.2 "Morty"</field>
     <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">1</field>
-    <field type="CharField" name="branch_name">master</field>
-    <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href="http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/"&gt;Yocto Project master branch&lt;/a&gt;, where active development takes place. This is not a stable branch, so your builds might not work as expected.</field>
+    <field type="CharField" name="branch_name">morty</field>
+    <field type="TextField" name="helptext">Toaster will run your builds using the tip of the &lt;a href="http://git.yoctoproject.org/cgit/cgit.cgi/poky/log/?h=morty"&gt;Yocto Project Morty branch&lt;/a&gt;.</field>
   </object>
   <object model="orm.release" pk="2">
     <field type="CharField" name="name">local</field>
-- 
2.7.4

[PATCH 3/3] toaster: Update default release to Morty

[Michael Wood]

From: brian avery <brian.avery@intel.com>

Set Morty to be the default release in toaster for the Morty release
when creating new projects.

Signed-off-by: brian avery <brian.avery@intel.com>
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
---
 lib/toaster/orm/fixtures/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/toaster/orm/fixtures/settings.xml b/lib/toaster/orm/fixtures/settings.xml
index 78c0fdc..ee6a202 100644
--- a/lib/toaster/orm/fixtures/settings.xml
+++ b/lib/toaster/orm/fixtures/settings.xml
@@ -4,7 +4,7 @@
   <!-- pk=1 is DISTRO -->
   <object model="orm.toastersetting" pk="2">
     <field type="CharField" name="name">DEFAULT_RELEASE</field>
-    <field type="CharField" name="value">master</field>
+    <field type="CharField" name="value">morty</field>
   </object>
   <object model="orm.toastersetting" pk="3">
     <field type="CharField" name="name">DEFCONF_PACKAGE_CLASSES</field>
-- 
2.7.4

Re: [PATCH 0/3][1.32] Add morty/2.2/1.32 release information to toaster

[Brian Avery]

[-- Attachment #1: Type: text/plain, Size: 2104 bytes --]

So,

This patch set lost the MORTY part of the subject line in it's journey from
the toaster mailing list to the bitbake maling list.

This patch was supposed to be applied only to morty since it limits the
available toaster project releases to morty.

Master should have the choice of making a morty project or a master project
and so should get a *different* patch that appends the morty release
options to the master options.

Ideally, these 3 patches:

4b94b49 bitbake: toaster: Update default release to Morty

3332426 bitbake: toaster: Update poky fixture for Morty release

7656dea bitbake: toaster: Update oe-core fixture for Morty release


Would be reverted and we would make a different patch that adds morty as an
option.


Sorry :(

-Brian

an Intel employee



On Fri, Oct 14, 2016 at 8:27 AM, Michael Wood <michael.g.wood@intel.com>
wrote:

> From Brian:
>
> This changes the fixtures for toaster in Morty so that
> 1) We only allow the morty branch for new projects
> 2) we default to morty when making a new project.
>
> This release we do not support building older releases due to
> the Python 2.7 -> Python 3 change Morty represents.
>
> This patch set updates both the poky and oe-core fixtures.
>
> Note: this only applies to the Morty branch and should *not* be applied to
> master.
>
> -bavery
>
> Changes by me:
>  - Fix branch name in oe-core for bitbake
>  - Add "2.2" as part of the description
>
>
> brian avery (3):
>   toaster: Update oe-core fixture for Morty release
>   toaster: Update poky fixture for Morty release
>   toaster: Update default release to Morty
>
>  lib/toaster/orm/fixtures/oe-core.xml  | 16 ++++++++--------
>  lib/toaster/orm/fixtures/poky.xml     | 12 ++++++------
>  lib/toaster/orm/fixtures/settings.xml |  2 +-
>  3 files changed, 15 insertions(+), 15 deletions(-)
>
> --
> 2.7.4
>
> --
> _______________________________________________
> bitbake-devel mailing list
> bitbake-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/bitbake-devel
>

[-- Attachment #2: Type: text/html, Size: 3464 bytes --]