Hello community,
here is the log from the commit of package rook-ceph-image for openSUSE:Factory
checked in at 2019-11-06 13:56:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rook-ceph-image (Old)
and /work/SRC/openSUSE:Factory/.rook-ceph-image.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rook-ceph-image"
Wed Nov 6 13:56:30 2019 rev:5 rq:745142 version:1.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/rook-ceph-image/rook-ceph-image.changes
2019-08-23 11:07:10.810478481 +0200
+++
/work/SRC/openSUSE:Factory/.rook-ceph-image.new.2990/rook-ceph-image.changes
2019-11-06 13:56:33.088185417 +0100
@@ -1,0 +2,7 @@
+Tue Oct 29 09:53:09 UTC 2019 - Kristoffer Gronlund <kgronl...@suse.com>
+
+- Update container history (SES-922)
+ * Add pre-checkin.sh
+- Add release number to label versions
+
+-------------------------------------------------------------------
New:
----
pre-checkin.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rook-ceph-image.kiwi ++++++
--- /var/tmp/diff_new_pack.6Pr1xf/_old 2019-11-06 13:56:33.912186310 +0100
+++ /var/tmp/diff_new_pack.6Pr1xf/_new 2019-11-06 13:56:33.912186310 +0100
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- OBS-ExclusiveArch: aarch64 x86_64 -->
-<!--
- This file is generated,
- don't manually modify this file,
- please check README
+<!--
+ This file is generated,
+ don't manually modify this file,
+ please check README
-->
<image xmlns:suse_label_helper="com.suse.label_helper" schemaversion="6.9"
name="rook-ceph-image">
<description type="system">
@@ -13,7 +13,7 @@
</description>
<preferences>
<type image="docker" derived_from="obsrepositories:/opensuse/tumbleweed">
- <containerconfig tag="latest"
additionaltags="%PKG_VERSION%.%PKG_COMMIT_NUM%.%RELEASE%,%PKG_VERSION%.%PKG_COMMIT_NUM%"
maintainer="SUSE Storage Team <jfajer...@suse.com>"
name="opensuse/rook/ceph">
+ <containerconfig tag="latest"
additionaltags="%PKG_VERSION%,%PKG_VERSION%.%PKG_COMMIT_NUM%,%PKG_VERSION%.%PKG_COMMIT_NUM%.%RELEASE%"
maintainer="SUSE Storage Team <jfajer...@suse.com>"
name="opensuse/rook/ceph">
<entrypoint execute="/tini">
<argument name="--"/>
<argument name="/usr/bin/rook"/>
@@ -22,15 +22,15 @@
<suse_label_helper:add_prefix prefix="org.opensuse.rook-ceph">
<label name="org.opencontainers.image.title" value="Rook container
for Ceph"/>
<label name="org.opencontainers.image.description" value="Rook
container for Ceph"/>
- <label name="org.opencontainers.image.version"
value="%PKG_VERSION%.%PKG_COMMIT_NUM%"/>
+ <label name="org.opencontainers.image.version"
value="%PKG_VERSION%.%PKG_COMMIT_NUM%.%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/rook/ceph:%PKG_VERSION%.%PKG_COMMIT_NUM%"/>
+ <label name="org.opencontainers.image.url"
value="https://registry.opensuse.org/opensuse/rook/ceph:%PKG_VERSION%.%PKG_COMMIT_NUM%.%RELEASE%"/>
<label name="org.openbuildservice.disturl" value="%DISTURL%"/>
- <label name="org.opensuse.reference"
value="opensuse/rook/ceph:%PKG_VERSION%.%PKG_COMMIT_NUM%"/>
+ <label name="org.opensuse.reference"
value="registry.opensuse.org/opensuse/rook/ceph:%PKG_VERSION%.%PKG_COMMIT_NUM%.%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>">Update container history (SES-922)</history>
</containerconfig>
</type>
<version>1.0.0</version>
++++++ README ++++++
--- /var/tmp/diff_new_pack.6Pr1xf/_old 2019-11-06 13:56:33.948186349 +0100
+++ /var/tmp/diff_new_pack.6Pr1xf/_new 2019-11-06 13:56:33.952186353 +0100
@@ -1,5 +1,13 @@
-# HOWTO generate kiwi file for different platfoms
+# Generating the KIWI file
+
+The `.kiwi` file is generated from the `rook-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 rook-ceph-image.xsl tumbleweed.xml > rook-ceph-image.kiwi
-* xsltproc rook-ceph-image.xsl leap15_1.xml > rook-ceph-image.kiwi
-* xsltproc rook-ceph-image.xsl ses6.xml > rook-ceph-image.kiwi
++++++ _service ++++++
--- /var/tmp/diff_new_pack.6Pr1xf/_old 2019-11-06 13:56:33.992186397 +0100
+++ /var/tmp/diff_new_pack.6Pr1xf/_new 2019-11-06 13:56:33.992186397 +0100
@@ -14,4 +14,3 @@
<param name="package">rook</param>
</service>
</services>
-
++++++ leap15_1.xml ++++++
--- /var/tmp/diff_new_pack.6Pr1xf/_old 2019-11-06 13:56:34.048186458 +0100
+++ /var/tmp/diff_new_pack.6Pr1xf/_new 2019-11-06 13:56:34.048186458 +0100
@@ -4,8 +4,8 @@
<name>rook/ceph</name>
<prefix>org.opensuse.rook-ceph</prefix>
<title>Rook container for Ceph</title>
- <url>registry.opensuse.org/rook/ceph:%PKG_VERSION%.%PKG_COMMIT_NUM%</url>
- <reference>rook/ceph:%PKG_VERSION%.%PKG_COMMIT_NUM%</reference>
+
<url>https://registry.opensuse.org/rook/ceph:%PKG_VERSION%.%PKG_COMMIT_NUM%.%RELEASE%</url>
+
<reference>registry.opensuse.org/rook/ceph:%PKG_VERSION%.%PKG_COMMIT_NUM%.%RELEASE%</reference>
<packages_image>
<package>
<name>openSUSE-build-key</name>
@@ -19,4 +19,4 @@
<name>openSUSE-release-ftp</name>
</package>
</packages_boot>
-</param>
\ No newline at end of file
+</param>
++++++ pre-checkin.sh ++++++
#!/bin/bash
#
# Generate the kiwi file for the given target.
image="rook-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"
++++++ rook-ceph-image.xsl ++++++
--- /var/tmp/diff_new_pack.6Pr1xf/_old 2019-11-06 13:56:34.104186518 +0100
+++ /var/tmp/diff_new_pack.6Pr1xf/_new 2019-11-06 13:56:34.104186518 +0100
@@ -1,12 +1,13 @@
<?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,
- don't manually modify this file,
- please check README
+<xsl:comment>
+ This file is generated,
+ don't manually modify this file,
+ please check README
</xsl:comment>
<image schemaversion="6.9" name="rook-ceph-image"
xmlns:suse_label_helper="com.suse.label_helper">
@@ -23,7 +24,7 @@
</xsl:attribute>
<containerconfig
tag="latest"
-
additionaltags="%PKG_VERSION%.%PKG_COMMIT_NUM%.%RELEASE%,%PKG_VERSION%.%PKG_COMMIT_NUM%"
+
additionaltags="%PKG_VERSION%,%PKG_VERSION%.%PKG_COMMIT_NUM%,%PKG_VERSION%.%PKG_COMMIT_NUM%.%RELEASE%"
maintainer="SUSE Storage Team <jfajer...@suse.com>">
<xsl:attribute name="name">
<xsl:value-of select="param/name" />
@@ -48,7 +49,7 @@
</label>
<label name="org.opencontainers.image.description" value="Rook
container for Ceph"/>
- <label name="org.opencontainers.image.version"
value="%PKG_VERSION%.%PKG_COMMIT_NUM%"/>
+ <label name="org.opencontainers.image.version"
value="%PKG_VERSION%.%PKG_COMMIT_NUM%.%RELEASE%"/>
<label name="org.opencontainers.image.created"
value="%BUILDTIME%"/>
<label name="org.opencontainers.image.vendor" value="SUSE LLC"/>
@@ -56,7 +57,7 @@
<xsl:attribute name="value">
<xsl:value-of select="param/url" />
</xsl:attribute>
- </label>
+ </label>
<label name="org.openbuildservice.disturl" value="%DISTURL%"/>
@@ -64,8 +65,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">
@@ -81,7 +82,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>
@@ -134,4 +135,4 @@
</xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>
++++++ ses6.xml ++++++
--- /var/tmp/diff_new_pack.6Pr1xf/_old 2019-11-06 13:56:34.136186553 +0100
+++ /var/tmp/diff_new_pack.6Pr1xf/_new 2019-11-06 13:56:34.136186553 +0100
@@ -4,28 +4,28 @@
<name>ses/6/rook/ceph</name>
<prefix>com.suse.ses</prefix>
<title>SUSE Enterprise Storage 6.0</title>
-
<url>https://registry.suse.com/ses/6/rook/ceph:%PKG_VERSION%.%PKG_COMMIT_NUM%</url>
- <reference>ses/6/rook/ceph:%PKG_VERSION%.%PKG_COMMIT_NUM%</reference>
+
<url>https://registry.suse.com/ses/6/rook/ceph:%PKG_VERSION%.%PKG_COMMIT_NUM%.%RELEASE%</url>
+
<reference>registry.suse.com/ses/6/rook/ceph:%PKG_VERSION%.%PKG_COMMIT_NUM%.%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.rook.version</name>
- <value>%PKG_VERSION%</value>
- </label>
- <label>
- <name>com.suse.rook.url</name>
- <value>https://rook.io/</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.rook.version</name>
+ <value>%PKG_VERSION%</value>
+ </label>
+ <label>
+ <name>com.suse.rook.url</name>
+ <value>https://rook.io/</value>
+ </label>
+ <label>
+ <name>com.suse.rook.created</name>
+ <value>%BUILDTIME%</value>
+ </label>
</labels>
</param>
++++++ tumbleweed.xml ++++++
--- /var/tmp/diff_new_pack.6Pr1xf/_old 2019-11-06 13:56:34.196186618 +0100
+++ /var/tmp/diff_new_pack.6Pr1xf/_new 2019-11-06 13:56:34.212186635 +0100
@@ -4,8 +4,8 @@
<name>opensuse/rook/ceph</name>
<prefix>org.opensuse.rook-ceph</prefix>
<title>Rook container for Ceph</title>
-
<url>registry.opensuse.org/opensuse/rook/ceph:%PKG_VERSION%.%PKG_COMMIT_NUM%</url>
- <reference>opensuse/rook/ceph:%PKG_VERSION%.%PKG_COMMIT_NUM%</reference>
+
<url>https://registry.opensuse.org/opensuse/rook/ceph:%PKG_VERSION%.%PKG_COMMIT_NUM%.%RELEASE%</url>
+
<reference>registry.opensuse.org/opensuse/rook/ceph:%PKG_VERSION%.%PKG_COMMIT_NUM%.%RELEASE%</reference>
<packages_image>
<package>
<name>openSUSE-build-key</name>
