Accepting request 905983 from Virtualization

OBS-URL: https://build.opensuse.org/request/show/905983
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kubevirt?expand=0&rev=26

0002-Don-t-use-Bazel-in-build-manifests.sh.patch

@@ -1,48 +0,0 @@
-From 1228a2f14f4f3aeab91a43f7a71a74ecf61fb8f9 Mon Sep 17 00:00:00 2001
-From: Vasiliy Ulyanov <vulyanov@suse.de>
-Date: Thu, 20 May 2021 10:48:30 +0200
-Subject: [PATCH 2/2] Don't use Bazel in build-manifests.sh
-
-This is a partial revert of the commit
-
-    e410cdd77968dae258e83ccc0171e855b8678063
-
-which switches to using Bazel during manifests build. That in turn
-does not work well during OBS build since Bazel tends to download
-dependencies from the web.
-
-Signed-off-by: Vasiliy Ulyanov <vulyanov@suse.de>
----
- hack/build-manifests.sh | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/hack/build-manifests.sh b/hack/build-manifests.sh
-index c93f19e3f..abfd6fa07 100755
---- a/hack/build-manifests.sh
-+++ b/hack/build-manifests.sh
-@@ -33,19 +33,16 @@ kubevirt_logo_path="assets/kubevirt_logo.png"
- rm -rf ${MANIFESTS_OUT_DIR}
- rm -rf ${MANIFEST_TEMPLATES_OUT_DIR}
- 
--rm -rf "${TESTS_OUT_DIR}/tools"
--mkdir -p "${TESTS_OUT_DIR}/tools"
--templator=${TESTS_OUT_DIR}/tools/manifest-templator
-+templator=${KUBEVIRT_DIR}/tools/manifest-templator/manifest-templator
- 
--bazel run \
--    --config=${HOST_ARCHITECTURE} \
--    //:build-manifest-templator -- ${templator}
-+(cd ${KUBEVIRT_DIR}/tools/manifest-templator/ && go_build)
- 
- # first process file includes only
- args=$(cd ${KUBEVIRT_DIR}/manifests && find . -type f -name "*.yaml.in" -not -path "./generated/*")
- for arg in $args; do
-     infile=${KUBEVIRT_DIR}/manifests/${arg}
-     outfile=${KUBEVIRT_DIR}/manifests/${arg}.tmp
-+
-     ${templator} \
-         --process-files \
-         --generated-manifests-dir=${KUBEVIRT_DIR}/manifests/generated/ \
--- 
-2.31.1
-

_service

@@ -1,7 +1,7 @@
 <services>
   <service name="tar_scm" mode="disabled">
     <param name="filename">kubevirt</param>
-    <param name="revision">v0.42.1</param>
+    <param name="revision">v0.43.0</param>
     <param name="scm">git</param>
     <param name="submodules">disable</param>
     <param name="url">https://github.com/kubevirt/kubevirt</param>

kubevirt-0.42.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8f56612fc6500832b9f56c17919ccad8500da12f84305cdddae357823b42cd7e
-size 13071004

kubevirt-0.43.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:42bc2dc17133f1667f2639d20fb05cfa196cf8cc1a456a26958053f3e34373f0
+size 13049176

kubevirt.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jul 12 14:47:36 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>
+
+- Drop upstreamed patch 0002-Don-t-use-Bazel-in-build-manifests.sh.patch
+- Install node-labeller.sh in %{_bindir}
+- Update to version 0.43.0
+  Release notes https://github.com/kubevirt/kubevirt/releases/tag/v0.43.0
+
 -------------------------------------------------------------------
 Wed Jun 30 05:17:29 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>
 

kubevirt.spec

@@ -17,7 +17,7 @@
 
 
 Name:           kubevirt
-Version:        0.42.1
+Version:        0.43.0
 Release:        0
 Summary:        Container native virtualization
 License:        Apache-2.0
@@ -28,7 +28,6 @@ Source1:        kubevirt-psp-caasp.yaml
 Source2:        kubevirt_containers_meta
 Source3:        kubevirt_containers_meta.service
 Source100:      %{name}-rpmlintrc
-Patch0:         0002-Don-t-use-Bazel-in-build-manifests.sh.patch
 BuildRequires:  glibc-devel-static
 BuildRequires:  golang-packaging
 BuildRequires:  pkgconfig
@@ -190,7 +189,7 @@ build_tests="true" \
 	cmd/virt-operator \
 	%{nil}
 
-env DOCKER_PREFIX=$reg_path DOCKER_TAG=%{version}-%{release} ./hack/build-manifests.sh
+env DOCKER_PREFIX=$reg_path DOCKER_TAG=%{version}-%{release} GO_BUILD=true ./hack/build-manifests.sh
 
 %install
 mkdir -p %{buildroot}%{_bindir}
@@ -204,10 +203,7 @@ install -p -m 0755 _out/cmd/virt-handler/virt-handler %{buildroot}%{_bindir}/
 install -p -m 0755 _out/cmd/virt-launcher/virt-launcher %{buildroot}%{_bindir}/
 install -p -m 0755 _out/cmd/virt-operator/virt-operator %{buildroot}%{_bindir}/
 install -p -m 0755 _out/tests/tests.test %{buildroot}%{_bindir}/virt-tests
-
-# node-labeller needs to be installed in /bin
-mkdir -p %{buildroot}/bin
-install -p -m 0755 cmd/virt-launcher/node-labeller/node-labeller.sh %{buildroot}/bin/
+install -p -m 0755 cmd/virt-launcher/node-labeller/node-labeller.sh %{buildroot}%{_bindir}/
 
 # virt-launcher SELinux policy needs to land in virt-handler container
 install -p -m 0644 cmd/virt-handler/virt_launcher.cil %{buildroot}/
@@ -259,7 +255,7 @@ install -m 0644 %{S:3} %{buildroot}%{_prefix}/lib/obs/service
 %license LICENSE
 %doc README.md
 %{_bindir}/virt-launcher
-/bin/node-labeller.sh
+%{_bindir}/node-labeller.sh
 
 %files virt-operator
 %license LICENSE