Hello community,
here is the log from the commit of package kubic-cilium-image for
openSUSE:Factory checked in at 2019-07-23 22:40:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kubic-cilium-image (Old)
and /work/SRC/openSUSE:Factory/.kubic-cilium-image.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kubic-cilium-image"
Tue Jul 23 22:40:32 2019 rev:2 rq:717883 version:4.0.0
Changes:
--------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kubic-cilium-image.kiwi ++++++
--- /var/tmp/diff_new_pack.TumPpu/_old 2019-07-23 22:40:35.926931491 +0200
+++ /var/tmp/diff_new_pack.TumPpu/_new 2019-07-23 22:40:35.926931491 +0200
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<!-- OBS-ExclusiveArch: aarch64 x86_64 -->
<!--
This is an autogenerated file from cilium-image.kiwi.ini template.
Do not manually modify this file.
@@ -15,16 +16,18 @@
derived_from="obsrepositories:/opensuse/tumbleweed#latest">
<containerconfig
name="kubic/cilium"
- tag="%%SHORT_VERSION%%"
+ tag="latest"
maintainer="SUSE Containers Team <[email protected]>"
- additionaltags="%%LONG_VERSION%%">
+ additionaltags="%%LONG_VERSION%%,%%LONG_VERSION%%-%RELEASE%">
<entrypoint execute="/usr/bin/cilium-agent"/>
<labels>
- <suse_label_helper:add_prefix prefix="org.opensuse.cilium">
+ <suse_label_helper:add_prefix prefix="org.opensuse.kubic.cilium">
<label name="org.opencontainers.image.title" value="Cilium
Container"/>
<label name="org.opencontainers.image.description" value="Image
containing Cilium - software for providing and securing network connectivity
and load balancing between containers"/>
<label name="org.opencontainers.image.version"
value="%%LONG_VERSION%%"/>
<label name="org.opencontainers.image.created"
value="%BUILDTIME%"/>
+ <label name="org.opensuse.reference"
value="registry.opensuse.org/kubic/cilium:%%LONG_VERSION%%"/>
+ <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
</suse_label_helper:add_prefix>
</labels>
<history author="Michal Rostecki
<[email protected]>">Cilium Container</history>
++++++ cilium-image.kiwi.ini ++++++
--- /var/tmp/diff_new_pack.TumPpu/_old 2019-07-23 22:40:35.982931480 +0200
+++ /var/tmp/diff_new_pack.TumPpu/_new 2019-07-23 22:40:35.982931480 +0200
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<!-- OBS-ExclusiveArch: aarch64 x86_64 -->
<image schemaversion="6.5" name="_PRODUCT_-cilium-image"
xmlns:suse_label_helper="com.suse.label_helper">
<description type="system">
@@ -12,16 +13,18 @@
derived_from="obsrepositories:/_BASEIMAGE_">
<containerconfig
name="_NAMESPACE_/cilium"
- tag="%%SHORT_VERSION%%"
+ tag="latest"
maintainer="SUSE Containers Team <[email protected]>"
- additionaltags="%%LONG_VERSION%%">
+ additionaltags="%%LONG_VERSION%%,%%LONG_VERSION%%-%RELEASE%">
<entrypoint execute="/usr/bin/cilium-agent"/>
<labels>
- <suse_label_helper:add_prefix prefix="org.opensuse.cilium">
+ <suse_label_helper:add_prefix prefix="_LABEL_PREFIX_.cilium">
<label name="org.opencontainers.image.title" value="Cilium
Container"/>
<label name="org.opencontainers.image.description" value="Image
containing Cilium - software for providing and securing network connectivity
and load balancing between containers"/>
<label name="org.opencontainers.image.version"
value="%%LONG_VERSION%%"/>
<label name="org.opencontainers.image.created"
value="%BUILDTIME%"/>
+ <label name="org.opensuse.reference"
value="registry.opensuse.org/kubic/cilium:%%LONG_VERSION%%"/>
+ <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
</suse_label_helper:add_prefix>
</labels>
<history author="Michal Rostecki
<[email protected]>">Cilium Container</history>
@@ -50,5 +53,4 @@
-->
<package name="libboringssl0"/>
</packages>
-_EXTRA_BOOTSTRAP_PACKAGES_
</image>
++++++ pre_checkin.sh ++++++
--- /var/tmp/diff_new_pack.TumPpu/_old 2019-07-23 22:40:36.018931466 +0200
+++ /var/tmp/diff_new_pack.TumPpu/_new 2019-07-23 22:40:36.018931466 +0200
@@ -48,10 +48,12 @@
product='kubic'
baseimage="opensuse/tumbleweed#latest"
distro="openSUSE Kubic"
+ label_prefix="org.opensuse.kubic"
elif [[ "${namespace}" =~ ^caasp/.* ]]; then
product='caasp'
- baseimage="suse/sle15#latest"
- distro="SLES15"
+ baseimage="suse/sle15#15.1"
+ distro="SLES15 SP1"
+ label_prefix="com.suse.caasp"
else
usage
abort "Unknown product. Product needs to match 'kubic|caasp/.*'"
@@ -92,6 +94,7 @@
-e "s@_DISTRO_@${distro}@g" \
-e "s@_NAMESPACE_@${namespace}@g" \
-e "s@_PRODUCT_@${product}@g" \
+ -e "s@_LABEL_PREFIX_@${label_prefix}@g" \
-e "/^<image/i\<!--\n\tThis is an autogenerated \
file from ${file} template.\n\tDo not manually modify \
this file.\n-->\n" \
