Accepting request 889492 from home:vulyanov:branches:Virtualization

- Include release number into docker tag
- Add kubevirt_containers_meta build service

OBS-URL: https://build.opensuse.org/request/show/889492
OBS-URL: https://build.opensuse.org/package/show/Virtualization/kubevirt?expand=0&rev=47

kubevirt.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 29 11:23:54 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>
+
+- Include release number into docker tag
+- Add kubevirt_containers_meta build service
+
 -------------------------------------------------------------------
 Thu Apr 29 05:17:03 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>
 

kubevirt.spec

@@ -25,6 +25,8 @@ Group:          System/Packages
 URL:            https://github.com/kubevirt/kubevirt
 Source0:        %{name}-%{version}.tar.gz
 Source1:        kubevirt-psp-caasp.yaml
+Source2:        kubevirt_containers_meta
+Source3:        kubevirt_containers_meta.service
 Source100:      %{name}-rpmlintrc
 Patch0:         dont-build-virtctl-darwin.patch
 Patch1:         dont-use-bazel-in-build-manifests.patch
@@ -106,6 +108,14 @@ Group:          System/Packages
 %description    tests
 The package provides Kubevirt end-to-end tests.
 
+%package -n     obs-service-kubevirt_containers_meta
+Summary:        Kubevirt containers meta information (build service)
+Group:          System/Packages
+
+%description -n obs-service-kubevirt_containers_meta
+The package provides meta information that is used during the build of
+the Kubevirt container images.
+
 %prep
 %autosetup -p1
 
@@ -168,7 +178,7 @@ build_tests="true" \
 	cmd/virt-operator \
 	%{nil}
 
-env DOCKER_PREFIX=$reg_path DOCKER_TAG=%{version} ./hack/build-manifests.sh --skipj2
+env DOCKER_PREFIX=$reg_path DOCKER_TAG=%{version}-%{release} ./hack/build-manifests.sh --skipj2
 
 %install
 mkdir -p %{buildroot}%{_bindir}
@@ -196,6 +206,11 @@ cp -r _out/manifests %{buildroot}%{_datadir}/kube-virt/
 install -m 644 %{S:1} %{buildroot}/%{_datadir}/kube-virt/manifests/release/
 install -m 0644 tests/default-config.json %{buildroot}%{_datadir}/kube-virt
 
+# Install kubevirt_containers_meta build service
+mkdir -p %{buildroot}%{_prefix}/lib/obs/service
+install -m 0755 %{S:2} %{buildroot}%{_prefix}/lib/obs/service
+install -m 0644 %{S:3} %{buildroot}%{_prefix}/lib/obs/service
+
 %files virtctl
 %license LICENSE
 %doc README.md
@@ -246,4 +261,10 @@ install -m 0644 tests/default-config.json %{buildroot}%{_datadir}/kube-virt
 %{_bindir}/virt-tests
 %{_datadir}/kube-virt/default-config.json
 
+%files -n obs-service-kubevirt_containers_meta
+%license LICENSE
+%doc README.md
+%dir %{_prefix}/lib/obs
+%{_prefix}/lib/obs/service
+
 %changelog

kubevirt_containers_meta

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+distro=$(rpm --eval '%{?sle_version}:%{?is_opensuse}%{!?is_opensuse:0}')
+case "${distro}" in
+150200:0)
+    TAGPREFIX=suse/sles/15.2
+    LABELPREFIX=com.suse.kubevirt
+    ;;
+150300:0)
+    TAGPREFIX=suse/sles/15.3
+    LABELPREFIX=com.suse.kubevirt
+    ;;
+*)
+    TAGPREFIX=kubevirt
+    LABELPREFIX=org.opensuse.kubevirt
+    ;;
+esac
+
+if [ -n "${pkg}" ]; then
+    if rpm -q ${pkg}; then
+        PKG_VERSION=$(rpm -q --queryformat=%{version} ${pkg})
+        PKG_RELEASE=$(rpm -q --queryformat=%{release} ${pkg})
+    else
+        _pkg=$(find ./repos -name "${pkg}*.rpm")
+        PKG_VERSION=$(rpm -qp --queryformat=%{version} ${_pkg})
+        PKG_RELEASE=$(rpm -qp --queryformat=%{release} ${_pkg})
+    fi
+fi

kubevirt_containers_meta.service

@@ -0,0 +1,5 @@
+<service name="kubevirt_containers_meta">
+    <summary>Containers meta information for Kubevirt (build service)</summary>
+    <description>Provides meta information that is used during the build of
+the Kubevirt container images.</description>
+</service>