From 9f4c89d3436105bd68fa4b5581aa8df6c96d98470bf08ab5a250860848a84937 Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Fri, 12 Jan 2024 21:15:47 +0000 Subject: [PATCH] Offline generation of 4.6.1705076298.32001ad 4.6.1705076298.32001ad 4.6.1705076298.32001ad 4.6.1705076298.32001ad OBS-URL: https://build.opensuse.org/package/show/devel:openQA:tested/os-autoinst?expand=0&rev=875 --- _multibuild | 2 + _service | 2 + os-autoinst-4.6.1704884885.e3cee62.obscpio | 3 -- os-autoinst-4.6.1705076298.32001ad.obscpio | 3 ++ os-autoinst-devel-test.spec | 43 ++++++++++++++++++++ os-autoinst-openvswitch-test.spec | 46 ++++++++++++++++++++++ os-autoinst-test.spec | 2 +- os-autoinst.changes | 10 +++++ os-autoinst.obsinfo | 6 +-- os-autoinst.spec | 8 +++- 10 files changed, 116 insertions(+), 9 deletions(-) delete mode 100644 os-autoinst-4.6.1704884885.e3cee62.obscpio create mode 100644 os-autoinst-4.6.1705076298.32001ad.obscpio create mode 100644 os-autoinst-devel-test.spec create mode 100644 os-autoinst-openvswitch-test.spec diff --git a/_multibuild b/_multibuild index ebab741..e7bf9a3 100644 --- a/_multibuild +++ b/_multibuild @@ -1,3 +1,5 @@ os-autoinst-test + os-autoinst-devel-test + os-autoinst-openvswitch-test diff --git a/_service b/_service index 5943ab6..b3b7380 100644 --- a/_service +++ b/_service @@ -3,6 +3,8 @@ dist/rpm/os-autoinst.spec dist/rpm/os-autoinst-test.spec + dist/rpm/os-autoinst-devel-test.spec + dist/rpm/os-autoinst-openvswitch-test.spec 4.6 %ct.%h https://github.com/os-autoinst/os-autoinst.git diff --git a/os-autoinst-4.6.1704884885.e3cee62.obscpio b/os-autoinst-4.6.1704884885.e3cee62.obscpio deleted file mode 100644 index 1a10348..0000000 --- a/os-autoinst-4.6.1704884885.e3cee62.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7dc36789dc01e59963021df1a856dad91743c13552d4b7561dfcce1603a94d8d -size 35020813 diff --git a/os-autoinst-4.6.1705076298.32001ad.obscpio b/os-autoinst-4.6.1705076298.32001ad.obscpio new file mode 100644 index 0000000..73d6160 --- /dev/null +++ b/os-autoinst-4.6.1705076298.32001ad.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35d3df43838737215d6571eac2d0dd3c5f95e11a662041c53c97e9d7bb63ebe3 +size 36913165 diff --git a/os-autoinst-devel-test.spec b/os-autoinst-devel-test.spec new file mode 100644 index 0000000..82f737f --- /dev/null +++ b/os-autoinst-devel-test.spec @@ -0,0 +1,43 @@ +# +# spec file +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define short_name os-autoinst-devel +Name: %{short_name}-test +Version: 4.6.1705076298.32001ad +Release: 0 +Summary: Test package for %{short_name} +License: GPL-2.0-or-later +BuildRequires: %{short_name} == %{version} +ExcludeArch: %{ix86} + +%description +. + +%prep +# workaround to prevent post/install failing assuming this file for whatever +# reason +touch %{_sourcedir}/%{short_name} + +%build +# just test requirements by installation + +%install +# disable debug packages in package test to prevent error about missing files +%define debug_package %{nil} + +%changelog diff --git a/os-autoinst-openvswitch-test.spec b/os-autoinst-openvswitch-test.spec new file mode 100644 index 0000000..7ecf3eb --- /dev/null +++ b/os-autoinst-openvswitch-test.spec @@ -0,0 +1,46 @@ +# +# spec file +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define name_ext -test +%define short_name os-autoinst-openvswitch +Name: %{short_name}%{?name_ext} +Version: 4.6.1705076298.32001ad +Release: 0 +Summary: test package for %{short_name} +License: GPL-2.0-or-later +BuildRequires: %{short_name} +ExcludeArch: %{ix86} + +%description +. + +%prep +# workaround to prevent post/install failing assuming this file for whatever +# reason +touch %{_sourcedir}/%{short_name} + +%build +# call one of the components but not openqa itself which would need a valid +# configuration +/usr/lib/os-autoinst/os-autoinst-openvswitch --help + +%install +# disable debug packages in package test to prevent error about missing files +%define debug_package %{nil} + +%changelog diff --git a/os-autoinst-test.spec b/os-autoinst-test.spec index 2707ee8..f47f0a4 100644 --- a/os-autoinst-test.spec +++ b/os-autoinst-test.spec @@ -19,7 +19,7 @@ %define name_ext -test %define short_name os-autoinst Name: %{short_name}%{?name_ext} -Version: 4.6.1704884885.e3cee62 +Version: 4.6.1705076298.32001ad Release: 0 Summary: test package for os-autoinst License: GPL-2.0-or-later diff --git a/os-autoinst.changes b/os-autoinst.changes index a02c33d..f9c5bc5 100644 --- a/os-autoinst.changes +++ b/os-autoinst.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Jan 12 21:15:20 UTC 2024 - okurz@suse.com + +- Update to version 4.6.1705076298.32001ad: + * Add test package spec for sub-packages + * Add SLE16 Backports OBS CI integration + * Revert "[RFC] Test OBS CI against SLE_15_SP5_Backports" + * Revert "Test OBS CI against SLE_15_all_Backports" + * Test OBS CI against SLE_15_all_Backports + ------------------------------------------------------------------- Wed Jan 10 13:13:59 UTC 2024 - okurz@suse.com diff --git a/os-autoinst.obsinfo b/os-autoinst.obsinfo index 28839e3..3ad65fa 100644 --- a/os-autoinst.obsinfo +++ b/os-autoinst.obsinfo @@ -1,4 +1,4 @@ name: os-autoinst -version: 4.6.1704884885.e3cee62 -mtime: 1704884885 -commit: e3cee62dde935485528b1bf4555be12ac934fe08 +version: 4.6.1705076298.32001ad +mtime: 1705076298 +commit: 32001adb82d26c8fb70e8776a7ef028b674084a9 diff --git a/os-autoinst.spec b/os-autoinst.spec index e75f055..9030ddc 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -17,7 +17,7 @@ Name: os-autoinst -Version: 4.6.1704884885.e3cee62 +Version: 4.6.1705076298.32001ad Release: 0 Summary: OS-level test automation License: GPL-2.0-or-later @@ -36,7 +36,7 @@ Source0: %{name}-%{version}.tar.xz # The following line is generated from dependencies.yaml %define build_requires %build_base_requires cmake ninja # The following line is generated from dependencies.yaml -%define main_requires git-core perl(B::Deparse) perl(Carp) perl(Carp::Always) perl(Config) perl(Cpanel::JSON::XS) perl(Crypt::DES) perl(Cwd) perl(Data::Dumper) perl(Digest::MD5) perl(DynaLoader) perl(English) perl(Errno) perl(Exception::Class) perl(Exporter) perl(ExtUtils::testlib) perl(Fcntl) perl(File::Basename) perl(File::Find) perl(File::Path) perl(File::Temp) perl(File::Touch) perl(File::Which) perl(File::chdir) perl(IO::Handle) perl(IO::Scalar) perl(IO::Select) perl(IO::Socket) perl(IO::Socket::INET) perl(IO::Socket::UNIX) perl(IPC::Open3) perl(IPC::Run::Debug) perl(IPC::System::Simple) perl(JSON::Validator) perl(List::MoreUtils) perl(List::Util) perl(Mojo::IOLoop::ReadWriteProcess) >= 0.26 perl(Mojo::JSON) perl(Mojo::Log) perl(Mojo::URL) perl(Mojo::UserAgent) perl(Mojolicious) >= 9.340.0 perl(Mojolicious::Lite) perl(Net::DBus) perl(Net::Domain) perl(Net::IP) perl(Net::SNMP) perl(Net::SSH2) perl(POSIX) perl(Scalar::Util) perl(Socket) perl(Socket::MsgHdr) perl(Term::ANSIColor) perl(Thread::Queue) perl(Time::HiRes) perl(Time::Moment) perl(Time::Seconds) perl(Try::Tiny) perl(XML::LibXML) perl(XML::SemanticDiff) perl(YAML::PP) perl(YAML::XS) perl(autodie) perl(base) perl(constant) perl(integer) perl(strict) perl(version) perl(warnings) perl-base rsync sshpass +%define main_requires git-core perl(B::Deparse) perl(Carp) perl(Carp::Always) perl(Config) perl(Cpanel::JSON::XS) perl(Crypt::DES) perl(Cwd) perl(Data::Dumper) perl(Digest::MD5) perl(DynaLoader) perl(English) perl(Errno) perl(Exception::Class) perl(Exporter) perl(ExtUtils::testlib) perl(Fcntl) perl(File::Basename) perl(File::Find) perl(File::Map) perl(File::Path) perl(File::Temp) perl(File::Touch) perl(File::Which) perl(File::chdir) perl(IO::Handle) perl(IO::Scalar) perl(IO::Select) perl(IO::Socket) perl(IO::Socket::INET) perl(IO::Socket::UNIX) perl(IPC::Open3) perl(IPC::Run::Debug) perl(IPC::System::Simple) perl(JSON::Validator) perl(List::MoreUtils) perl(List::Util) perl(Mojo::IOLoop::ReadWriteProcess) >= 0.26 perl(Mojo::JSON) perl(Mojo::Log) perl(Mojo::URL) perl(Mojo::UserAgent) perl(Mojolicious) >= 9.340.0 perl(Mojolicious::Lite) perl(Net::DBus) perl(Net::Domain) perl(Net::IP) perl(Net::SNMP) perl(Net::SSH2) perl(POSIX) perl(Scalar::Util) perl(Socket) perl(Socket::MsgHdr) perl(Term::ANSIColor) perl(Thread::Queue) perl(Time::HiRes) perl(Time::Moment) perl(Time::Seconds) perl(Try::Tiny) perl(XML::LibXML) perl(XML::SemanticDiff) perl(YAML::PP) perl(YAML::XS) perl(autodie) perl(base) perl(constant) perl(integer) perl(strict) perl(version) perl(warnings) perl-base rsync sshpass # all requirements needed by the tests, do not require on this in the package # itself or any sub-packages # SLE is missing spell check requirements @@ -140,6 +140,7 @@ Group: Development/Tools/Other Requires: openvswitch Requires: openvswitch-switch Requires: os-autoinst +Requires(post): dbus-1 %description openvswitch This package contains openvswitch support for os-autoinst. @@ -249,6 +250,9 @@ cd %{__builddir} %post openvswitch %service_add_post os-autoinst-openvswitch.service +if test $1 -eq 1 ; then + %{_bindir}/dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig 2>&1 || : +fi %preun openvswitch %service_del_preun os-autoinst-openvswitch.service