Hey, On Wed, Nov 29, 2017 at 01:17:15PM +0100, Natanael Copa wrote: > Signed-off-by: Natanael Copa <ncopa@xxxxxxxxxxxxxxx> > --- > Changes since v1: > - add minimum and recommended memory/disk > - add alpine 3.7 release > - fix so release candidate iso images are detected (eg 3.7.0_rc2) > > data/os/alpinelinux.org/alpinelinux-3.5.xml.in | 37 ++++++++++++++++++++++++ > data/os/alpinelinux.org/alpinelinux-3.6.xml.in | 40 ++++++++++++++++++++++++++ > data/os/alpinelinux.org/alpinelinux-3.7.xml.in | 40 ++++++++++++++++++++++++++ > 3 files changed, 117 insertions(+) > create mode 100644 data/os/alpinelinux.org/alpinelinux-3.5.xml.in > create mode 100644 data/os/alpinelinux.org/alpinelinux-3.6.xml.in > create mode 100644 data/os/alpinelinux.org/alpinelinux-3.7.xml.in > > diff --git a/data/os/alpinelinux.org/alpinelinux-3.5.xml.in b/data/os/alpinelinux.org/alpinelinux-3.5.xml.in > new file mode 100644 > index 0000000..c1f1f12 > --- /dev/null > +++ b/data/os/alpinelinux.org/alpinelinux-3.5.xml.in > @@ -0,0 +1,37 @@ > +<libosinfo version="0.0.1"> > +<!-- Licensed under the GNU General Public License version 2 or later. > + See http://www.gnu.org/licenses/ for a copy of the license text --> > + <os id="http://alpinelinux.org/alpinelinux/3.5";> > + <short-id>alpinelinux3.5</short-id> > + <_name>Alpine Linux 3.5</_name> > + <version>3.5</version> > + <_vendor>Alpine Linux Project</_vendor> > + <family>linux</family> > + <distro>alpinelinux</distro> > + > + <resources arch="all"> > + <minimum> > + <cpu>1000000000</cpu> > + <n-cpus>1</n-cpus> > + <ram>134217728</ram> > + <storage>1073741824</storage> > + </minimum> > + <recommended> > + <cpu>1000000000</cpu> > + <n-cpus>1</n-cpus> > + <ram>805306368</ram> > + <storage>4294967296</storage> > + </recommended> > + </resources> > + <media arch="i686"> > + <iso> > + <volume-id>alpine-.* 3.5.\d x86.*</volume-id> > + </iso> > + </media> > + <media arch="x86_64"> > + <iso> > + <volume-id>alpine-.* 3.5.\d x86_64.*</volume-id> This does not have the 3.5.\d.* that other images have to detect _rc1, is this intentional? More important, the x86 regexp will match everything that the x86_64 regexp. In such situations, it's undefined which of the 2 entries is going to be a match. Given the test data, it seems the x86 one can become + <volume-id>alpine-.* 3.5.\d x86$</volume-id> This would avoid this issue. Apart from this, this looks good. Christophe
Attachment:
signature.asc
Description: PGP signature
_______________________________________________ virt-tools-list mailing list virt-tools-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/virt-tools-list
