Hello community, here is the log from the commit of package ceph-csi-image for openSUSE:Factory checked in at 2019-11-06 13:56:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ceph-csi-image (Old) and /work/SRC/openSUSE:Factory/.ceph-csi-image.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ceph-csi-image" Wed Nov 6 13:56:33 2019 rev:4 rq:745143 version:1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ceph-csi-image/ceph-csi-image.changes 2019-08-23 11:07:02.598479816 +0200 +++ /work/SRC/openSUSE:Factory/.ceph-csi-image.new.2990/ceph-csi-image.changes 2019-11-06 13:56:36.088188669 +0100 @@ -1,0 +2,8 @@ +Sun Nov 3 14:44:54 UTC 2019 - Kristoffer Gronlund <[email protected]> + +- Generate container history (SES-922) + * Add pre-checkin.sh + +- Add release number to version labels + +------------------------------------------------------------------- New: ---- pre-checkin.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ceph-csi-image.kiwi ++++++ --- /var/tmp/diff_new_pack.uz422P/_old 2019-11-06 13:56:37.288189970 +0100 +++ /var/tmp/diff_new_pack.uz422P/_new 2019-11-06 13:56:37.288189970 +0100 @@ -13,21 +13,21 @@ </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 <[email protected]>" name="opensuse/cephcsi/cephcsi"> + <containerconfig tag="latest" additionaltags="%PKG_VERSION%,%PKG_VERSION%.%PKG_COMMIT_NUM%,%PKG_VERSION%.%PKG_COMMIT_NUM%.%RELEASE%" maintainer="SUSE Storage Team <[email protected]>" name="opensuse/cephcsi/cephcsi"> <entrypoint execute="/usr/bin/cephcsi"/> <labels> <suse_label_helper:add_prefix prefix="org.opensuse.cephcsi"> <label name="org.opencontainers.image.title" value="Ceph CSI driver container"/> <label name="org.opencontainers.image.description" value="Ceph CSI driver"/> - <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/cephcsi/cephcsi:%PKG_VERSION%.%PKG_COMMIT_NUM%"/> + <label name="org.opencontainers.image.url" value="https://registry.opensuse.org/opensuse/cephcsi/cephcsi:%PKG_VERSION%.%PKG_COMMIT_NUM%.%RELEASE%"/> <label name="org.openbuildservice.disturl" value="%DISTURL%"/> - <label name="org.opensuse.reference" value="opensuse/cephcsi/cephcsi:%PKG_VERSION%.%PKG_COMMIT_NUM%"/> + <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/cephcsi/cephcsi:%PKG_VERSION%.%PKG_COMMIT_NUM%.%RELEASE%"/> </suse_label_helper:add_prefix> </labels> - <history author="Denis Kondratenko <[email protected]>">New Ceph CSI image</history> + <history author="Denis Kondratenko <[email protected]>">Generate container history (SES-922)</history> </containerconfig> </type> <version>1.0.0</version> ++++++ README ++++++ --- /var/tmp/diff_new_pack.uz422P/_old 2019-11-06 13:56:37.364190052 +0100 +++ /var/tmp/diff_new_pack.uz422P/_new 2019-11-06 13:56:37.364190052 +0100 @@ -1,5 +1,13 @@ -# HOWTO generate kiwi file for different platfoms +# Generating the KIWI file + +The `.kiwi` file is generated from the `ceph-csi-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-csi-image.xsl tumbleweed.xml > ceph-csi-image.kiwi -* xsltproc ceph-csi-image.xsl leap15_1.xml > ceph-csi-image.kiwi -* xsltproc ceph-csi-image.xsl ses6.xml > ceph-csi-image.kiwi ++++++ ceph-csi-image.xsl ++++++ --- /var/tmp/diff_new_pack.uz422P/_old 2019-11-06 13:56:37.448190143 +0100 +++ /var/tmp/diff_new_pack.uz422P/_new 2019-11-06 13:56:37.456190152 +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, @@ -26,7 +27,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 <[email protected]>"> <xsl:attribute name="name"> <xsl:value-of select="param/name" /> @@ -48,7 +49,7 @@ </label> <label name="org.opencontainers.image.description" value="Ceph CSI driver"/> - <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 <[email protected]>">New Ceph CSI image</history> + <history author="Denis Kondratenko <[email protected]>"><xsl:value-of select="$history"/></history> </containerconfig> </type> <version>1.0.0</version> @@ -127,4 +128,4 @@ </xsl:template> -</xsl:stylesheet> +</xsl:stylesheet> ++++++ leap15_1.xml ++++++ --- /var/tmp/diff_new_pack.uz422P/_old 2019-11-06 13:56:37.548190252 +0100 +++ /var/tmp/diff_new_pack.uz422P/_new 2019-11-06 13:56:37.552190256 +0100 @@ -4,8 +4,8 @@ <name>cephcsi/cephcsi</name> <prefix>org.opensuse.cephcsi</prefix> <title>Ceph CSI driver container</title> - <url>registry.opensuse.org/cephcsi/cephcsi:%PKG_VERSION%.%PKG_COMMIT_NUM%</url> - <reference>cephcsi/cephcsi:%PKG_VERSION%.%PKG_COMMIT_NUM%</reference> + <url>https://registry.opensuse.org/cephcsi/cephcsi:%PKG_VERSION%.%PKG_COMMIT_NUM%.%RELEASE%</url> + <reference>registry.opensuse.org/cephcsi/cephcsi:%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="ceph-csi-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.uz422P/_old 2019-11-06 13:56:37.612190321 +0100 +++ /var/tmp/diff_new_pack.uz422P/_new 2019-11-06 13:56:37.612190321 +0100 @@ -4,28 +4,28 @@ <name>ses/6/cephcsi/cephcsi</name> <prefix>com.suse.ses</prefix> <title>SUSE Enterprise Storage 6.0</title> - <url>https://registry.suse.com/ses/6/cephcsi/cephcsi:%PKG_VERSION%.%PKG_COMMIT_NUM%</url> - <reference>ses/6/cephcsi/cephcsi:%PKG_VERSION%.%PKG_COMMIT_NUM%</reference> + <url>https://registry.suse.com/ses/6/cephcsi/cephcsi:%PKG_VERSION%.%PKG_COMMIT_NUM%.%RELEASE%</url> + <reference>registry.suse.com/ses/6/cephcsi/cephcsi:%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.cephcsi.version</name> - <value>%PKG_VERSION%</value> - </label> - <label> - <name>com.suse.cephcsi.url</name> - <value>https://github.com/ceph/ceph-csi</value> - </label> - <label> - <name>com.suse.cephcsi.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.cephcsi.version</name> + <value>%PKG_VERSION%</value> + </label> + <label> + <name>com.suse.cephcsi.url</name> + <value>https://github.com/ceph/ceph-csi</value> + </label> + <label> + <name>com.suse.cephcsi.created</name> + <value>%BUILDTIME%</value> + </label> </labels> </param> ++++++ tumbleweed.xml ++++++ --- /var/tmp/diff_new_pack.uz422P/_old 2019-11-06 13:56:37.648190360 +0100 +++ /var/tmp/diff_new_pack.uz422P/_new 2019-11-06 13:56:37.648190360 +0100 @@ -4,8 +4,8 @@ <name>opensuse/cephcsi/cephcsi</name> <prefix>org.opensuse.cephcsi</prefix> <title>Ceph CSI driver container</title> - <url>registry.opensuse.org/opensuse/cephcsi/cephcsi:%PKG_VERSION%.%PKG_COMMIT_NUM%</url> - <reference>opensuse/cephcsi/cephcsi:%PKG_VERSION%.%PKG_COMMIT_NUM%</reference> + <url>https://registry.opensuse.org/opensuse/cephcsi/cephcsi:%PKG_VERSION%.%PKG_COMMIT_NUM%.%RELEASE%</url> + <reference>registry.opensuse.org/opensuse/cephcsi/cephcsi:%PKG_VERSION%.%PKG_COMMIT_NUM%.%RELEASE%</reference> <packages_image> <package> <name>openSUSE-build-key</name>
