Hello community,
here is the log from the commit of package ceph-image for openSUSE:Factory
checked in at 2019-11-06 13:56:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ceph-image (Old)
and /work/SRC/openSUSE:Factory/.ceph-image.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ceph-image"
Wed Nov 6 13:56:27 2019 rev:4 rq:745141 version:1.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/ceph-image/ceph-image.changes 2019-08-23
11:08:31.054467480 +0200
+++ /work/SRC/openSUSE:Factory/.ceph-image.new.2990/ceph-image.changes
2019-11-06 13:56:28.484180426 +0100
@@ -1,0 +2,6 @@
+Sun Nov 3 15:12:50 UTC 2019 - Kristoffer Gronlund <kgronl...@suse.com>
+
+- Generate container history (SES-922)
+- Add release number to version labels
+
+-------------------------------------------------------------------
New:
----
pre-checkin.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ceph-image.kiwi ++++++
--- /var/tmp/diff_new_pack.vnvN1g/_old 2019-11-06 13:56:29.824181878 +0100
+++ /var/tmp/diff_new_pack.vnvN1g/_new 2019-11-06 13:56:29.824181878 +0100
@@ -24,15 +24,15 @@
<suse_label_helper:add_prefix prefix="org.opensuse.ceph">
<label name="org.opencontainers.image.title" value="Ceph container
image"/>
<label name="org.opencontainers.image.description" value="Ceph
container image"/>
- <label name="org.opencontainers.image.version"
value="%PKG_VERSION%"/>
+ <label name="org.opencontainers.image.version"
value="%PKG_VERSION%.%RELEASE%"/>
<label name="org.opencontainers.image.created"
value="%BUILDTIME%"/>
<label name="org.opencontainers.image.vendor" value="SUSE LLC"/>
- <label name="org.opencontainers.image.url"
value="registry.opensuse.org/opensuse/ceph/ceph:%PKG_VERSION%"/>
+ <label name="org.opencontainers.image.url"
value="https://registry.opensuse.org/opensuse/ceph/ceph:%PKG_VERSION%.%RELEASE%"/>
<label name="org.openbuildservice.disturl" value="%DISTURL%"/>
- <label name="org.opensuse.reference"
value="opensuse/ceph/ceph:%PKG_VERSION%"/>
+ <label name="org.opensuse.reference"
value="registry.opensuse.org/opensuse/ceph/ceph:%PKG_VERSION%.%RELEASE%"/>
</suse_label_helper:add_prefix>
</labels>
- <history author="Denis Kondratenko
<denis.kondrate...@suse.com>">Derive the image</history>
+ <history author="Denis Kondratenko
<denis.kondrate...@suse.com>">Generate container history
(SES-922)</history>
</containerconfig>
</type>
<version>1.0.0</version>
++++++ README ++++++
--- /var/tmp/diff_new_pack.vnvN1g/_old 2019-11-06 13:56:29.908181969 +0100
+++ /var/tmp/diff_new_pack.vnvN1g/_new 2019-11-06 13:56:29.912181974 +0100
@@ -1,5 +1,13 @@
-# HOWTO generate kiwi file for the different platfoms
+# Generating the KIWI file
+
+The `.kiwi` file is generated from the `ceph-image.xsl`
+base template and the `*.xml` documents for each distribution.
+
+After making changes to any of the xsl or xml files, the kiwi
+file can be regenerated by running `sh ./pre-checkin.sh TARGET`,
+where TARGET corresponds to the distribution flavor in use.
+
+## Requirements
+
+* xsltproc
-* xsltproc ceph-image.xsl tumbleweed.xml > ceph-image.kiwi
-* xsltproc ceph-image.xsl leap15_1.xml > ceph-image.kiwi
-* xsltproc ceph-image.xsl ses6.xml > ceph-image.kiwi
++++++ ceph-image.xsl ++++++
--- /var/tmp/diff_new_pack.vnvN1g/_old 2019-11-06 13:56:29.988182056 +0100
+++ /var/tmp/diff_new_pack.vnvN1g/_new 2019-11-06 13:56:29.992182060 +0100
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+<xsl:param name="history" select="'Derive the image'"/>
<xsl:output method="xml" encoding="UTF-8" indent="yes"/>
<xsl:template match="/">
-
+
<xsl:comment> OBS-ExclusiveArch: aarch64 x86_64 </xsl:comment>
<xsl:comment>
This file is generated,
@@ -53,7 +54,7 @@
</label>
<label name="org.opencontainers.image.description" value="Ceph
container image"/>
- <label name="org.opencontainers.image.version"
value="%PKG_VERSION%"/>
+ <label name="org.opencontainers.image.version"
value="%PKG_VERSION%.%RELEASE%"/>
<label name="org.opencontainers.image.created"
value="%BUILDTIME%"/>
<label name="org.opencontainers.image.vendor" value="SUSE LLC"/>
@@ -61,7 +62,7 @@
<xsl:attribute name="value">
<xsl:value-of select="param/url" />
</xsl:attribute>
- </label>
+ </label>
<label name="org.openbuildservice.disturl" value="%DISTURL%"/>
@@ -69,8 +70,8 @@
<xsl:attribute name="value">
<xsl:value-of select="param/reference" />
</xsl:attribute>
- </label>
-
+ </label>
+
</suse_label_helper:add_prefix>
<xsl:for-each select="param/labels/label">
@@ -86,7 +87,7 @@
</labels>
- <history author="Denis Kondratenko
<denis.kondrate...@suse.com>">Derive the image</history>
+ <history author="Denis Kondratenko
<denis.kondrate...@suse.com>"><xsl:value-of select="$history"/></history>
</containerconfig>
</type>
<version>1.0.0</version>
@@ -133,4 +134,4 @@
</xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>
++++++ leap15_1.xml ++++++
--- /var/tmp/diff_new_pack.vnvN1g/_old 2019-11-06 13:56:30.008182078 +0100
+++ /var/tmp/diff_new_pack.vnvN1g/_new 2019-11-06 13:56:30.008182078 +0100
@@ -4,12 +4,12 @@
<name>ceph/ceph</name>
<prefix>org.opensuse.ceph</prefix>
<title>Ceph container image</title>
- <url>registry.opensuse.org/ceph/ceph:%PKG_VERSION%</url>
- <reference>ceph/ceph:%PKG_VERSION%</reference>
+ <url>https://registry.opensuse.org/ceph/ceph:%PKG_VERSION%.%RELEASE%</url>
+
<reference>registry.opensuse.org/ceph/ceph:%PKG_VERSION%.%RELEASE%</reference>
<packages_image>
<package>
<name>patterns-ceph-containers-ceph_base</name>
- </package>
+ </package>
</packages_image>
<packages_boot>
<package>
++++++ pre-checkin.sh ++++++
#!/bin/bash
#
# Generate the kiwi file for the given target.
image="ceph-image"
history="$(sed -n "s/^-[ ]//p" <${image}.changes | head -1)"
target=${1:-tumbleweed}
if [ ! -e ${target}.xml ]; then
echo "Unknown target: ${target}.xml must exist!"
exit 1
fi
xsltproc --stringparam history "$history" "${image}.xsl" "${target}.xml" >
"${image}.kiwi"
++++++ ses6.xml ++++++
--- /var/tmp/diff_new_pack.vnvN1g/_old 2019-11-06 13:56:30.028182099 +0100
+++ /var/tmp/diff_new_pack.vnvN1g/_new 2019-11-06 13:56:30.028182099 +0100
@@ -4,29 +4,29 @@
<name>ses/6/ceph/ceph</name>
<prefix>com.suse.ses</prefix>
<title>SUSE Enterprise Storage 6.0</title>
- <url>https://registry.suse.com/ses/6/ceph/ceph:%PKG_VERSION%</url>
- <reference>ses/6/ceph/ceph:%PKG_VERSION%</reference>
+ <url>https://registry.suse.com/ses/6/ceph/ceph:%PKG_VERSION%.%RELEASE%</url>
+
<reference>registry.suse.com/ses/6/ceph/ceph:%PKG_VERSION%.%RELEASE%</reference>
<labels>
- <label>
- <name>com.suse.ses.version</name>
- <value>6.0</value>
- </label>
- <label>
- <name>com.suse.ses.url</name>
-
<value>https://www.suse.com/solutions/software-defined-storage/</value>
- </label>
- <label>
- <name>com.suse.ceph.version</name>
- <value>%PKG_VERSION%</value>
- </label>
- <label>
- <name>com.suse.ceph.url</name>
- <value>https://ceph.com/</value>
- </label>
- <label>
- <name>com.suse.rook.created</name>
- <value>%BUILDTIME%</value>
- </label>
+ <label>
+ <name>com.suse.ses.version</name>
+ <value>6.0</value>
+ </label>
+ <label>
+ <name>com.suse.ses.url</name>
+
<value>https://www.suse.com/solutions/software-defined-storage/</value>
+ </label>
+ <label>
+ <name>com.suse.ceph.version</name>
+ <value>%PKG_VERSION%</value>
+ </label>
+ <label>
+ <name>com.suse.ceph.url</name>
+ <value>https://ceph.com/</value>
+ </label>
+ <label>
+ <name>com.suse.rook.created</name>
+ <value>%BUILDTIME%</value>
+ </label>
</labels>
<packages_image>
<package>
++++++ tumbleweed.xml ++++++
--- /var/tmp/diff_new_pack.vnvN1g/_old 2019-11-06 13:56:30.040182112 +0100
+++ /var/tmp/diff_new_pack.vnvN1g/_new 2019-11-06 13:56:30.040182112 +0100
@@ -4,8 +4,8 @@
<name>opensuse/ceph/ceph</name>
<prefix>org.opensuse.ceph</prefix>
<title>Ceph container image</title>
- <url>registry.opensuse.org/opensuse/ceph/ceph:%PKG_VERSION%</url>
- <reference>opensuse/ceph/ceph:%PKG_VERSION%</reference>
+
<url>https://registry.opensuse.org/opensuse/ceph/ceph:%PKG_VERSION%.%RELEASE%</url>
+
<reference>registry.opensuse.org/opensuse/ceph/ceph:%PKG_VERSION%.%RELEASE%</reference>
<packages_image>
<package>
<name>patterns-ceph-containers-ceph_base</name>
