Repomanage tests, add srpm to modules, remove redundant packages (RhBug:1804720)

dnf-behave-tests/features/fail-safe-cache.feature

@@ -27,7 +27,7 @@ Background: Copy the dnf-ci-fedora modular repository (to allow modulemd removal
 #         nodejs-1:11.1.0-1.module_2379+8d497405.x86_64
 #         nodejs-1:12.1.0-1.module_2379+8d497405.x86_64
 #         nodejs-1:8.11.4-1.module_2030+42747d40.x86_64
-#         nodejs-1:8.14.0-1.module_2030+42747d40.x86_64
+#         nodejs-1:8.14.0-1.x86_64
 #         - nodejs:8 - nodejs-1:8.11.4-1.module_2030+42747d40.x86_64
 #         - nodejs:10 - nodejs-1:10.14.1-1.module_2533+7361f245.x86_64
 #         - nodejs:11 - nodejs-1:11.1.0-1.module_2379+8d497405.x86_64
@@ -270,7 +270,7 @@ Scenario: When modular RPM is installed and the modular repo is disabled and fai
    Then the exit code is 0
     And Transaction is following
         | Action                    | Package                                            |
-        | upgrade                   | nodejs-1:8.14.0-1.module_2030+42747d41.x86_64      |
+        | upgrade                   | nodejs-1:8.14.0-1.x86_64                           |
 
 
 @bz1616167

dnf-behave-tests/features/fail-safe.feature

@@ -40,7 +40,7 @@ Background: Copy the dnf-ci-fedora-modular repo (to allow modulemd removal and s
 #         nodejs-1:11.1.0-1.module_2379+8d497405.x86_64
 #         nodejs-1:12.1.0-1.module_2379+8d497405.x86_64
 #         nodejs-1:8.11.4-1.module_2030+42747d40.x86_64
-#         nodejs-1:8.14.0-1.module_2030+42747d40.x86_64
+#         nodejs-1:8.14.0-1.x86_64
 #         - nodejs:8 - nodejs-1:8.11.4-1.module_2030+42747d40.x86_64
 #         - nodejs:10 - nodejs-1:10.14.1-1.module_2533+7361f245.x86_64
 #         - nodejs:11 - nodejs-1:11.1.0-1.module_2379+8d497405.x86_64

dnf-behave-tests/features/module/repoquery.feature

@@ -9,7 +9,9 @@ Scenario Outline: <command> returns packages from both default and enabled strea
     And stdout is
     """
     <REPOSYNC>
+    dwm-6.0-1.module_1997+c375c79c.src
     dwm-6.0-1.module_1997+c375c79c.x86_64
+    nodejs-1:8.11.4-1.module_2030+42747d40.src
     nodejs-1:8.11.4-1.module_2030+42747d40.x86_64
     nodejs-devel-1:8.11.4-1.module_2030+42747d40.x86_64
     nodejs-docs-1:8.11.4-1.module_2030+42747d40.noarch
@@ -63,7 +65,10 @@ Scenario: module repoquery can be used with both --installed and --available tog
     And stdout is
     """
     <REPOSYNC>
+    ninja-build-1.8.2-4.module_1991+4e5efe2f.src
     ninja-build-1.8.2-4.module_1991+4e5efe2f.x86_64
+    ninja-build-debuginfo-1.8.2-4.module_1991+4e5efe2f.x86_64
+    ninja-build-debugsource-1.8.2-4.module_1991+4e5efe2f.x86_64
     nodejs-1:12.1.0-1.module_2379+8d497405.x86_64
     npm-1:12.1.0-1.module_2379+8d497405.x86_64
     """

dnf-behave-tests/fixtures/specs/dnf-ci-fedora-modular-updates/modules.yaml

@@ -71,6 +71,7 @@ data:
   artifacts:
     rpms:
     - nodejs-1:8.11.4-1.module_2030+42747d40.x86_64
+    - nodejs-1:8.11.4-1.module_2030+42747d40.src
     - nodejs-devel-1:8.11.4-1.module_2030+42747d40.x86_64
     - nodejs-docs-1:8.11.4-1.module_2030+42747d40.noarch
     - npm-1:8.14.0-1.module_2030+42747d41.x86_64
@@ -171,6 +172,7 @@ data:
     - libuv-static-1:1.23.2-1.module_2365+652bf990.x86_64
     - nghttp2-0:1.34.0-1.module_2365+652bf990.x86_64
     - nodejs-1:11.1.0-1.module_2379+8d497405.x86_64
+    - nodejs-1:11.1.0-1.module_2379+8d497405.src
     - nodejs-devel-1:11.1.0-1.module_2379+8d497405.x86_64
     - nodejs-docs-1:11.1.0-1.module_2379+8d497405.noarch
     - npm-1:11.1.0-1.module_2379+8d497405.x86_64
@@ -274,6 +276,7 @@ data:
         buildorder: 10
   artifacts:
     rpms:
+    - http-parser-0:2.9.0-1.module_2672+97d6a5e9.src
     - http-parser-0:2.9.0-1.module_2672+97d6a5e9.x86_64
     - http-parser-devel-0:2.9.0-1.module_2672+97d6a5e9.x86_64
     - libnghttp2-0:1.35.1-1.module_2672+97d6a5e9.x86_64
@@ -283,8 +286,10 @@ data:
     - libuv-static-1:1.23.2-1.module_2302+4c6ccf2f.x86_64
     - nghttp2-0:1.35.1-1.module_2672+97d6a5e9.x86_64
     - nodejs-1:10.14.1-1.module_2533+7361f245.x86_64
+    - nodejs-1:10.14.1-1.module_2533+7361f245.src
     - nodejs-devel-1:10.14.1-1.module_2533+7361f245.x86_64
     - nodejs-docs-1:10.14.1-1.module_2533+7361f245.noarch
+    - npm-1:10.14.1-1.module_2533+7361f245.x86_64
 ...
 ---
 document: modulemd
@@ -381,6 +386,7 @@ data:
     - libuv-devel-1:1.23.2-1.module_2365+652bf990.x86_64
     - libuv-static-1:1.23.2-1.module_2365+652bf990.x86_64
     - nghttp2-0:1.34.0-1.module_2365+652bf990.x86_64
+    - nodejs-1:12.1.0-1.module_2379+8d497405.src
     - nodejs-1:12.1.0-1.module_2379+8d497405.x86_64
     - nodejs-devel-1:12.1.0-1.module_2379+8d497405.x86_64
     - nodejs-docs-1:12.1.0-1.module_2379+8d497405.noarch
@@ -452,20 +458,10 @@ data:
   artifacts:
     rpms:
     - postgresql-0:9.6.11-1.module_2689+ea8f147f.x86_64
-    - postgresql-contrib-0:9.6.11-1.module_2689+ea8f147f.x86_64
-    - postgresql-devel-0:9.6.11-1.module_2689+ea8f147f.x86_64
-    - postgresql-docs-0:9.6.11-1.module_2689+ea8f147f.x86_64
+    - postgresql-0:9.6.11-1.module_2689+ea8f147f.src
     - postgresql-libs-0:9.6.11-1.module_2689+ea8f147f.x86_64
-    - postgresql-plperl-0:9.6.11-1.module_2689+ea8f147f.x86_64
-    - postgresql-plpython-0:9.6.11-1.module_2689+ea8f147f.x86_64
-    - postgresql-plpython3-0:9.6.11-1.module_2689+ea8f147f.x86_64
-    - postgresql-pltcl-0:9.6.11-1.module_2689+ea8f147f.x86_64
     - postgresql-server-0:9.6.11-1.module_2689+ea8f147f.x86_64
-    - postgresql-static-0:9.6.11-1.module_2689+ea8f147f.x86_64
     - postgresql-test-0:9.6.11-1.module_2689+ea8f147f.x86_64
-    - postgresql-test-rpm-macros-0:9.6.11-1.module_2689+ea8f147f.x86_64
-    - postgresql-upgrade-0:9.6.11-1.module_2689+ea8f147f.x86_64
-    - postgresql-upgrade-devel-0:9.6.11-1.module_2689+ea8f147f.x86_64
 ...
 ---
 document: modulemd
@@ -532,21 +528,11 @@ data:
         ref: stream-postgresql-11
   artifacts:
     rpms:
+    - postgresql-0:11.1-2.module_2597+e45c4cc9.src
     - postgresql-0:11.1-2.module_2597+e45c4cc9.x86_64
-    - postgresql-contrib-0:11.1-2.module_2597+e45c4cc9.x86_64
-    - postgresql-devel-0:11.1-2.module_2597+e45c4cc9.x86_64
-    - postgresql-docs-0:11.1-2.module_2597+e45c4cc9.x86_64
     - postgresql-libs-0:11.1-2.module_2597+e45c4cc9.x86_64
-    - postgresql-plperl-0:11.1-2.module_2597+e45c4cc9.x86_64
-    - postgresql-plpython-0:11.1-2.module_2597+e45c4cc9.x86_64
-    - postgresql-plpython3-0:11.1-2.module_2597+e45c4cc9.x86_64
-    - postgresql-pltcl-0:11.1-2.module_2597+e45c4cc9.x86_64
     - postgresql-server-0:11.1-2.module_2597+e45c4cc9.x86_64
-    - postgresql-static-0:11.1-2.module_2597+e45c4cc9.x86_64
     - postgresql-test-0:11.1-2.module_2597+e45c4cc9.x86_64
-    - postgresql-test-rpm-macros-0:11.1-2.module_2597+e45c4cc9.x86_64
-    - postgresql-upgrade-0:11.1-2.module_2597+e45c4cc9.x86_64
-    - postgresql-upgrade-devel-0:11.1-2.module_2597+e45c4cc9.x86_64
 ...
 ---
 document: modulemd
@@ -614,18 +600,8 @@ data:
   artifacts:
     rpms:
     - postgresql-0:10.6-1.module_2594+0c9aadc5.x86_64
-    - postgresql-contrib-0:10.6-1.module_2594+0c9aadc5.x86_64
-    - postgresql-devel-0:10.6-1.module_2594+0c9aadc5.x86_64
-    - postgresql-docs-0:10.6-1.module_2594+0c9aadc5.x86_64
+    - postgresql-0:10.6-1.module_2594+0c9aadc5.src
     - postgresql-libs-0:10.6-1.module_2594+0c9aadc5.x86_64
-    - postgresql-plperl-0:10.6-1.module_2594+0c9aadc5.x86_64
-    - postgresql-plpython-0:10.6-1.module_2594+0c9aadc5.x86_64
-    - postgresql-plpython3-0:10.6-1.module_2594+0c9aadc5.x86_64
-    - postgresql-pltcl-0:10.6-1.module_2594+0c9aadc5.x86_64
     - postgresql-server-0:10.6-1.module_2594+0c9aadc5.x86_64
-    - postgresql-static-0:10.6-1.module_2594+0c9aadc5.x86_64
     - postgresql-test-0:10.6-1.module_2594+0c9aadc5.x86_64
-    - postgresql-test-rpm-macros-0:10.6-1.module_2594+0c9aadc5.x86_64
-    - postgresql-upgrade-0:10.6-1.module_2594+0c9aadc5.x86_64
-    - postgresql-upgrade-devel-0:10.6-1.module_2594+0c9aadc5.x86_64
 ...

dnf-behave-tests/fixtures/specs/dnf-ci-fedora-modular-updates/nodejs-8.11.4-1.module_2030+42747d40.spec

@@ -60,28 +60,10 @@ Conflicts:      nodejs > 1:8.11.4-1.module_2030+42747d40
 %description docs
 The API documentation for the Node.js JavaScript runtime.
 
-%package -n npm
-Summary:        Node.js Package Manager
-
-Provides:       npm = 1:5.6.0-1.8.11.4.1.module_2030+42747d40
-Provides:       npm = 1:5.6.0
-Provides:       npm(npm) = 5.6.0
-Provides:       npm(x86-64) = 1:5.6.0-1.8.11.4.1.module_2030+42747d40
-
-Requires:       nodejs = 1:8.11.4-1.module_2030+42747d40
-
-Obsoletes:      npm < 3.5.4-6
-
-%description -n npm
-npm is a package manager for node.js. You can use it to install and publish
-your node programs. It manages dependencies and does other cool stuff.
-
 %files
 
 %files devel
 
 %files docs
 
-%files -n npm
-
 %changelog

dnf-behave-tests/fixtures/specs/dnf-ci-fedora-modular-updates/nodejs-8.14.0-1.spec

@@ -0,0 +1,41 @@
+%undefine _debuginfo_subpackages
+
+Name:           nodejs
+Epoch:          1
+Version:        8.14.0
+Release:        1
+
+License:        MIT and ASL 2.0 and ISC and BSD
+URL:            http://nodejs.org/
+
+Summary:        JavaScript runtime
+
+Provides:       nodejs = 1:8.14.0-1
+Provides:       nodejs(x86-64) = 1:8.14.0-1
+Provides:       bundled(c-ares) = 1.10.1
+Provides:       bundled(icu) = 60.1
+Provides:       bundled(v8) = 6.2.414.54
+Provides:       nodejs(abi) = 8.11
+Provides:       nodejs(abi8) = 8.11
+Provides:       nodejs(engine) = 8.14.0
+Provides:       nodejs(v8-abi) = 6.2
+Provides:       nodejs(v8-abi6) = 6.2
+Provides:       nodejs-punycode = 2.0.0
+Provides:       npm(punycode) = 2.0.0
+
+Requires:       rtld(GNU_HASH)
+
+Conflicts:      node <= 0.3.2-12
+
+Recommends:     npm = 1:5.6.0-1.8.14.0.1.module_2030+42747d41
+
+%description
+Node.js is a platform built on Chrome's JavaScript runtime
+for easily building fast, scalable network applications.
+Node.js uses an event-driven, non-blocking I/O model that
+makes it lightweight and efficient, perfect for data-intensive
+real-time applications that run across distributed devices.
+
+%files
+
+%changelog

dnf-behave-tests/fixtures/specs/dnf-ci-fedora-modular-updates/npm-8.14.0-1.module_2030+42747d40.spec

@@ -0,0 +1,26 @@
+%undefine _debuginfo_subpackages
+
+Name:           npm
+Epoch:          1
+Version:        8.14.0
+Release:        1.module_2030+42747d41
+
+License:        MIT and ASL 2.0 and ISC and BSD
+Summary:        Node.js Package Manager
+
+Provides:       npm = 1:5.6.0-1.8.14.0.1.module_2030+42747d41
+Provides:       npm = 1:5.6.0
+Provides:       npm(npm) = 5.6.0
+Provides:       npm(x86-64) = 1:5.6.0-1.8.14.0.1.module_2030+42747d41
+
+Requires:       nodejs = 1:8.11.4-1.module_2030+42747d40
+
+Obsoletes:      npm < 3.5.4-6
+
+%description
+npm is a package manager for node.js. You can use it to install and publish
+your node programs. It manages dependencies and does other cool stuff.
+
+%files
+
+%changelog