diff --git a/dependencies.yaml b/dependencies.yaml index 9b6d5c03d36..4f9f4763d18 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -21,6 +21,7 @@ assetpack_requires: perl(CSS::Minifier::XS): '>= 0.01' perl(JavaScript::Minifier::XS): '>= 0.11' perl(Mojolicious::Plugin::AssetPack): '>= 1.36' + perl(YAML::PP): '>= 0.026' build_requires: rubygem(sass): diff --git a/dist/rpm/openQA-client-test.spec b/dist/rpm/openQA-client-test.spec index ec44347c420..b844c157889 100644 --- a/dist/rpm/openQA-client-test.spec +++ b/dist/rpm/openQA-client-test.spec @@ -5,7 +5,7 @@ Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later BuildRequires: %{short_name} == %{version} -ExcludeArch: i586 +ExcludeArch: %{ix86} %description . diff --git a/dist/rpm/openQA-devel-test.spec b/dist/rpm/openQA-devel-test.spec index 78b70a0a8a7..cd6ad116328 100644 --- a/dist/rpm/openQA-devel-test.spec +++ b/dist/rpm/openQA-devel-test.spec @@ -5,7 +5,7 @@ Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later BuildRequires: %{short_name} == %{version} -ExcludeArch: i586 +ExcludeArch: %{ix86} %ifarch ppc ppc64 ppc64le s390x # missing chromedriver dependency ExclusiveArch: do_not_build diff --git a/dist/rpm/openQA-test.spec b/dist/rpm/openQA-test.spec index d0667ddb0aa..a0baa1d2878 100644 --- a/dist/rpm/openQA-test.spec +++ b/dist/rpm/openQA-test.spec @@ -9,7 +9,7 @@ BuildRequires: openQA-local-db %if 0%{?suse_version} > 1500 BuildRequires: user(geekotest) %endif -ExcludeArch: i586 +ExcludeArch: %{ix86} %description . diff --git a/dist/rpm/openQA-worker-test.spec b/dist/rpm/openQA-worker-test.spec index a0be844c908..c88051546f8 100644 --- a/dist/rpm/openQA-worker-test.spec +++ b/dist/rpm/openQA-worker-test.spec @@ -8,7 +8,7 @@ BuildRequires: %{short_name} == %{version} %if 0%{?suse_version} > 1500 BuildRequires: user(_openqa-worker) %endif -ExcludeArch: i586 +ExcludeArch: %{ix86} %description . diff --git a/dist/rpm/openQA.spec b/dist/rpm/openQA.spec index fb3eeff256f..609fbbeffa5 100644 --- a/dist/rpm/openQA.spec +++ b/dist/rpm/openQA.spec @@ -47,7 +47,7 @@ %define python_scripts_requires %{nil} %endif # The following line is generated from dependencies.yaml -%define assetpack_requires perl(CSS::Minifier::XS) >= 0.01 perl(JavaScript::Minifier::XS) >= 0.11 perl(Mojolicious::Plugin::AssetPack) >= 1.36 +%define assetpack_requires perl(CSS::Minifier::XS) >= 0.01 perl(JavaScript::Minifier::XS) >= 0.11 perl(Mojolicious::Plugin::AssetPack) >= 1.36 perl(YAML::PP) >= 0.026 # The following line is generated from dependencies.yaml %define common_requires ntp-daemon perl >= 5.20.0 perl(Carp::Always) >= 0.14.02 perl(Config::IniFiles) perl(Config::Tiny) perl(Cpanel::JSON::XS) >= 4.09 perl(Cwd) perl(Data::Dump) perl(Data::Dumper) perl(Digest::MD5) perl(Filesys::Df) perl(Getopt::Long) perl(Minion) >= 10.25 perl(Mojolicious) >= 9.340.0 perl(Regexp::Common) perl(Storable) perl(Time::Moment) perl(Try::Tiny) # runtime requirements for the main package that are not required by other sub-packages @@ -82,7 +82,6 @@ Version: 4.6 Release: 0 Summary: The openQA web-frontend, scheduler and tools License: GPL-2.0-or-later -Group: Development/Tools/Other Url: http://os-autoinst.github.io/openQA/ Source0: %{name}-%{version}.tar.xz # a workaround for set_version looking at random files (so we can't name it .tar.xz) @@ -123,14 +122,12 @@ Recommends: rsync # version of that module. Then when we install on Tumbleweed, it doesn't # have that older version anymore #BuildArch: noarch -ExcludeArch: i586 +ExcludeArch: %{ix86} %{?systemd_requires} %if %{with tests} BuildRequires: %{test_requires} %endif -%if 0%{?suse_version} >= 1330 Requires(pre): group(nogroup) -%endif %if 0%{?suse_version} > 1500 BuildRequires: sysuser-tools %sysusers_requires @@ -157,7 +154,6 @@ operating system. %package no-selenium-devel Summary: Development package pulling in all build+test dependencies except chromedriver for Selenium based tests -Group: Development/Tools/Other Requires: %{devel_no_selenium_requires} %description no-selenium-devel @@ -165,7 +161,6 @@ Development package pulling in all build+test dependencies except chromedriver f %package devel Summary: Development package pulling in all build+test dependencies -Group: Development/Tools/Other Requires: %{devel_requires} %ifarch s390x # missing chromedriver dependency @@ -177,7 +172,6 @@ Development package pulling in all build+test dependencies. %package common Summary: The openQA common tools for web-frontend and workers -Group: Development/Tools/Other Requires: %{common_requires} Requires: perl(Mojolicious) >= 8.24 @@ -187,7 +181,6 @@ openQA workers. %package worker Summary: The openQA worker -Group: Development/Tools/Other %define worker_requires_including_uncovered_in_tests %worker_requires perl(SQL::SplitStatement) Requires: %{worker_requires_including_uncovered_in_tests} # FIXME: use proper Requires(pre/post/preun/...) @@ -210,7 +203,6 @@ The openQA worker manages test engine (provided by os-autoinst package). %package client Summary: Client tools for remote openQA management -Group: Development/Tools/Other Requires: openQA-common = %{version} Requires: %client_requires @@ -221,7 +213,6 @@ a convenient helper for interacting with openQA webui REST API. %if %{with python_scripts} %package python-scripts Summary: Additional scripts in python -Group: Development/Tools/Other Requires: %python_scripts_requires %description python-scripts @@ -230,7 +221,6 @@ Additional scripts for the use of openQA in the python programming language. %package local-db Summary: Helper package to ease setup of postgresql DB -Group: Development/Tools/Other Requires: %{name} = %{version} Requires: postgresql-server BuildRequires: postgresql-server @@ -242,7 +232,6 @@ next to the webui. %package single-instance Summary: Convenience package for a single-instance setup using apache proxy -Group: Development/Tools/Other Provides: %{name}-single-instance-apache Provides: %{name}-single-instance-apache2 Requires: %{name}-local-db @@ -255,7 +244,6 @@ Use this package to setup a local instance with all services provided together. %package single-instance-nginx Summary: Convenience package for a single-instance setup using nginx proxy -Group: Development/Tools/Other Requires: %{name}-local-db Requires: %{name} = %{version} Requires: %{name}-worker = %{version} @@ -266,7 +254,6 @@ Use this package to setup a local instance with all services provided together. %package bootstrap Summary: Automated openQA setup -Group: Development/Tools/Other %description bootstrap This can automatically setup openQA - either directly on your system @@ -274,7 +261,6 @@ or within a systemd-nspawn container. %package doc Summary: The openQA documentation -Group: Development/Tools/Other %description doc Documentation material covering installation, configuration, basic test writing, etc. @@ -282,7 +268,6 @@ Covering both openQA and also os-autoinst test engine. %package auto-update Summary: Automatically upgrade and reboot the system when required -Group: Development/Tools/Other Requires: %{name}-common Requires: curl Requires: rebootmgr @@ -293,7 +278,6 @@ and rebooting the system if devel:openQA packages are stable. %package continuous-update Summary: Continuously update packages from devel:openQA -Group: Development/Tools/Other Requires: %{name}-common Requires: curl @@ -305,7 +289,6 @@ regardless of whether devel:openQA contains updates. %package munin Summary: Munin scripts -Group: Development/Tools/Other Requires: munin Requires: munin-node Requires: curl