From 30ba887df9ad6275536b99c0492005213b12d7b9174a512cf4687f4d23f4d511 Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Sun, 12 Jul 2020 03:26:44 +0000 Subject: [PATCH 1/2] Offline generation of 4.6.1594393961.00b067f5a 4.6.1594393961.00b067f5a 4.6.1594393961.00b067f5a 4.6.1594393961.00b067f5a 4.6.1594393961.00b067f5a OBS-URL: https://build.opensuse.org/package/show/devel:openQA:tested/openQA?expand=0&rev=450 --- openQA-4.6.1594309120.bdb02d947.obscpio | 3 --- openQA-4.6.1594393961.00b067f5a.obscpio | 3 +++ openQA-client-test.spec | 2 +- openQA-devel-test.spec | 2 +- openQA-test.spec | 2 +- openQA-worker-test.spec | 2 +- openQA.changes | 8 ++++++++ openQA.obsinfo | 6 +++--- openQA.spec | 14 ++++++++++++-- 9 files changed, 30 insertions(+), 12 deletions(-) delete mode 100644 openQA-4.6.1594309120.bdb02d947.obscpio create mode 100644 openQA-4.6.1594393961.00b067f5a.obscpio diff --git a/openQA-4.6.1594309120.bdb02d947.obscpio b/openQA-4.6.1594309120.bdb02d947.obscpio deleted file mode 100644 index 107138d..0000000 --- a/openQA-4.6.1594309120.bdb02d947.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c6e8781b904128a46c22ea7d34819047132a15fdab23d9617990dcc944132e70 -size 12101133 diff --git a/openQA-4.6.1594393961.00b067f5a.obscpio b/openQA-4.6.1594393961.00b067f5a.obscpio new file mode 100644 index 0000000..9ec6122 --- /dev/null +++ b/openQA-4.6.1594393961.00b067f5a.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04b798874ebc4a8052fecc3f9cfee52265137e725b98049d85e2af3a47304b5c +size 12102157 diff --git a/openQA-client-test.spec b/openQA-client-test.spec index 1990838..b1f0213 100644 --- a/openQA-client-test.spec +++ b/openQA-client-test.spec @@ -18,7 +18,7 @@ %define short_name openQA-client Name: %{short_name}-test -Version: 4.6.1594309120.bdb02d947 +Version: 4.6.1594393961.00b067f5a Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later diff --git a/openQA-devel-test.spec b/openQA-devel-test.spec index e62d7fa..16fa293 100644 --- a/openQA-devel-test.spec +++ b/openQA-devel-test.spec @@ -18,7 +18,7 @@ %define short_name openQA-devel Name: %{short_name}-test -Version: 4.6.1594309120.bdb02d947 +Version: 4.6.1594393961.00b067f5a Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later diff --git a/openQA-test.spec b/openQA-test.spec index 6957ec3..15c1a2f 100644 --- a/openQA-test.spec +++ b/openQA-test.spec @@ -18,7 +18,7 @@ %define short_name openQA Name: %{short_name}-test -Version: 4.6.1594309120.bdb02d947 +Version: 4.6.1594393961.00b067f5a Release: 0 Summary: Test package for openQA License: GPL-2.0-or-later diff --git a/openQA-worker-test.spec b/openQA-worker-test.spec index 0b28343..3ffba70 100644 --- a/openQA-worker-test.spec +++ b/openQA-worker-test.spec @@ -18,7 +18,7 @@ %define short_name openQA-worker Name: %{short_name}-test -Version: 4.6.1594309120.bdb02d947 +Version: 4.6.1594393961.00b067f5a Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later diff --git a/openQA.changes b/openQA.changes index b3679b4..918cea0 100644 --- a/openQA.changes +++ b/openQA.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Jul 12 03:26:24 UTC 2020 - coolo@suse.com + +- Update to version 4.6.1594393961.00b067f5a: + * mergify: Wait for OBS Package Build as well after we have it back + * spec: Fix build missing "devel" package + * spec: Prevent unresolvable on ppc64le with no-selenium-devel subpackage + ------------------------------------------------------------------- Thu Jul 09 19:26:19 UTC 2020 - coolo@suse.com diff --git a/openQA.obsinfo b/openQA.obsinfo index d46d61a..765cb48 100644 --- a/openQA.obsinfo +++ b/openQA.obsinfo @@ -1,5 +1,5 @@ name: openQA -version: 4.6.1594309120.bdb02d947 -mtime: 1594309120 -commit: bdb02d94711bc351e67f82474e891f5711b55f33 +version: 4.6.1594393961.00b067f5a +mtime: 1594393961 +commit: 00b067f5ae830fed1eb89ea7479f132f0192a1e3 diff --git a/openQA.spec b/openQA.spec index ce899a9..3065f68 100644 --- a/openQA.spec +++ b/openQA.spec @@ -70,10 +70,12 @@ %define qemu qemu %endif # The following line is generated from dependencies.yaml -%define devel_requires %build_requires %qemu %test_requires chromedriver curl perl(Devel::Cover) perl(Devel::Cover::Report::Codecov) perl(Perl::Tidy) postgresql-devel rsync sudo tar xorg-x11-fonts +%define devel_no_selenium_requires %build_requires %qemu %test_requires curl perl(Devel::Cover) perl(Devel::Cover::Report::Codecov) perl(Perl::Tidy) postgresql-devel rsync sudo tar xorg-x11-fonts +# The following line is generated from dependencies.yaml +%define devel_requires %devel_no_selenium_requires chromedriver Name: openQA -Version: 4.6.1594309120.bdb02d947 +Version: 4.6.1594393961.00b067f5a Release: 0 Summary: The openQA web-frontend, scheduler and tools License: GPL-2.0-or-later @@ -132,6 +134,14 @@ revision of the operating system, reporting the errors detected for each combination of hardware configuration, installation options and variant of the 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 +Development package pulling in all build+test dependencies except chromedriver for Selenium based tests. + %package devel Summary: Development package pulling in all build+test dependencies Group: Development/Tools/Other From 40726c6d3aaacae6bb490edba40de2c5e8eea488265c8ac3e97d96f83b69e0df Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Tue, 14 Jul 2020 11:26:06 +0000 Subject: [PATCH 2/2] Offline generation of 4.6.1594640971.bf4138e4b 4.6.1594640971.bf4138e4b 4.6.1594640971.bf4138e4b 4.6.1594640971.bf4138e4b 4.6.1594640971.bf4138e4b OBS-URL: https://build.opensuse.org/package/show/devel:openQA:tested/openQA?expand=0&rev=451 --- openQA-4.6.1594393961.00b067f5a.obscpio | 3 --- openQA-4.6.1594640971.bf4138e4b.obscpio | 3 +++ openQA-client-test.spec | 2 +- openQA-devel-test.spec | 2 +- openQA-test.spec | 2 +- openQA-worker-test.spec | 2 +- openQA.changes | 6 ++++-- openQA.obsinfo | 6 +++--- openQA.spec | 4 +++- 9 files changed, 17 insertions(+), 13 deletions(-) delete mode 100644 openQA-4.6.1594393961.00b067f5a.obscpio create mode 100644 openQA-4.6.1594640971.bf4138e4b.obscpio diff --git a/openQA-4.6.1594393961.00b067f5a.obscpio b/openQA-4.6.1594393961.00b067f5a.obscpio deleted file mode 100644 index 9ec6122..0000000 --- a/openQA-4.6.1594393961.00b067f5a.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:04b798874ebc4a8052fecc3f9cfee52265137e725b98049d85e2af3a47304b5c -size 12102157 diff --git a/openQA-4.6.1594640971.bf4138e4b.obscpio b/openQA-4.6.1594640971.bf4138e4b.obscpio new file mode 100644 index 0000000..2c622f6 --- /dev/null +++ b/openQA-4.6.1594640971.bf4138e4b.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9af72e8b8fad3ee8eacb74b7eea3ec7b3f93dd6a84f885727c34adcba4dbb612 +size 12102157 diff --git a/openQA-client-test.spec b/openQA-client-test.spec index b1f0213..cb1c14f 100644 --- a/openQA-client-test.spec +++ b/openQA-client-test.spec @@ -18,7 +18,7 @@ %define short_name openQA-client Name: %{short_name}-test -Version: 4.6.1594393961.00b067f5a +Version: 4.6.1594640971.bf4138e4b Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later diff --git a/openQA-devel-test.spec b/openQA-devel-test.spec index 16fa293..4480ee1 100644 --- a/openQA-devel-test.spec +++ b/openQA-devel-test.spec @@ -18,7 +18,7 @@ %define short_name openQA-devel Name: %{short_name}-test -Version: 4.6.1594393961.00b067f5a +Version: 4.6.1594640971.bf4138e4b Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later diff --git a/openQA-test.spec b/openQA-test.spec index 15c1a2f..8eb924e 100644 --- a/openQA-test.spec +++ b/openQA-test.spec @@ -18,7 +18,7 @@ %define short_name openQA Name: %{short_name}-test -Version: 4.6.1594393961.00b067f5a +Version: 4.6.1594640971.bf4138e4b Release: 0 Summary: Test package for openQA License: GPL-2.0-or-later diff --git a/openQA-worker-test.spec b/openQA-worker-test.spec index 3ffba70..61b182a 100644 --- a/openQA-worker-test.spec +++ b/openQA-worker-test.spec @@ -18,7 +18,7 @@ %define short_name openQA-worker Name: %{short_name}-test -Version: 4.6.1594393961.00b067f5a +Version: 4.6.1594640971.bf4138e4b Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later diff --git a/openQA.changes b/openQA.changes index 918cea0..4422ff1 100644 --- a/openQA.changes +++ b/openQA.changes @@ -1,7 +1,9 @@ ------------------------------------------------------------------- -Sun Jul 12 03:26:24 UTC 2020 - coolo@suse.com +Mon Jul 13 12:47:34 UTC 2020 - coolo@suse.com -- Update to version 4.6.1594393961.00b067f5a: +- Update to version 4.6.1594640971.bf4138e4b: + * spec: Exclude flaky t/api/14-plugin_obs_rsync_async.t from tests + * doc: Add hardware recommendations * mergify: Wait for OBS Package Build as well after we have it back * spec: Fix build missing "devel" package * spec: Prevent unresolvable on ppc64le with no-selenium-devel subpackage diff --git a/openQA.obsinfo b/openQA.obsinfo index 765cb48..c10aa05 100644 --- a/openQA.obsinfo +++ b/openQA.obsinfo @@ -1,5 +1,5 @@ name: openQA -version: 4.6.1594393961.00b067f5a -mtime: 1594393961 -commit: 00b067f5ae830fed1eb89ea7479f132f0192a1e3 +version: 4.6.1594640971.bf4138e4b +mtime: 1594640971 +commit: bf4138e4b9063b03d7c3dc72444fc9ddae1dc461 diff --git a/openQA.spec b/openQA.spec index 3065f68..8c7bc89 100644 --- a/openQA.spec +++ b/openQA.spec @@ -75,7 +75,7 @@ %define devel_requires %devel_no_selenium_requires chromedriver Name: openQA -Version: 4.6.1594393961.00b067f5a +Version: 4.6.1594640971.bf4138e4b Release: 0 Summary: The openQA web-frontend, scheduler and tools License: GPL-2.0-or-later @@ -259,9 +259,11 @@ export LC_ALL=en_US.UTF-8 # Skip tests not working currently, or flaky, and Selenium tests # https://progress.opensuse.org/issues/19652 # 17-labels_carry_over.t: https://progress.opensuse.org/issues/60209 +# api/14-plugin_obs_rsync_async.t: https://progress.opensuse.org/issues/68836 rm \ t/17-labels_carry_over.t \ t/25-cache-service.t \ + t/api/14-plugin_obs_rsync_async.t \ t/ui/*.t make test OBS_RUN=1 PROVE_ARGS='-l -r -v' TEST_PG_PATH=%{buildroot}/DB