Accepting request 887252 from home:vulyanov:branches:Virtualization
- Disable changelog generation via tar_scm service (too verbose) - Update to version 0.40.0 Release notes https://github.com/kubevirt/kubevirt/releases/tag/v0.40.0 - Package node-labeller.sh along with virt-launcher - Fix issue when calling `virsh-domcapabilities` fix-virsh-domcapabilities-error.patch OBS-URL: https://build.opensuse.org/request/show/887252 OBS-URL: https://build.opensuse.org/package/show/Virtualization/kubevirt?expand=0&rev=41
This commit is contained in:
parent
859e66ae25
commit
e72904e345
3
_service
3
_service
@ -1,14 +1,13 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="filename">kubevirt</param>
|
||||
<param name="revision">v0.38.1</param>
|
||||
<param name="revision">v0.40.0</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="submodules">disable</param>
|
||||
<param name="url">https://github.com/kubevirt/kubevirt</param>
|
||||
<param name="versionformat">@PARENT_TAG@</param>
|
||||
<param name="versionrewrite-pattern">[v]?([^\+]+)(.*)</param>
|
||||
<param name="versionrewrite-replacement">\1</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
<param name="file">*.tar</param>
|
||||
|
@ -1,4 +0,0 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://github.com/kubevirt/kubevirt</param>
|
||||
<param name="changesrevision">04a381e977300a7540436d16485c40fc80872e0f</param></service></servicedata>
|
27
fix-virsh-domcapabilities-error.patch
Normal file
27
fix-virsh-domcapabilities-error.patch
Normal file
@ -0,0 +1,27 @@
|
||||
Fix 'virsh domcapabilities' error
|
||||
|
||||
Calling `virsh domcapabilities ...` produces an error with some older
|
||||
versions of libvirt:
|
||||
|
||||
error: failed to get emulator capabilities
|
||||
error: invalid argument: unable to find any emulator to serve 'x86_64' architecture
|
||||
|
||||
The issue seems fixed if `virsh capabilites` is run first.
|
||||
|
||||
diff --git a/cmd/virt-launcher/node-labeller/node-labeller.sh b/cmd/virt-launcher/node-labeller/node-labeller.sh
|
||||
index 8ea181963..55a920bdd 100755
|
||||
--- a/cmd/virt-launcher/node-labeller/node-labeller.sh
|
||||
+++ b/cmd/virt-launcher/node-labeller/node-labeller.sh
|
||||
@@ -13,8 +13,10 @@ chmod o+rw /dev/kvm
|
||||
|
||||
libvirtd -d
|
||||
|
||||
+virsh capabilities > /dev/null
|
||||
+
|
||||
virsh domcapabilities --machine q35 --arch x86_64 --virttype kvm > /var/lib/kubevirt-node-labeller/virsh_domcapabilities.xml
|
||||
|
||||
cp -r /usr/share/libvirt/cpu_map /var/lib/kubevirt-node-labeller
|
||||
|
||||
-virsh domcapabilities --machine q35 --arch x86_64 --virttype kvm | virsh hypervisor-cpu-baseline --features /dev/stdin --machine q35 --arch x86_64 --virttype kvm > /var/lib/kubevirt-node-labeller/supported_features.xml
|
||||
\ No newline at end of file
|
||||
+virsh domcapabilities --machine q35 --arch x86_64 --virttype kvm | virsh hypervisor-cpu-baseline --features /dev/stdin --machine q35 --arch x86_64 --virttype kvm > /var/lib/kubevirt-node-labeller/supported_features.xml
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e1e5f9964e198710f071fcf9560809774ce5c875b24b7b2195aceaa0fdf6284b
|
||||
size 12508291
|
3
kubevirt-0.40.0.tar.gz
Normal file
3
kubevirt-0.40.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:946d12e04b3489d323735296705c47903f42adefdccacae517c67ef5d681adf2
|
||||
size 12769493
|
@ -1,3 +1,25 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 20 13:12:00 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>
|
||||
|
||||
- Fix issue when calling `virsh-domcapabilities`
|
||||
fix-virsh-domcapabilities-error.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 20 08:33:46 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>
|
||||
|
||||
- Package node-labeller.sh along with virt-launcher
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 19 15:04:21 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>
|
||||
|
||||
- Update to version 0.40.0
|
||||
Release notes https://github.com/kubevirt/kubevirt/releases/tag/v0.40.0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 19 14:44:25 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>
|
||||
|
||||
- Disable changelog generation via tar_scm service (too verbose)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 15 14:54:40 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: kubevirt
|
||||
Version: 0.38.1
|
||||
Version: 0.40.0
|
||||
Release: 0
|
||||
Summary: Container native virtualization
|
||||
License: Apache-2.0
|
||||
@ -28,6 +28,7 @@ Source1: kubevirt-psp-caasp.yaml
|
||||
Source100: %{name}-rpmlintrc
|
||||
Patch0: dont-build-virtctl-darwin.patch
|
||||
Patch1: dont-use-bazel-in-build-manifests.patch
|
||||
Patch2: fix-virsh-domcapabilities-error.patch
|
||||
BuildRequires: glibc-devel-static
|
||||
BuildRequires: golang-packaging
|
||||
BuildRequires: pkgconfig
|
||||
@ -181,6 +182,10 @@ 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/
|
||||
|
||||
mkdir -p %{buildroot}%{_datadir}/kube-virt
|
||||
cp -r _out/manifests %{buildroot}%{_datadir}/kube-virt/
|
||||
# TODO:
|
||||
@ -220,6 +225,7 @@ install -m 0644 tests/default-config.json %{buildroot}%{_datadir}/kube-virt
|
||||
%license LICENSE
|
||||
%doc README.md
|
||||
%{_bindir}/virt-launcher
|
||||
/bin/node-labeller.sh
|
||||
|
||||
%files virt-operator
|
||||
%license LICENSE
|
||||
|
Loading…
x
Reference in New Issue
Block a user