Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kanku for openSUSE:Factory checked in at 2021-02-20 22:12:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kanku (Old) and /work/SRC/openSUSE:Factory/.kanku.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kanku" Sat Feb 20 22:12:56 2021 rev:2 rq:874009 version:0.10.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kanku/kanku.changes 2021-01-29 14:57:19.813529972 +0100 +++ /work/SRC/openSUSE:Factory/.kanku.new.28504/kanku.changes 2021-02-20 22:12:57.815081998 +0100 @@ -1,0 +2,16 @@ +Sat Feb 13 12:18:01 UTC 2021 - [email protected] + +- Update to version 0.10.2: + * [dist] fixed typo in spec + * [dist] fixed spec for i686 + * [dist] added default-vm.tt2.i686 + * [util] improved terminal handling in VM::Console for Debian Unstable + * [dist] added debian files to extract via service + * [dist] removed debian files - use DEBTRANSFORM + * [dist] updated debian changelog + * [setup] fixed network_name in distributed setup + * [dist] fixed missing quotes for _arch + * removed TODOs and added req for qemu + * [dist] imported changes in spec file from jengelh + +------------------------------------------------------------------- Old: ---- kanku-0.10.0.tar.xz New: ---- kanku-0.10.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kanku.spec ++++++ --- /var/tmp/diff_new_pack.Q5KblJ/_old 2021-02-20 22:12:58.499082724 +0100 +++ /var/tmp/diff_new_pack.Q5KblJ/_new 2021-02-20 22:12:58.503082729 +0100 @@ -1,7 +1,7 @@ # # spec file for package kanku # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,90 +12,91 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + + %define kanku_user kankurun %define kanku_group kanku %define kanku_vardir /var/lib/kanku/ Name: kanku # Version gets set by obs-service-tar_scm -Version: 0.10.0 +Version: 0.10.2 Release: 0 -License: GPL-3.0 +License: GPL-3.0-only Summary: Development and continuous integration -Url: https://github.com/M0ses/kanku +URL: https://github.com/M0ses/kanku Group: Productivity/Networking/Web/Utilities Source: %{name}-%{version}.tar.xz BuildArch: noarch -BuildRequires: perl-macros BuildRequires: fdupes +BuildRequires: perl-macros BuildRequires: systemd-rpm-macros - # perl requires for %check BuildRequires: perl(Const::Fast) -BuildRequires: perl(Test::Simple) -BuildRequires: perl(YAML::PP) BuildRequires: perl(Config::Tiny) -BuildRequires: perl(Path::Class) -BuildRequires: perl(Sys::Virt) -BuildRequires: perl(Moose) -BuildRequires: perl(Log::Log4perl) -BuildRequires: perl(MooseX::App) -BuildRequires: perl(MooseX::Singleton) -BuildRequires: perl(Dancer2::Plugin::REST) -BuildRequires: perl(Expect) -BuildRequires: perl(Net::SSH2) -BuildRequires: perl(Net::IP) -BuildRequires: perl(Net::OBS::Client) -BuildRequires: perl(XML::Structured) -BuildRequires: perl(DBIx::Class::Migration) -BuildRequires: perl(Template) -BuildRequires: perl(Template::Plugin::Filter::ANSIColor) BuildRequires: perl(Config::Tiny) -BuildRequires: perl(Dancer2::Plugin::DBIC) +BuildRequires: perl(DBIx::Class) +BuildRequires: perl(DBIx::Class::Fixtures) +BuildRequires: perl(DBIx::Class::Migration) +BuildRequires: perl(DBIx::Class::Migration) +BuildRequires: perl(Dancer2) BuildRequires: perl(Dancer2::Plugin::Auth::Extensible) BuildRequires: perl(Dancer2::Plugin::Auth::Extensible::Provider::DBIC) +BuildRequires: perl(Dancer2::Plugin::DBIC) +BuildRequires: perl(Dancer2::Plugin::REST) +BuildRequires: perl(Dancer2::Plugin::REST) +BuildRequires: perl(Expect) BuildRequires: perl(File::HomeDir) -BuildRequires: perl(JSON::XS) -BuildRequires: perl(DBIx::Class) -BuildRequires: perl(DBIx::Class::Migration) -BuildRequires: perl(DBIx::Class::Fixtures) BuildRequires: perl(File::LibMagic) +BuildRequires: perl(IO::Interactive) BuildRequires: perl(IO::Uncompress::UnXz) +BuildRequires: perl(IPC::Run) +BuildRequires: perl(JSON::XS) +BuildRequires: perl(Log::Log4perl) +BuildRequires: perl(Moose) +BuildRequires: perl(MooseX::App) +BuildRequires: perl(MooseX::Singleton) +BuildRequires: perl(Net::IP) +BuildRequires: perl(Net::OBS::Client) +BuildRequires: perl(Net::SSH2) +BuildRequires: perl(Path::Class) BuildRequires: perl(Plack) -BuildRequires: perl(Dancer2) -BuildRequires: perl(Dancer2::Plugin::REST) -BuildRequires: perl(XML::XPath) +BuildRequires: perl(Sys::Virt) +BuildRequires: perl(Template) +BuildRequires: perl(Template::Plugin::Filter::ANSIColor) BuildRequires: perl(Term::ReadKey) -BuildRequires: perl(IPC::Run) -BuildRequires: perl(IO::Interactive) +BuildRequires: perl(Test::Simple) +BuildRequires: perl(XML::Structured) +BuildRequires: perl(XML::XPath) +BuildRequires: perl(YAML::PP) # DBD::SQLite is also provided by perl-DBD-SQLite-Amalgamation # but perl-DBD-SQLite-Amalgamation is breaks with SQL syntax errors # at job_histroy_sub table BuildRequires: perl-DBD-SQLite -BuildRequires: perl(LWP::UserAgent) -BuildRequires: perl(LWP::Protocol::https) -BuildRequires: perl(Mail::Sendmail) +BuildRequires: desktop-file-utils +BuildRequires: libvirt-daemon +BuildRequires: shared-mime-info BuildRequires: perl(Archive::Cpio) BuildRequires: perl(Dancer2) BuildRequires: perl(Dancer2::Plugin) -BuildRequires: perl(Dancer2::Plugin::REST) +BuildRequires: perl(Dancer2::Plugin::Auth::Extensible) BuildRequires: perl(Dancer2::Plugin::DBIC) +BuildRequires: perl(Dancer2::Plugin::REST) BuildRequires: perl(Dancer2::Plugin::WebSocket) -BuildRequires: perl(Dancer2::Plugin::Auth::Extensible) +BuildRequires: perl(LWP::Protocol::https) +BuildRequires: perl(LWP::UserAgent) +BuildRequires: perl(Mail::Sendmail) BuildRequires: perl(Net::AMQP::RabbitMQ) BuildRequires: perl(UUID) -BuildRequires: libvirt-daemon -BuildRequires: desktop-file-utils -BuildRequires: shared-mime-info Requires: kanku-cli -Requires: kanku-web -Requires: kanku-worker -Requires: kanku-scheduler Requires: kanku-dispatcher +Requires: kanku-scheduler Requires: kanku-triggerd +Requires: kanku-web +Requires: kanku-worker %description kanku is a utility for integration of kiwi images built @@ -130,58 +131,60 @@ %package common Summary: Common files for kanku +Recommends: apache2 Recommends: osc Recommends: perl(IO::Uncompress::UnXz) -Recommends: apache2 Recommends: perl(YAML::PP::LibYAML) -Requires: libvirt-daemon-qemu libvirt-daemon-config-network libvirt-daemon-config-nwfilter +Requires: libvirt-daemon-config-network +Requires: libvirt-daemon-config-nwfilter +Requires: libvirt-daemon-qemu +Requires: perl-Plack Requires: sudo -Requires: perl(DBIx::Class::Fixtures) -Requires: perl(Test::Simple) -Requires: perl(YAML::PP) Requires: perl(Config::Tiny) -Requires: perl(Path::Class) -Requires: perl(Sys::Virt) +Requires: perl(Config::Tiny) +Requires: perl(Const::Fast) +Requires: perl(DBIx::Class) +Requires: perl(DBIx::Class::Fixtures) +Requires: perl(DBIx::Class::Migration) +Requires: perl(DBIx::Class::Migration) +Requires: perl(Dancer2) +Requires: perl(Dancer2::Plugin::Auth::Extensible) +Requires: perl(Dancer2::Plugin::Auth::Extensible::Provider::DBIC) +Requires: perl(Dancer2::Plugin::DBIC) +Requires: perl(Dancer2::Plugin::REST) +Requires: perl(Dancer2::Plugin::REST) +Requires: perl(Expect) +Requires: perl(File::HomeDir) +Requires: perl(File::LibMagic) +Requires: perl(IO::Uncompress::UnXz) +Requires: perl(IPC::Run) +Requires: perl(JSON::XS) +Requires: perl(Log::Log4perl) Requires: perl(Moose) Requires: perl(MooseX::App) -Requires: perl(Dancer2::Plugin::REST) Requires: perl(MooseX::Singleton) -Requires: perl(Expect) -Requires: perl(Net::SSH2) Requires: perl(Net::IP) Requires: perl(Net::OBS::Client) -Requires: perl(XML::Structured) -Requires: perl(DBIx::Class::Migration) +Requires: perl(Net::SSH2) +Requires: perl(Path::Class) +Requires: perl(Sys::Virt) Requires: perl(Template) -Requires: perl(Log::Log4perl) -Requires: perl(Config::Tiny) -Requires: perl(Dancer2::Plugin::DBIC) -Requires: perl(Dancer2::Plugin::Auth::Extensible) -Requires: perl(Dancer2::Plugin::Auth::Extensible::Provider::DBIC) -Requires: perl(File::HomeDir) Requires: perl(Template::Plugin::Filter::ANSIColor) -Requires: perl(JSON::XS) -Requires: perl(DBIx::Class) -Requires: perl(DBIx::Class::Migration) Requires: perl(Template::Plugin::Filter::ANSIColor) -Requires: perl(File::LibMagic) -Requires: perl(IO::Uncompress::UnXz) -Requires: perl-Plack -Requires: perl(Dancer2) -Requires: perl(Dancer2::Plugin::REST) -Requires: perl(XML::XPath) Requires: perl(Term::ReadKey) -Requires: perl(IPC::Run) -Requires: perl(Const::Fast) +Requires: perl(Test::Simple) +Requires: perl(XML::Structured) +Requires: perl(XML::XPath) +Requires: perl(YAML::PP) # DBD::SQLite is also provided by perl-DBD-SQLite-Amalgamation # but perl-DBD-SQLite-Amalgamation is breaks with SQL syntax errors # at job_histroy_sub table Requires: perl-DBD-SQLite +Requires: logrotate +Requires: perl(Archive::Cpio) Requires: perl(LWP::Protocol::https) Requires: perl(Mail::Sendmail) -Requires: perl(Archive::Cpio) Requires: perl(UUID) -Requires: logrotate Conflicts: perl-DBD-SQLite-Amalgamation @@ -294,10 +297,10 @@ Requires: libvirt-client Requires(pre): libvirt-daemon libvirt-daemon-driver-qemu Requires(pre): sudo -Requires: perl(Net::AMQP::RabbitMQ) -Requires: perl(IO::Interactive) -Requires: (perl(Passwd::Keyring::KDEWallet) if kwalletd5) Requires: (perl(Passwd::Keyring::Gnome) if gnome-keyring) +Requires: (perl(Passwd::Keyring::KDEWallet) if kwalletd5) +Requires: perl(IO::Interactive) +Requires: perl(Net::AMQP::RabbitMQ) %description cli Command line client for kanku, mainly used for setup tasks @@ -344,11 +347,11 @@ Requires: kanku-common Requires: kanku-common-server Requires: perl(Dancer2::Plugin::WebSocket) -Requires: perl(Twiggy) Requires: perl(Mail::Message::Body::String) Requires: perl(Mail::Transport::Send) Requires: perl(Net::AMQP::RabbitMQ) Requires: perl(Template::Plugin::JSON::Escape) +Requires: perl(Twiggy) Requires: perl(UUID) %if 0%{?fedora} Requires: server(smtp) @@ -411,10 +414,16 @@ Requires: kanku-common Requires: kanku-common-server Requires: perl(Net::AMQP::RabbitMQ) -Requires: perl(UUID) Requires: perl(Sys::CPU) Requires: perl(Sys::LoadAvg) Requires: perl(Sys::MemInfo) +Requires: perl(UUID) +%if "%{_arch}" == "x86_64" || "%{_arch}" == "i686" +Requires: qemu-kvm +%endif +%if "%{_arch}" == "aarch64" +Requires: qemu-arm +%endif # apache2 is only needed for delivering console logs Recommends: apache2 @@ -514,7 +523,6 @@ /usr/lib/kanku/lib/Kanku/Daemon/TriggerD.pm /usr/lib/kanku/lib/Kanku/Listener/RabbitMQ.pm - %package doc Summary: Documentation files for kanku @@ -526,8 +534,8 @@ %package urlwrapper Summary: Url wrapper for kanku:// urls -Requires: kanku-cli Requires: desktop-file-utils +Requires: kanku-cli Requires: shared-mime-info Obsoletes: kanku-url-wrapper ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Q5KblJ/_old 2021-02-20 22:12:58.539082767 +0100 +++ /var/tmp/diff_new_pack.Q5KblJ/_new 2021-02-20 22:12:58.539082767 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/M0ses/kanku.git</param> - <param name="changesrevision">330e0e1baaef3e4bb01fecc7c8deb768705d00f1</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">b7a464a8576b36c6da6fb81637aaa8c982e2bfa7</param></service></servicedata> \ No newline at end of file ++++++ debian.dsc ++++++ --- /var/tmp/diff_new_pack.Q5KblJ/_old 2021-02-20 22:12:58.559082788 +0100 +++ /var/tmp/diff_new_pack.Q5KblJ/_new 2021-02-20 22:12:58.559082788 +0100 @@ -2,7 +2,7 @@ Source: kanku Binary: kanku Architecture: any -Version: 0.10.0 +Version: 0.10.2 Maintainer: unknown <[email protected]> Standards-Version: 3.8.2 Homepage: https://github.com/M0ses/kanku ++++++ kanku-0.10.0.tar.xz -> kanku-0.10.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kanku-0.10.0/debian/changelog new/kanku-0.10.2/debian/changelog --- old/kanku-0.10.0/debian/changelog 2020-12-21 14:56:29.000000000 +0100 +++ new/kanku-0.10.2/debian/changelog 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -kanku (0.6.4-0) unstable; urgency=low - - * generated OBS deb build - - -- Frank Schreiner <[email protected]> Mon, 25 Dec 2007 10:50:38 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kanku-0.10.0/debian/compat new/kanku-0.10.2/debian/compat --- old/kanku-0.10.0/debian/compat 2020-12-21 14:56:29.000000000 +0100 +++ new/kanku-0.10.2/debian/compat 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kanku-0.10.0/debian/control new/kanku-0.10.2/debian/control --- old/kanku-0.10.0/debian/control 2020-12-21 14:56:29.000000000 +0100 +++ new/kanku-0.10.2/debian/control 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -Priority: optional -Maintainer: Frank Schreiner <[email protected]> -Source: kanku -Build-Depends: debhelper (>= 5), libmoosex-app-perl, libnamespace-autoclean-perl, libmoose-perl, libmodule-pluggable-perl, libpod-elemental-perl, libio-interactive-perl, liblog-log4perl-perl, libmoosex-singleton-perl, libyaml-pp-perl, liblwp-protocol-https-perl, libwww-perl, libjson-xs-perl, libpath-class-perl, libfile-homedir-perl, libterm-readkey-perl, libdbix-class-perl, libdbix-class-migration-perl, liblog-log4perl-perl, libjson-maybexs-perl, libtype-tiny-perl, libjson-maybexs-perl, libdevel-partialdump-perl, libsql-translator-perl, liblog-any-perl, libsys-virt-perl, libexpect-perl, libtemplate-perl, libnet-ip-perl, libxml-xpath-perl, libfile-libmagic-perl, libipc-run-perl, libnet-amqp-perl, libnet-amqp-rabbitmq-perl, libmath-int64-perl, libconst-fast-perl, libnet-ssh2-perl, libuuid-perl -Standards-Version: 3.8.2 -Homepage: https://github.com/M0ses/kanku -Section: httpd - -Package: kanku -Architecture: any -Description: TODO: add some meaningful description - to be more verbose -Depends: libmoosex-app-perl, libnamespace-autoclean-perl, libmoose-perl, libmodule-pluggable-perl, libpod-elemental-perl, libio-interactive-perl, liblog-log4perl-perl, libmoosex-singleton-perl, libyaml-pp-perl, liblwp-protocol-https-perl, libwww-perl, libjson-xs-perl, libpath-class-perl, libfile-homedir-perl, libterm-readkey-perl, libdbix-class-perl, libdbix-class-migration-perl, liblog-log4perl-perl, libjson-maybexs-perl, libtype-tiny-perl, libjson-maybexs-perl, libdevel-partialdump-perl, libsql-translator-perl, liblog-any-perl, libsys-virt-perl, libexpect-perl, libtemplate-perl, libnet-ip-perl, libxml-xpath-perl, libfile-libmagic-perl, libipc-run-perl, libnet-amqp-perl, libnet-amqp-rabbitmq-perl, libmath-int64-perl, libconst-fast-perl, libnet-ssh2-perl, libuuid-perl, libdancer2-perl, libsession-token-perl,libdancer2-plugin-dbic-perl, libnet-obs-client-perl, libtest-exception-perl, libdbix-class-fixtures-perl, libdancer2-plugin-auth-extensible-perl, libxml-structured-perl, libmoose x-app-perl, libdata-dump-streamer-perl, libdancer2-plugin-websocket-perl, libdata-visitor-perl, libconfig-tiny-perl, libio-all-perl, gnupg2, libdbix-class-deploymenthandler-perl, liblog-contextual-perl, libmoosex-role-parameterized-perl, libsql-splitstatement-perl, libdbix-class-schema-loader-perl, libfile-sharedir-projectdistdir-perl, libdbd-sqlite3-perl, libdatetime-format-sqlite-perl, libmoosex-app-cmd-perl, libvirt-daemon-system, libarchive-cpio-perl, libfile-copy-recursive-perl -Recommends: libyaml-pp-libyaml-perl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kanku-0.10.0/debian/copyright new/kanku-0.10.2/debian/copyright --- old/kanku-0.10.0/debian/copyright 2020-12-21 14:56:29.000000000 +0100 +++ new/kanku-0.10.2/debian/copyright 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -License: GPL-3.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kanku-0.10.0/debian/rules new/kanku-0.10.2/debian/rules --- old/kanku-0.10.0/debian/rules 2020-12-21 14:56:29.000000000 +0100 +++ new/kanku-0.10.2/debian/rules 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -#!/usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. -#DH_VERBOSE = 1 - -# see FEATURE AREAS in dpkg-buildflags(1) -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all - -# see ENVIRONMENT in dpkg-buildflags(1) -# package maintainers to append CFLAGS -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -DEB_BUILD_OPTIONS=nocheck - -%: - dh $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kanku-0.10.0/debian/source/format new/kanku-0.10.2/debian/source/format --- old/kanku-0.10.0/debian/source/format 2020-12-21 14:56:29.000000000 +0100 +++ new/kanku-0.10.2/debian/source/format 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kanku-0.10.0/dist/debian.changelog new/kanku-0.10.2/dist/debian.changelog --- old/kanku-0.10.0/dist/debian.changelog 1970-01-01 01:00:00.000000000 +0100 +++ new/kanku-0.10.2/dist/debian.changelog 2021-02-13 13:24:13.000000000 +0100 @@ -0,0 +1,11 @@ +kanku (0.10.1-0) UNRELEASED; urgency=medium + + * updated to upstream version 0.10.1 + + -- Frank Schreiner <[email protected]> Thu, 04 Feb 2021 07:58:17 +0100 + +kanku (0.6.4-0) unstable; urgency=low + + * generated OBS deb build + + -- Frank Schreiner <[email protected]> Mon, 25 Dec 2007 10:50:38 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kanku-0.10.0/dist/debian.compat new/kanku-0.10.2/dist/debian.compat --- old/kanku-0.10.0/dist/debian.compat 1970-01-01 01:00:00.000000000 +0100 +++ new/kanku-0.10.2/dist/debian.compat 2021-02-13 13:24:13.000000000 +0100 @@ -0,0 +1 @@ +10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kanku-0.10.0/dist/debian.control new/kanku-0.10.2/dist/debian.control --- old/kanku-0.10.0/dist/debian.control 1970-01-01 01:00:00.000000000 +0100 +++ new/kanku-0.10.2/dist/debian.control 2021-02-13 13:24:13.000000000 +0100 @@ -0,0 +1,14 @@ +Priority: optional +Maintainer: Frank Schreiner <[email protected]> +Source: kanku +Build-Depends: debhelper (>= 5), libmoosex-app-perl, libnamespace-autoclean-perl, libmoose-perl, libmodule-pluggable-perl, libpod-elemental-perl, libio-interactive-perl, liblog-log4perl-perl, libmoosex-singleton-perl, libyaml-pp-perl, liblwp-protocol-https-perl, libwww-perl, libjson-xs-perl, libpath-class-perl, libfile-homedir-perl, libterm-readkey-perl, libdbix-class-perl, libdbix-class-migration-perl, liblog-log4perl-perl, libjson-maybexs-perl, libtype-tiny-perl, libjson-maybexs-perl, libdevel-partialdump-perl, libsql-translator-perl, liblog-any-perl, libsys-virt-perl, libexpect-perl, libtemplate-perl, libnet-ip-perl, libxml-xpath-perl, libfile-libmagic-perl, libipc-run-perl, libnet-amqp-perl, libnet-amqp-rabbitmq-perl, libmath-int64-perl, libconst-fast-perl, libnet-ssh2-perl, libuuid-perl +Standards-Version: 3.8.2 +Homepage: https://github.com/M0ses/kanku +Section: httpd + +Package: kanku +Architecture: any +Description: TODO: add some meaningful description + to be more verbose +Depends: libmoosex-app-perl, libnamespace-autoclean-perl, libmoose-perl, libmodule-pluggable-perl, libpod-elemental-perl, libio-interactive-perl, liblog-log4perl-perl, libmoosex-singleton-perl, libyaml-pp-perl, liblwp-protocol-https-perl, libwww-perl, libjson-xs-perl, libpath-class-perl, libfile-homedir-perl, libterm-readkey-perl, libdbix-class-perl, libdbix-class-migration-perl, liblog-log4perl-perl, libjson-maybexs-perl, libtype-tiny-perl, libjson-maybexs-perl, libdevel-partialdump-perl, libsql-translator-perl, liblog-any-perl, libsys-virt-perl, libexpect-perl, libtemplate-perl, libnet-ip-perl, libxml-xpath-perl, libfile-libmagic-perl, libipc-run-perl, libnet-amqp-perl, libnet-amqp-rabbitmq-perl, libmath-int64-perl, libconst-fast-perl, libnet-ssh2-perl, libuuid-perl, libdancer2-perl, libsession-token-perl,libdancer2-plugin-dbic-perl, libnet-obs-client-perl, libtest-exception-perl, libdbix-class-fixtures-perl, libdancer2-plugin-auth-extensible-perl, libxml-structured-perl, libmoose x-app-perl, libdata-dump-streamer-perl, libdancer2-plugin-websocket-perl, libdata-visitor-perl, libconfig-tiny-perl, libio-all-perl, gnupg2, libdbix-class-deploymenthandler-perl, liblog-contextual-perl, libmoosex-role-parameterized-perl, libsql-splitstatement-perl, libdbix-class-schema-loader-perl, libfile-sharedir-projectdistdir-perl, libdbd-sqlite3-perl, libdatetime-format-sqlite-perl, libmoosex-app-cmd-perl, libvirt-daemon-system, libarchive-cpio-perl, libfile-copy-recursive-perl +Recommends: libyaml-pp-libyaml-perl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kanku-0.10.0/dist/debian.dsc new/kanku-0.10.2/dist/debian.dsc --- old/kanku-0.10.0/dist/debian.dsc 1970-01-01 01:00:00.000000000 +0100 +++ new/kanku-0.10.2/dist/debian.dsc 2021-02-13 13:24:13.000000000 +0100 @@ -0,0 +1,9 @@ +Format: 1.0 +Source: kanku +Binary: kanku +Architecture: any +Version: 0.10.1 +Maintainer: Frank Schreiner <[email protected]> +Standards-Version: 3.8.2 +Homepage: https://github.com/M0ses/kanku +Build-Depends: debhelper (>= 5), libmoosex-app-perl, libnamespace-autoclean-perl, libmoose-perl, libmodule-pluggable-perl, libpod-elemental-perl, libio-interactive-perl, liblog-log4perl-perl, libmoosex-singleton-perl, libyaml-perl, liblwp-protocol-https-perl, libwww-perl, libjson-xs-perl, libpath-class-perl, libfile-homedir-perl, libterm-readkey-perl, libdbix-class-perl, libdbix-class-migration-perl, liblog-log4perl-perl, libjson-maybexs-perl, libtype-tiny-perl, libjson-maybexs-perl, libdevel-partialdump-perl, libsql-translator-perl, liblog-any-perl, libsys-virt-perl, libexpect-perl, libtemplate-perl, libnet-ip-perl, libxml-xpath-perl, libfile-libmagic-perl, libipc-run-perl, libnet-amqp-perl, libnet-amqp-rabbitmq-perl, libmath-int64-perl, libconst-fast-perl, libnet-ssh2-perl, libuuid-perl, libdancer2-perl, libsession-token-perl,libdancer2-plugin-dbic-perl, libnet-obs-client-perl, libtest-exception-perl, libdbix-class-fixtures-perl, libdancer2-plugin-auth-extensible-perl, libxml-stru ctured-perl, libmoosex-app-perl, libdata-dump-streamer-perl, libdancer2-plugin-websocket-perl, libdata-visitor-perl, libconfig-tiny-perl, libio-all-perl, gnupg2, libdbix-class-deploymenthandler-perl, liblog-contextual-perl, libmoosex-role-parameterized-perl, libsql-splitstatement-perl, libdbix-class-schema-loader-perl, libfile-sharedir-projectdistdir-perl, libdbd-sqlite3-perl, libdatetime-format-sqlite-perl, libmoosex-app-cmd-perl, libyaml-pp-perl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kanku-0.10.0/dist/debian.rules new/kanku-0.10.2/dist/debian.rules --- old/kanku-0.10.0/dist/debian.rules 1970-01-01 01:00:00.000000000 +0100 +++ new/kanku-0.10.2/dist/debian.rules 2021-02-13 13:24:13.000000000 +0100 @@ -0,0 +1,17 @@ +#!/usr/bin/make -f +# See debhelper(7) (uncomment to enable) +# output every command that modifies files on the build system. +#DH_VERBOSE = 1 + +# see FEATURE AREAS in dpkg-buildflags(1) +#export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +# see ENVIRONMENT in dpkg-buildflags(1) +# package maintainers to append CFLAGS +#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +# package maintainers to append LDFLAGS +#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +DEB_BUILD_OPTIONS=nocheck + +%: + dh $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kanku-0.10.0/dist/kanku.spec new/kanku-0.10.2/dist/kanku.spec --- old/kanku-0.10.0/dist/kanku.spec 2020-12-21 14:56:29.000000000 +0100 +++ new/kanku-0.10.2/dist/kanku.spec 2021-02-13 13:24:13.000000000 +0100 @@ -20,10 +20,10 @@ Name: kanku # Version gets set by obs-service-tar_scm -Version: 0.0.0 -Release: 0.0 +Version: 0.10.0 +Release: 0 License: GPL-3.0 -Summary: Development and continuous integration made easy +Summary: Development and continuous integration Url: https://github.com/M0ses/kanku Group: Productivity/Networking/Web/Utilities Source: %{name}-%{version}.tar.xz @@ -90,10 +90,6 @@ BuildRequires: libvirt-daemon BuildRequires: desktop-file-utils BuildRequires: shared-mime-info - - -BuildRoot: %{_tmppath}/%{name}-%{version}-build - Requires: kanku-cli Requires: kanku-web Requires: kanku-worker @@ -102,20 +98,20 @@ Requires: kanku-triggerd %description -kanku is designed to give you a better integration of your kiwi images built -by the Open Build Service (OBS) in your development and testing workflow. +kanku is a utility for integration of kiwi images built +by the Open Build Service (OBS) in a development and testing workflow. -It provides a framework for simple automation of complex setups, -e.g. to prepare your development environment or run simple tests. +It provides a framework for automation of setups, +e.g. to prepare development environments or run simple tests. %prep -%setup -q +%autosetup -p1 %build /bin/true %install -make install DESTDIR=%{buildroot} DOCDIR=%{_defaultdocdir}/kanku/ +%make_install DOCDIR=%{_defaultdocdir}/kanku/ %fdupes %{buildroot}/opt/kanku/share ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rckanku-web ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rckanku-worker @@ -190,15 +186,13 @@ Conflicts: perl-DBD-SQLite-Amalgamation %description common -TODO: - add a useful description +common config and lib files used in kanku %post common %tmpfiles_create %_tmpfilesdir/kanku.conf %files common -%defattr(-,root,root) -%doc README.md TODO +%doc README.md %dir /usr/lib/kanku %dir /usr/lib/kanku/lib @@ -307,7 +301,7 @@ %description cli Command line client for kanku, mainly used for setup tasks -and in developer mode +and in developer mode. %files cli %dir /usr/share/kanku/views/cli/ @@ -331,12 +325,11 @@ %description common-server This package contains common server files, settings and dependencies for the kanku server components like kanku-worker, kanku-dispatcher, -kanku-web, kanku-scheduler and kanku-triggerd +kanku-web, kanku-scheduler and kanku-triggerd. %pre common-server getent group %{kanku_group} >/dev/null || groupadd -r %{kanku_group} getent passwd %{kanku_user} >/dev/null || useradd -r -g %{kanku_group} -G libvirt -d %{kanku_vardir} -s /sbin/nologin -c "user for kanku" %{kanku_user} -exit 0 %files common-server %defattr(-, root, root) @@ -364,8 +357,7 @@ %endif %description web -TODO: - add a useful description +WebUI for kanku using perl Dancer %post web %systemd_post kanku-web.service @@ -423,11 +415,17 @@ Requires: perl(Sys::CPU) Requires: perl(Sys::LoadAvg) Requires: perl(Sys::MemInfo) +%if "%{_arch}" == "x86_64" || "%{_arch}" == "i686" +Requires: qemu-kvm +%endif +%if "%{_arch}" == "aarch64" +Requires: qemu-arm +%endif # apache2 is only needed for delivering console logs Recommends: apache2 %description worker -A simple remote worker for kanku based on RabbitMQ +A remote worker for kanku based on RabbitMQ. %post worker %systemd_post kanku-worker.service @@ -455,7 +453,7 @@ Recommends: rabbitmq-server %description dispatcher -A simple dispatcher for kanku based on RabbitMQ +A dispatcher for kanku based on RabbitMQ. %post dispatcher %systemd_post kanku-dispatcher.service @@ -480,7 +478,7 @@ Requires: kanku-common-server %description scheduler -A simple scheduler for kanku based on RabbitMQ +A scheduler for kanku based on RabbitMQ. %post scheduler %systemd_post kanku-scheduler.service @@ -503,7 +501,7 @@ Requires: kanku-common-server %description triggerd -A simple triggerd for kanku based on RabbitMQ +A triggerd for kanku based on RabbitMQ. %post triggerd %systemd_post kanku-triggerd.service @@ -527,7 +525,7 @@ Summary: Documentation files for kanku %description doc -This package contains the documentation files for kanku +This package contains the documentation files for kanku. %files doc %{_defaultdocdir}/kanku/ @@ -540,7 +538,7 @@ Obsoletes: kanku-url-wrapper %description urlwrapper -A URL wrapper to start kanku from kanku:// urls in the browser +A URL wrapper to start kanku from kanku:// urls in the browser. %post urlwrapper update-mime-database /usr/share/mime diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kanku-0.10.0/etc/templates/cmd/setup/kanku-config.yml.tt2 new/kanku-0.10.2/etc/templates/cmd/setup/kanku-config.yml.tt2 --- old/kanku-0.10.0/etc/templates/cmd/setup/kanku-config.yml.tt2 2020-12-21 14:56:29.000000000 +0100 +++ new/kanku-0.10.2/etc/templates/cmd/setup/kanku-config.yml.tt2 2021-02-13 13:24:13.000000000 +0100 @@ -32,8 +32,6 @@ # user: qemu # images_dir: /var/lib/libvirt/images -# Kanku::Handler::CreateDomain: -# pool_name: mypool Kanku::Cli::lsi: project_name: [% official_image_repo %] @@ -49,6 +47,7 @@ name: kanku-ovs bridge: kanku-br0 iptables_chain: KANKU_HOSTS + network_name: [% network_name %] dispatcher: Kanku::Dispatch::RabbitMQ @@ -127,4 +126,7 @@ # arch: x86_64 # jobs: # - obs-server +[% ELSE %] +# Kanku::Handler::CreateDomain: +# pool_name: mypool [% END %] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kanku-0.10.0/etc/templates/default-vm.tt2.i686 new/kanku-0.10.2/etc/templates/default-vm.tt2.i686 --- old/kanku-0.10.0/etc/templates/default-vm.tt2.i686 1970-01-01 01:00:00.000000000 +0100 +++ new/kanku-0.10.2/etc/templates/default-vm.tt2.i686 2021-02-13 13:24:13.000000000 +0100 @@ -0,0 +1,45 @@ +<domain type='kvm'> + <name>[% domain.domain_name %]</name> + <memory unit='KiB'>[% domain.memory %]</memory> + <currentMemory unit='KiB'>[% domain.memory %]</currentMemory> + <vcpu placement='static'>[% domain.vcpu %]</vcpu> + <cpu mode='host-passthrough' check='none'> + <cache mode='passthrough'/> + <feature policy='require' name='[% host_feature %]'/> + </cpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>[% qemu_kvm %]</emulator> + [% domain.disk_xml %] + <controller type='pci' index='0' model='pci-root'> + <alias name='pci.0'/> + </controller> + [% domain.disk_controllers_xml %] + <interface type='network'> + <source network='[% domain.network_name %]' bridge='[% domain.network_bridge %]'/> + <model type='virtio'/> + <alias name='net0'/> + </interface> + <serial type='pty'> + <!-- to be tested <source path='/dev/pts/8'/> --> + <target port='0'/> + <alias name='serial0'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + <alias name='serial0'/> + </console> +[% domain.hostshare %] + </devices> +</domain> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kanku-0.10.0/lib/Kanku/Setup/Roles/Common.pm new/kanku-0.10.2/lib/Kanku/Setup/Roles/Common.pm --- old/kanku-0.10.0/lib/Kanku/Setup/Roles/Common.pm 2020-12-21 14:56:29.000000000 +0100 +++ new/kanku-0.10.2/lib/Kanku/Setup/Roles/Common.pm 2021-02-13 13:24:13.000000000 +0100 @@ -88,6 +88,13 @@ default => 'kanku-devel', ); +has network_name => ( + isa => 'Str', + is => 'rw', + lazy => 1, + default => sub { $_[0]->_distributed ? 'kanku-ovs' : 'kanku-devel'}, +); + sub _configure_libvirtd_access { ## no critic (Subroutines::ProhibitUnusedPrivateSubroutines) my ($self, %opts) = @_; my $logger = $self->logger; @@ -246,7 +253,7 @@ my $logger = $self->logger; my $vmm = Sys::Virt->new(uri => 'qemu:///system'); my @networks = $vmm->list_all_networks; - my $nn = ($self->_distributed) ? 'kanku-ovs' : 'kanku-devel'; + my $nn = $self->network_name(); for my $net (@networks) { if ($net->get_name eq $nn) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kanku-0.10.0/lib/Kanku/Setup/Server/Distributed.pm new/kanku-0.10.2/lib/Kanku/Setup/Server/Distributed.pm --- old/kanku-0.10.0/lib/Kanku/Setup/Server/Distributed.pm 2020-12-21 14:56:29.000000000 +0100 +++ new/kanku-0.10.2/lib/Kanku/Setup/Server/Distributed.pm 2021-02-13 13:24:13.000000000 +0100 @@ -113,6 +113,7 @@ cacertfile => $self->cacertfile, ovs_ip_prefix => $self->ovs_ip_prefix, cache_dir => '/var/cache/kanku', + network_name => $self->network_name, } ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kanku-0.10.0/lib/Kanku/Util/VM/Console.pm new/kanku-0.10.2/lib/Kanku/Util/VM/Console.pm --- old/kanku-0.10.0/lib/Kanku/Util/VM/Console.pm 2020-12-21 14:56:29.000000000 +0100 +++ new/kanku-0.10.2/lib/Kanku/Util/VM/Console.pm 2021-02-13 13:24:13.000000000 +0100 @@ -28,7 +28,7 @@ has ['domain_name','short_hostname','log_file','login_user','login_pass'] => (is=>'rw', isa=>'Str'); has 'prompt' => (is=>'rw', isa=>'Str',default=>'Kanku-prompt: '); -has 'prompt_regex' => (is=>'rw', isa=>'Object',default=>sub { qr/^Kanku-prompt: / }); +has 'prompt_regex' => (is=>'rw', isa=>'Object',default=>sub { qr/^Kanku-prompt: /m }); has _expect_object => (is=>'rw', isa => 'Object'); has [qw/bootloader_seen grub_seen user_is_logged_in console_connected/] => (is=>'rw', isa => 'Bool'); has 'connect_uri' => (is=>'rw', isa=>'Str', default=>'qemu:///system'); @@ -119,8 +119,6 @@ die "No login_user found in config" if (! $user); die "No login_pass found in config" if (! $password); - my $login_counter = 0; - if (! $self->bootloader_seen) { $exp->send_slow(1,"\003","\004"); } @@ -129,8 +127,6 @@ [ '^\S+ login: ' => sub { my $exp = shift; - - #die "login seems to be failed as login_counter greater than zero" if ($login_counter); if ( $exp->match =~ /^(\S+) login: / ) { $logger->debug("Found match '$1'"); $self->short_hostname($1); @@ -138,11 +134,12 @@ } $logger->debug(" - Sending username '$user'"); $exp->send("$user\n"); - $login_counter++; - exp_continue; } ], - [ '^Password: ' => + ); + $exp->expect( + 10, + [ qr/Password: / => sub { my $exp = shift; $logger->debug(" - Sending password '$password'"); @@ -159,6 +156,7 @@ } ], ); + $exp->send("export TERM=dumb\n"); my $hn = $self->short_hostname(); my $prompt = $self->prompt_regex; @@ -173,13 +171,16 @@ ); $self->user_is_logged_in(1); $exp->send("export PS1=\"".$self->prompt."\"\n"); - $self->prompt_regex(qr/\r\nKanku-prompt: /); + $self->prompt_regex(qr/\r\nKanku-prompt: /m); + my $count; $exp->expect( 5, [ $self->prompt_regex() => sub { my $exp = shift; $logger->info(" - Prompt set sucessfully: '".$exp->match."'"); + $count++; + exp_continue unless $count == 2; } ] ); @@ -283,9 +284,9 @@ $self->prompt_regex() => sub { my $exp=shift; my $rc = $exp->before(); - my @l = split /\r?\n/, $rc; - $rc = pop @l; - if ( $rc ) { + my @l = split /\r\n/, $rc; + $rc = int($l[1]); + if ($rc) { $logger->warn("Execution of command '$cmd' failed with return code '$rc'"); } else { $logger->debug("Execution of command '$cmd' succeed");
