Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package containerized-data-importer for
openSUSE:Factory checked in at 2022-12-01 19:20:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/containerized-data-importer (Old)
and /work/SRC/openSUSE:Factory/.containerized-data-importer.new.1835 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "containerized-data-importer"
Thu Dec 1 19:20:13 2022 rev:31 rq:1039306 version:1.55.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/containerized-data-importer/containerized-data-importer.changes
2022-10-16 16:09:28.722791694 +0200
+++
/work/SRC/openSUSE:Factory/.containerized-data-importer.new.1835/containerized-data-importer.changes
2022-12-01 19:20:13.474057235 +0100
@@ -1,0 +2,8 @@
+Thu Dec 1 09:58:30 UTC 2022 - Vasily Ulyanov <[email protected]>
+
+- Ensure RPMs and containers are built against the same distro
+- Be more strict when discovering the registry path: error out if the
+ distro is unknown, instead of falling through to 'opensuse' by
+ default
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ containerized-data-importer.spec ++++++
--- /var/tmp/diff_new_pack.DnHnOn/_old 2022-12-01 19:20:16.086071722 +0100
+++ /var/tmp/diff_new_pack.DnHnOn/_new 2022-12-01 19:20:16.094071766 +0100
@@ -156,11 +156,15 @@
labelprefix=com.suse.kubevirt
registry=registry.suse.com
;;
-*)
+*:1)
tagprefix=kubevirt
labelprefix=org.opensuse.kubevirt
registry=registry.opensuse.org
;;
+*)
+ echo "Unsupported distro: ${distro}" >&2
+ exit 1
+ ;;
esac
%if "%{?kubevirt_registry_path}" == ""
@@ -175,6 +179,7 @@
-e "s#_REGISTRY_#${registry}#g" \
-e "s#_PKG_VERSION_#%{version}#g" \
-e "s#_PKG_RELEASE_#%{release}#g" \
+ -e "s#_DISTRO_#${distro}#g" \
%{S:1}
export GOPATH=%{_builddir}/go
++++++ cdi_containers_meta ++++++
--- /var/tmp/diff_new_pack.DnHnOn/_old 2022-12-01 19:20:16.150072077 +0100
+++ /var/tmp/diff_new_pack.DnHnOn/_new 2022-12-01 19:20:16.154072099 +0100
@@ -1,10 +1,16 @@
-#!/bin/bash
+#!/bin/bash -xe
TAGPREFIX=_TAGPREFIX_
LABELPREFIX=_LABELPREFIX_
REGISTRY=_REGISTRY_
PKG_VERSION=_PKG_VERSION_
PKG_RELEASE=_PKG_RELEASE_
+DISTRO=_DISTRO_
+
+# Set HOME=/root as a workaround for
+# https://github.com/openSUSE/obs-build/issues/901
+_distro=$(HOME=/root rpm --eval
'%{?sle_version}:%{?is_opensuse}%{!?is_opensuse:0}')
+[ "${DISTRO}" == "${_distro}" ] || exit 1
if [ -n "${pkg}" ]; then
if rpm -q ${pkg}; then
