Hello community, here is the log from the commit of package kubic-cilium-init-image for openSUSE:Factory checked in at 2019-04-19 18:38:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kubic-cilium-init-image (Old) and /work/SRC/openSUSE:Factory/.kubic-cilium-init-image.new.5536 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kubic-cilium-init-image" Fri Apr 19 18:38:34 2019 rev:1 rq:695541 version:4.0.0 Changes: -------- New Changes file: --- /dev/null 2019-04-04 01:10:41.205915624 +0200 +++ /work/SRC/openSUSE:Factory/.kubic-cilium-init-image.new.5536/kubic-cilium-init-image.changes 2019-04-19 18:38:35.379200455 +0200 @@ -0,0 +1,140 @@ +------------------------------------------------------------------- +Thu Apr 18 10:18:38 UTC 2019 - Michal Rostecki <mroste...@opensuse.org> + +- Commit 9b6c268 by Michal Rostecki mroste...@opensuse.org + + cilium: Add missing labels + + This change adds the following labels which were missing: + + * org.opensuse.reference + * org.openbuildservice.disturl + + Signed-off-by: Michal Rostecki <mroste...@opensuse.org> + +------------------------------------------------------------------- +Tue Apr 16 13:43:24 UTC 2019 - Michal Rostecki <mroste...@suse.com> + +- Commit 2d8be36 by Michal Rostecki mroste...@opensuse.org + + cilium: Add cilium-init image + + cilium-init is a script for initial pre-deployment operations which is + supposed to be used for init container for Cilium. + + Signed-off-by: Michal Rostecki <mroste...@opensuse.org> + +- Commit 36b9a72 by Michal Rostecki mroste...@opensuse.org + + pre_checkin: Specify the concrete version of SLES + + SLES image with the `latest` tag doesn't seem to exist anymore, so let's + specify the 15 SP1 version. + +- Commit 72c9478 by Michal Rostecki mroste...@opensuse.org + + pre_checkin: Allow to define extra bootstrap packages + + This change allows to define packages section of type bootstrap per product + (kubic, caasp) by creating a file named + `${product}-extra-bootstrap-packages` (i.e. `kubic-extra-packages` or + `caasp-extra-packages`). Kiwi template, in order to support that + functionality, has to contain `_EXTRA_BOOTSTRAP_PACKAGES_` marker. + + The motivation behind it is the fact that some openSUSE packages require + providers of product_flavor(openSUSE). The common solution for that is to + install i.e. openSUSE-release-ftp as a bootstrap package. However, that + problem and solution are valid only in openSUSE, not in SLE. + +- Commit 7b9e3cc by David Cassany dcass...@suse.de + + Update Tumbleweed base image reference + + Tag of the latest build of Tumbleweed changed from `current` to + `latest`. + +- Commit 6649435 by David Cassany dcass...@suse.de + + Do not fail if no new change log entries are found + + This commit makes pre_checkin.sh script to exit 0 if no new changelog + entries are found (when using --mkchanges flag). This way the CI does not + report a failre when it is executed having nothing new to commit at OBS. + +- Commit 3dbfb55 by David Cassany dcass...@suse.de + + Distinguish between namespace and product + + For caasp we started using namespaces like 'caasp/head' or 'caasp/vX'. The + slash is not an accepted character for 'name' attribute of <image> section. + The image name ends up to the filename, thus adding slashes is prohibited + there. + +- Commit 2278d29 by David Cassany dcass...@suse.de + + Updating the SLE15 base image tag + + Current SLE15 image is published under 'latest' tag. + +- Commit c9f588f by David Cassany dcass...@suse.de + + Adding custom caasp namespaces + + With this commit the caasp templates can be generated including a a caasp + suffix. For instance `./pre_checkin.sh caasp/v4` will generate the template + with image namespace of `caasp/v4`. + +- Commit 92c129f by David Cassany dcass...@suse.de + + Make pre_checkin.sh sript more usable + + With this commit pre_checkin.sh script does no create the changes file by + default, so it can easily be used to recreate the KIWI files while testing + and debugging without requiring to commit anything. Also it only recreates + the KIWI files for the given product (caasp|kubic), kubic is the default if + none is given. + +- Commit 8e6eac7 by Michal Rostecki mroste...@suse.de + + pre_checkin: Allow to define extra packages + + This change allows to define extra packages per product (kubic, caasp) by + creating a file named `${product}-extra-packages` (i.e. + `kubic-extra-packages` or `caasp-extra-packages`). Kiwi template, in order + to support extra packages, has to contain + `_EXTRA_PACKAGES_` marker. + + Signed-off-by: Michal Rostecki <mroste...@suse.de> + +- Commit edee831 by David Cassany dcass...@suse.de + + Update pre_checkin.sh script + + Now pre_checkin.sh script will ingore description generation for those + products missing changes file or new changelog entries. + +- Commit 995176f by David Cassany dcass...@suse.de + + Update pre_checkin.sh script + + - Update caasp and kubic changes files + - The same changes format as for other kubic packages + - Exit on error: `set -e` + +- Commit 488929e by David Cassany dcass...@suse.de + + Generate *.changes file from git log in pre_checkin.sh script + + With this commit a *.changes file is generated using the git-log tool + formatted with the same template open build service tracks changes. + +- Commit 6d32f79 by David Cassany dcass...@suse.com + + Use correct image name and tag for SLE15 base image + + With this commit the base image is set to suse/sle15:current for caasp + images, in line with SUSE:SLE-15:GA/sles15-image and bsc#1083671 + +- Commit 95ca14f by David Cassany dcass...@suse.com + + Fix pre_checkin.sh typo New: ---- _service cilium-init-image.kiwi.ini kubic-cilium-init-image.changes kubic-cilium-init-image.kiwi pre_checkin.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kubic-cilium-init-image.kiwi ++++++ <?xml version="1.0" encoding="utf-8"?> <!-- This is an autogenerated file from cilium-init-image.kiwi.ini template. Do not manually modify this file. --> <image schemaversion="6.5" name="kubic-cilium-init-image" xmlns:suse_label_helper="com.suse.label_helper"> <description type="system"> <author>SUSE Containers Team</author> <contact>contain...@suse.com</contact> <specification>cilium-init running on an openSUSE Kubic container guest</specification> </description> <preferences> <type image="docker" derived_from="obsrepositories:/opensuse/tumbleweed#latest"> <containerconfig name="kubic/cilium-init" tag="%%SHORT_VERSION%%" maintainer="SUSE Containers Team <contain...@suse.com>" additionaltags="%%LONG_VERSION%%"> <entrypoint execute="/usr/bin/cilium-init"/> <labels> <suse_label_helper:add_prefix prefix="org.opensuse.cilium-init"> <label name="org.opencontainers.image.title" value="cilium-init Container"/> <label name="org.opencontainers.image.description" value="Image containing cilium-init - script for initial pre-deployment operations"/> <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-init:%%LONG_VERSION%%"/> <label name="org.openbuildservice.disturl" value="%DISTURL%"/> </suse_label_helper:add_prefix> </labels> <history author="Michal Rostecki <mroste...@opensuse.org>">cilium-init Container</history> </containerconfig> </type> <version>4.0.0</version> <packagemanager>zypper</packagemanager> <rpm-check-signatures>false</rpm-check-signatures> <rpm-force>true</rpm-force> <rpm-excludedocs>true</rpm-excludedocs> <locale>en_US</locale> <keytable>us.map.gz</keytable> <hwclock>utc</hwclock> </preferences> <repository> <source path="obsrepositories:/"/> </repository> <packages type="image"> <package name="cilium-init"/> </packages> </image> ++++++ _service ++++++ <services> <service mode="buildtime" name="kiwi_metainfo_helper"/> <service mode="buildtime" name="kiwi_label_helper"/> <service name="obs_scm" mode="disabled"> <param name="url">https://github.com/kubic-project/container-images.git</param> <param name="scm">git</param> <param name="subdir">cilium-init-image</param> <param name="extract">cilium-init-image.kiwi.ini</param> <param name="revision">master</param> <param name="versionformat">%cd</param> </service> <service name="obs_scm" mode="disabled"> <param name="url">https://github.com/kubic-project/container-images.git</param> <param name="scm">git</param> <param name="extract">pre_checkin.sh</param> <param name="revision">master</param> <param name="versionformat">%cd</param> </service> <service name="replace_using_package_version" mode="buildtime"> <param name="file">kubic-cilium-init-image.kiwi</param> <param name="regex">%%SHORT_VERSION%%</param> <param name="parse-version">minor</param> <param name="package">cilium-init</param> </service> <service name="replace_using_package_version" mode="buildtime"> <param name="file">kubic-cilium-init-image.kiwi</param> <param name="regex">%%LONG_VERSION%%</param> <param name="parse-version">patch</param> <param name="package">cilium-init</param> </service> </services> ++++++ cilium-init-image.kiwi.ini ++++++ <?xml version="1.0" encoding="utf-8"?> <image schemaversion="6.5" name="_PRODUCT_-cilium-init-image" xmlns:suse_label_helper="com.suse.label_helper"> <description type="system"> <author>SUSE Containers Team</author> <contact>contain...@suse.com</contact> <specification>cilium-init running on an _DISTRO_ container guest</specification> </description> <preferences> <type image="docker" derived_from="obsrepositories:/_BASEIMAGE_"> <containerconfig name="_NAMESPACE_/cilium-init" tag="%%SHORT_VERSION%%" maintainer="SUSE Containers Team <contain...@suse.com>" additionaltags="%%LONG_VERSION%%"> <entrypoint execute="/usr/bin/cilium-init"/> <labels> <suse_label_helper:add_prefix prefix="org.opensuse.cilium-init"> <label name="org.opencontainers.image.title" value="cilium-init Container"/> <label name="org.opencontainers.image.description" value="Image containing cilium-init - script for initial pre-deployment operations"/> <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-init:%%LONG_VERSION%%"/> <label name="org.openbuildservice.disturl" value="%DISTURL%"/> </suse_label_helper:add_prefix> </labels> <history author="Michal Rostecki <mroste...@opensuse.org>">cilium-init Container</history> </containerconfig> </type> <version>4.0.0</version> <packagemanager>zypper</packagemanager> <rpm-check-signatures>false</rpm-check-signatures> <rpm-force>true</rpm-force> <rpm-excludedocs>true</rpm-excludedocs> <locale>en_US</locale> <keytable>us.map.gz</keytable> <hwclock>utc</hwclock> </preferences> <repository> <source path="obsrepositories:/"/> </repository> <packages type="image"> <package name="cilium-init"/> </packages> </image> ++++++ pre_checkin.sh ++++++ #!/bin/bash ## pre_checkin.sh script is expected to be called from ## a local copy of the build service image after running ## the _services file, e.g. `osc service disabledrun` log() { echo ">>> $@" ; } abort() { log "FATAL: $@" ; exit 1 ; } endScript() { log "EXITING: $@" ; exit 0 ; } usage() { cat <<USAGE usage: ./pre_checkin.sh [kubic|caasp] ./pre_checkin.sh kubic|caasp [OPTIONS] options: --mkchanges Create/update the changes file (mostly used for automation) If no parameter is given defaults to 'kubic' USAGE } namespace=${1:-kubic} mkchanges=$2 [ -n "${mkchanges}" ] && [ "${mkchanges}" != "--mkchanges" ] && usage \ && abort "Bad option" make_changes_file() { local previous_commit local changes_log local git_log_format="- Commit %h by %an %ae %n%n%w(77,2,2)%B" if [ -f "${changes_file}" ]; then previous_commit="$(sed "4q;d" "${changes_file}" | cut -d' ' -f3).." fi # Update the changes file pushd container-images 1> /dev/null changes_log=$(git log --pretty=format:"${git_log_format}" \ ${previous_commit} -- pre_checkin.sh \ "${image}" | sed "1 s/- \(.*$\)/\1/") popd 1> /dev/null [ -z "${changes_log}" ] && endScript "Missing new changelog entries" osc vc ${changes_file} -m "${changes_log}" } if [ "${namespace}" == "kubic" ]; then product='kubic' baseimage="opensuse/tumbleweed#latest" distro="openSUSE Kubic" elif [[ "${namespace}" =~ ^caasp/.* ]]; then product='caasp' baseimage="suse/sle15#15.1" distro="SLES15 SP1" else usage abort "Unknown product. Product needs to match 'kubic|caasp/.*'" fi set -e for file in *kiwi.ini; do image="${file%%.kiwi.ini}" changes_file="${product}-${image}.changes" kiwi_file="${product}-${image}.kiwi" extra_packages="" extra_packages_file="${product}-extra-packages" extra_bootstrap_packages_file="${product}-extra-bootstrap-packages" # Create a list of extra packages if [ -f "${extra_packages_file}" ]; then while read -r package; do extra_packages+=" <package name=\"${package}\"\/>\n" done < "${extra_packages_file}" fi # Create a list of extra bootstrap packages if [ -f "${extra_bootstrap_packages_file}" ]; then extra_bootstrap_packages+=" <packages type=\"bootstrap\">\n" while read -r package; do extra_bootstrap_packages+=" <package name=\"${package}\"\/>\n" done < "${extra_bootstrap_packages_file}" extra_bootstrap_packages+=" </packages>" fi # update the changes file, mostly used for automation in Concourse CI [ -n "${mkchanges}" ] && make_changes_file # create *.kiwi file from *kiwi.ini template cp "${file}" "${kiwi_file}" sed -i -e "s@_BASEIMAGE_@${baseimage}@g" \ -e "s@_DISTRO_@${distro}@g" \ -e "s@_NAMESPACE_@${namespace}@g" \ -e "s@_PRODUCT_@${product}@g" \ -e "/^<image/i\<!--\n\tThis is an autogenerated \ file from ${file} template.\n\tDo not manually modify \ this file.\n-->\n" \ -e "s@_EXTRA_PACKAGES_@${extra_packages}@g" \ -e "s@_EXTRA_BOOTSTRAP_PACKAGES_@${extra_bootstrap_packages}@g" "${kiwi_file}" # Remove blank lines sed -i "/^ *$/d" "${kiwi_file}" log "${kiwi_file} has been created" done