Merge f071bd0 into 5eec8c1

CHANGELOG.md

@@ -9,7 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Fix LocalLoader couldn't populate version field, now it populates the version field
-  based on directory name
+  based on directory name.
+- Fix remote loader couldn't load all config files with same name from different branches.
+- Make version an option argument to Loader.load(), so it could load right version of
+  config file.
 
 ## [v2.0.0] - 2019-10-16
 

setup.py

@@ -21,7 +21,7 @@ def get_requirements():
 
 setup(
     name="ubi-config",
-    version="2.0.1",
+    version="2.1.0",
     author="",
     author_email="",
     packages=find_packages(exclude=["tests", "tests.*"]),

tests/data/configs/ubi7.1/rhel-7-server.yaml

@@ -0,0 +1,52 @@
+content_sets:
+  # This defines the mapping between UBI content sets and underlying content sets
+  rpm:
+    output: ubi-7-server-rpms
+    input: rhel-7-server-rpms
+  srpm:
+    output: ubi-7-server-source-rpms
+    input: rhel-7-server-source-rpms
+  debuginfo:
+    output: ubi-7-server-debug-rpms
+    input: rhel-7-server-debug-rpms
+
+arches:
+ - src
+ - x86_64
+packages:
+  include:
+  - GConf2.*
+  - GConf2-debuginfo.*
+  - GeoIP.*
+  - GeoIP-debuginfo.*
+  - ImageMagick.*
+  - ImageMagick-debuginfo.*
+  - MySQL-python.*
+  - MySQL-python-debuginfo.*
+  - OpenEXR.src
+  - OpenEXR-debuginfo.*
+  - OpenEXR-libs.*
+  - PyYAML.*
+  - PyYAML-debuginfo.*
+  - acl.*
+  - acl-debuginfo.*
+  - adobe-mappings-cmap.*
+  - adobe-mappings-cmap-deprecated.*
+  - adobe-mappings-pdf.*
+  - alsa-lib.*
+  - alsa-lib-debuginfo.*
+  - apr.*
+  # Blacklist of packages to exclude
+  exclude:
+  - kernel
+  - kernel-doc
+  - kmod-kvdo
+  - kernel.src
+  - kernel-debug-debuginfo
+  - kernel-debuginfo
+  - kernel-debuginfo-common-aarch64
+  - kernel-debuginfo-common-ppc64le
+  - kernel-debuginfo-common-s390x
+  - kernel-debuginfo-common-x86_64
+  - kernel-tools-debuginfo
+  - linux-firmware

tests/data/configs/ubi7/rhel-7-server.yaml

@@ -0,0 +1,52 @@
+content_sets:
+  # This defines the mapping between UBI content sets and underlying content sets
+  rpm:
+    output: ubi-7-server-rpms
+    input: rhel-7-server-rpms
+  srpm:
+    output: ubi-7-server-source-rpms
+    input: rhel-7-server-source-rpms
+  debuginfo:
+    output: ubi-7-server-debug-rpms
+    input: rhel-7-server-debug-rpms
+
+arches:
+ - src
+ - x86_64
+packages:
+  include:
+  - GConf2.*
+  - GConf2-debuginfo.*
+  - GeoIP.*
+  - GeoIP-debuginfo.*
+  - ImageMagick.*
+  - ImageMagick-debuginfo.*
+  - MySQL-python.*
+  - MySQL-python-debuginfo.*
+  - OpenEXR.src
+  - OpenEXR-debuginfo.*
+  - OpenEXR-libs.*
+  - PyYAML.*
+  - PyYAML-debuginfo.*
+  - acl.*
+  - acl-debuginfo.*
+  - adobe-mappings-cmap.*
+  - adobe-mappings-cmap-deprecated.*
+  - adobe-mappings-pdf.*
+  - alsa-lib.*
+  - alsa-lib-debuginfo.*
+  - apr.*
+  # Blacklist of packages to exclude
+  exclude:
+  - kernel
+  - kernel-doc
+  - kmod-kvdo
+  - kernel.src
+  - kernel-debug-debuginfo
+  - kernel-debuginfo
+  - kernel-debuginfo-common-aarch64
+  - kernel-debuginfo-common-ppc64le
+  - kernel-debuginfo-common-s390x
+  - kernel-debuginfo-common-x86_64
+  - kernel-tools-debuginfo
+  - linux-firmware

tests/ubiconfig/loaders/test_gitlab_loader.py

@@ -21,7 +21,7 @@ def test_bad_yaml():
             mock_json(
                 [
                     {
-                        "name": "master",
+                        "name": "ubi7",
                         "commit": {"id": "2189cbc2e447f796fe354f8d784d76b0a2620248"},
                     }
                 ]