[2/3] toaster: Update oe-core fixture for Morty plus master release

Submitted by Avery, Brian on Oct. 31, 2016, 9:22 p.m. | Patch ID: 133423

Details

Message ID 4c90ddb64a4833912ee45b06906e7c074eb0e8d2.1477948776.git.brian.avery@intel.com
State New
Headers show

Commit Message

Avery, Brian Oct. 31, 2016, 9:22 p.m.
Update the poky fixture to include the master and Morty
releases.

Signed-off-by: brian avery <brian.avery@intel.com>
---
 lib/toaster/orm/fixtures/poky.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

Patch hide | download patch | download mbox

diff --git a/lib/toaster/orm/fixtures/poky.xml b/lib/toaster/orm/fixtures/poky.xml
index c192baa..8324071 100644
--- a/lib/toaster/orm/fixtures/poky.xml
+++ b/lib/toaster/orm/fixtures/poky.xml
@@ -7,6 +7,12 @@ 
   </object>
 
   <!-- Bitbake versions which correspond to the metadata release -->
+  <object model="orm.bitbakeversion" pk="3">
+    <field type="CharField" name="name">master</field>
+    <field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field>
+    <field type="CharField" name="branch">master</field>
+    <field type="CharField" name="dirpath">bitbake</field>
+  </object>
   <object model="orm.bitbakeversion" pk="1">
     <field type="CharField" name="name">morty</field>
     <field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field>
@@ -21,6 +27,13 @@ 
   </object>
 
   <!-- Releases available -->
+  <object model="orm.release" pk="3">
+    <field type="CharField" name="name">master</field>
+    <field type="CharField" name="description">Yocto Project master</field>
+    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">3</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/"&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>
+  </object>
   <object model="orm.release" pk="1">
     <field type="CharField" name="name">morty</field>
     <field type="CharField" name="description">Yocto Project 2.2 "Morty"</field>

Comments

Michael Wood Nov. 2, 2016, 12:02 p.m.
This commit subject line does not match the content of this patch. I 
think you've accidentally duplicated it from the first patch.

On 31/10/16 21:22, brian avery wrote:
> Update the poky fixture to include the master and Morty
> releases.
>
> Signed-off-by: brian avery <brian.avery@intel.com>
> ---
>   lib/toaster/orm/fixtures/poky.xml | 13 +++++++++++++
>   1 file changed, 13 insertions(+)
>
> diff --git a/lib/toaster/orm/fixtures/poky.xml b/lib/toaster/orm/fixtures/poky.xml
> index c192baa..8324071 100644
> --- a/lib/toaster/orm/fixtures/poky.xml
> +++ b/lib/toaster/orm/fixtures/poky.xml
> @@ -7,6 +7,12 @@
>     </object>
>   
>     <!-- Bitbake versions which correspond to the metadata release -->
> +  <object model="orm.bitbakeversion" pk="3">
> +    <field type="CharField" name="name">master</field>
> +    <field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field>
> +    <field type="CharField" name="branch">master</field>
> +    <field type="CharField" name="dirpath">bitbake</field>
> +  </object>

It's a small thing but please also order the objects in the fixtures 
sequentially (rather than 3 .. 1.. 2).

>     <object model="orm.bitbakeversion" pk="1">
>       <field type="CharField" name="name">morty</field>
>       <field type="CharField" name="giturl">git://git.yoctoproject.org/poky</field>
> @@ -21,6 +27,13 @@
>     </object>
>   
>     <!-- Releases available -->
> +  <object model="orm.release" pk="3">
> +    <field type="CharField" name="name">master</field>
> +    <field type="CharField" name="description">Yocto Project master</field>
> +    <field rel="ManyToOneRel" to="orm.bitbakeversion" name="bitbake_version">3</field>
> +    <field type="CharField" name="branch_name">morty</field>

Release master but you've got the branch_name set to "morty" this won't 
work!


> +    <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>
> +  </object>
>     <object model="orm.release" pk="1">
>       <field type="CharField" name="name">morty</field>
>       <field type="CharField" name="description">Yocto Project 2.2 "Morty"</field>

As mentioned on the Toaster call last week I've already had a go at 
doing these patches already. See 
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10497 and the 
attachment. This bug is unresolved, when you create a new project it 
won't pick up the correct default layers, your patches also don't 
address this issue.

Michael
brian avery Nov. 2, 2016, 2:47 p.m.
whoops. ok.

On Wed, Nov 2, 2016 at 5:02 AM, Michael Wood <michael.g.wood@intel.com>
wrote:

> This commit subject line does not match the content of this patch. I think
> you've accidentally duplicated it from the first patch.

kind of. I should have made the subject more general since this was a patch
set to do both of them.

>
>
> On 31/10/16 21:22, brian avery wrote:
>
>> Update the poky fixture to include the master and Morty
>> releases.
>>
>> Signed-off-by: brian avery <brian.avery@intel.com>
>> ---
>>   lib/toaster/orm/fixtures/poky.xml | 13 +++++++++++++
>>   1 file changed, 13 insertions(+)
>>
>> diff --git a/lib/toaster/orm/fixtures/poky.xml
>> b/lib/toaster/orm/fixtures/poky.xml
>> index c192baa..8324071 100644
>> --- a/lib/toaster/orm/fixtures/poky.xml
>> +++ b/lib/toaster/orm/fixtures/poky.xml
>> @@ -7,6 +7,12 @@
>>     </object>
>>       <!-- Bitbake versions which correspond to the metadata release -->
>> +  <object model="orm.bitbakeversion" pk="3">
>> +    <field type="CharField" name="name">master</field>
>> +    <field type="CharField" name="giturl">git://git.yoctop
>> roject.org/poky</field>
>> +    <field type="CharField" name="branch">master</field>
>> +    <field type="CharField" name="dirpath">bitbake</field>
>> +  </object>
>>
>
> It's a small thing but please also order the objects in the fixtures
> sequentially (rather than 3 .. 1.. 2).


I found the out of order thing made it clearer to me that the order isn't
what determinies the default. Maybe we should order then correctly and add
a comment about settings.xml for default.

>
>
>     <object model="orm.bitbakeversion" pk="1">
>>       <field type="CharField" name="name">morty</field>
>>       <field type="CharField" name="giturl">git://git.yoctop
>> roject.org/poky</field>
>> @@ -21,6 +27,13 @@
>>     </object>
>>       <!-- Releases available -->
>> +  <object model="orm.release" pk="3">
>> +    <field type="CharField" name="name">master</field>
>> +    <field type="CharField" name="description">Yocto Project
>> master</field>
>> +    <field rel="ManyToOneRel" to="orm.bitbakeversion"
>> name="bitbake_version">3</field>
>> +    <field type="CharField" name="branch_name">morty</field>
>>
>
> Release master but you've got the branch_name set to "morty" this won't
> work!
>
> yep error.


>
> +    <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>
>> +  </object>
>>     <object model="orm.release" pk="1">
>>       <field type="CharField" name="name">morty</field>
>>       <field type="CharField" name="description">Yocto Project 2.2
>> "Morty"</field>
>>
>
> As mentioned on the Toaster call last week I've already had a go at doing
> these patches already. See https://bugzilla.yoctoproject.
> org/show_bug.cgi?id=10497 and the attachment. This bug is unresolved,
> when you create a new project it won't pick up the correct default layers,
> your patches also don't address this issue.

I'd forgotten about the layer issue. Sadly while this is unresolved we
cannot update the master toaster containers.
k, I'll leave it with you.
-b
an intel employee.

>
>
> Michael
>
>
> --
> _______________________________________________
> toaster mailing list
> toaster@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/toaster
>