[Libosinfo] [PATCH 03/11] centos, test: Add OS info/testcase for CentOS 6.0

[Fabiano Fidêncio]

On Mon, Mar 25, 2013 at 9:50 AM, Christophe Fergeau <cfergeau at redhat.com>wrote:

> On Sat, Mar 23, 2013 at 03:09:26PM +0100, Fabiano Fidêncio wrote:
> > ---
> >  data/oses/centos.xml.in                            | 22
> ++++++++++++++++
> >  .../centos6.0/CentOS-6.0-i386-bin-DVD.iso.txt      | 29
> ++++++++++++++++++++++
> >  .../centos6.0/CentOS-6.0-x86_64-bin-DVD1.iso.txt   | 29
> ++++++++++++++++++++++
> >  test/test-isodetect.c                              |  6 +++++
> >  4 files changed, 86 insertions(+)
> >  create mode 100644
> test/isodata/centos/centos6.0/CentOS-6.0-i386-bin-DVD.iso.txt
> >  create mode 100644
> test/isodata/centos/centos6.0/CentOS-6.0-x86_64-bin-DVD1.iso.txt
> >
> > diff --git a/data/oses/centos.xml.in b/data/oses/centos.xml.in
> > index 3f09dea..bb8e570 100644
> > --- a/data/oses/centos.xml.in
> > +++ b/data/oses/centos.xml.in
> > @@ -16,13 +16,35 @@
> >          <system-id>LINUX</system-id>
> >          <volume-id>CentOS_6.0_Final</volume-id>
> >        </iso>
> > +      <kernel>isolinux/vmlinuz</kernel>
> > +      <initrd>isolinux/initrd.img</initrd>
> >      </media>
> >      <media arch="x86_64">
> >        <iso>
> >          <system-id>LINUX</system-id>
> >          <volume-id>CentOS_6.0_Final</volume-id>
> >        </iso>
> > +      <kernel>isolinux/vmlinuz</kernel>
> > +      <initrd>isolinux/initrd.img</initrd>
> >      </media>
> > +
> > +    <resources arch="all">
> > +      <minimum>
> > +        <n-cpus>1</n-cpus>
> > +        <ram>536870912</ram>
> > +      </minimum>
> > +
> > +      <recommended>
> > +        <cpu>400000000</cpu>
> > +        <ram>1073741824</ram>
> > +        <storage>9663676416</storage>
> > +      </recommended>
> > +    </resources>
> > +
> > +    <installer>
> > +      <script id='http://redhat.com/scripts/rhel/jeos'/>
> > +      <script id='http://redhat.com/scripts/rhel/desktop'/>
> > +    </installer>
>
> This gets back to a question I had while I was writing the openSUSE
> patches, should we be duplicating this info, or should this be inherited
> through the clones/derives-from elements if it's not set?
>

IMHO, this info should be inherited through the clones/derives-from
elements.
Should I change it? :-)


>
> Patch looks good apart from this.
>
> Christophe
>
> >    </os>
> >
> >    <os id="http://centos.org/centos/6.1">
> > diff --git
> a/test/isodata/centos/centos6.0/CentOS-6.0-i386-bin-DVD.iso.txt
> b/test/isodata/centos/centos6.0/CentOS-6.0-i386-bin-DVD.iso.txt
> > new file mode 100644
> > index 0000000..3109c60
> > --- /dev/null
> > +++ b/test/isodata/centos/centos6.0/CentOS-6.0-i386-bin-DVD.iso.txt
> > @@ -0,0 +1,29 @@
> > +CD-ROM is in ISO 9660 format
> > +System id: LINUX
> > +Volume id: CentOS_6.0_Final
> > +Volume set id:
> > +Publisher id: CentOS Project
> > +Data preparer id: CentOS
> > +Application id: CentOS_6.0_Final
> > +Copyright File id:
> > +Abstract File id:
> > +Bibliographic File id:
> > +Volume set size is: 1
> > +Volume set sequence number is: 1
> > +Logical block size is: 2048
> > +Volume size is: 2297586
> > +El Torito VD version 1 found, boot catalog is in sector 655
> > +Joliet with UCS level 3 found
> > +Rock Ridge signatures version 1 found
> > +Eltorito validation header:
> > +    Hid 1
> > +    Arch 0 (x86)
> > +    ID 'CentOS Project'
> > +    Key 55 AA
> > +    Eltorito defaultboot header:
> > +        Bootid 88 (bootable)
> > +        Boot media 0 (No Emulation Boot)
> > +        Load segment 0
> > +        Sys type 0
> > +        Nsect 4
> > +        Bootoff 290 656
> > diff --git
> a/test/isodata/centos/centos6.0/CentOS-6.0-x86_64-bin-DVD1.iso.txt
> b/test/isodata/centos/centos6.0/CentOS-6.0-x86_64-bin-DVD1.iso.txt
> > new file mode 100644
> > index 0000000..3cd3e6e
> > --- /dev/null
> > +++ b/test/isodata/centos/centos6.0/CentOS-6.0-x86_64-bin-DVD1.iso.txt
> > @@ -0,0 +1,29 @@
> > +CD-ROM is in ISO 9660 format
> > +System id: LINUX
> > +Volume id: CentOS_6.0_Final
> > +Volume set id:
> > +Publisher id: CentOS Project
> > +Data preparer id: CentOS
> > +Application id: CentOS_6.0_Final
> > +Copyright File id:
> > +Abstract File id:
> > +Bibliographic File id:
> > +Volume set size is: 1
> > +Volume set sequence number is: 1
> > +Logical block size is: 2048
> > +Volume size is: 2069727
> > +El Torito VD version 1 found, boot catalog is in sector 545
> > +Joliet with UCS level 3 found
> > +Rock Ridge signatures version 1 found
> > +Eltorito validation header:
> > +    Hid 1
> > +    Arch 0 (x86)
> > +    ID 'CentOS Project'
> > +    Key 55 AA
> > +    Eltorito defaultboot header:
> > +        Bootid 88 (bootable)
> > +        Boot media 0 (No Emulation Boot)
> > +        Load segment 0
> > +        Sys type 0
> > +        Nsect 4
> > +        Bootoff 222 546
> > diff --git a/test/test-isodetect.c b/test/test-isodetect.c
> > index 7a1fb06..8a982d4 100644
> > --- a/test/test-isodetect.c
> > +++ b/test/test-isodetect.c
> > @@ -384,6 +384,11 @@ START_TEST(test_opensuse)
> >  }
> >  END_TEST
> >
> > +START_TEST(test_centos)
> > +{
> > +    test_one("centos");
> > +}
> > +END_TEST
> >
> >  static Suite *
> >  list_suite(void)
> > @@ -399,6 +404,7 @@ list_suite(void)
> >      tcase_add_test(tc, test_windows);
> >      tcase_add_test(tc, test_openbsd);
> >      tcase_add_test(tc, test_opensuse);
> > +    tcase_add_test(tc, test_centos);
> >      suite_add_tcase(s, tc);
> >      return s;
> >  }
> > --
> > 1.8.1.4
> >
> > _______________________________________________
> > Libosinfo mailing list
> > Libosinfo at redhat.com
> > https://www.redhat.com/mailman/listinfo/libosinfo
>
> _______________________________________________
> Libosinfo mailing list
> Libosinfo at redhat.com
> https://www.redhat.com/mailman/listinfo/libosinfo
>
>


-- 
Fabiano Fidêncio
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20130330/43639d40/attachment.htm>