Drop compatibility with ancient productmd
All checks were successful
Tests / test (pull_request) Successful in 3m21s
All checks were successful
Tests / test (pull_request) Successful in 3m21s
Productmd 1.1 is not going to be seen in the tests on any recent system. No need keep the compatibility anymore.
This commit is contained in:
parent
8984c68cf7
commit
f18c2fdd22
2 changed files with 4 additions and 318 deletions
|
|
@ -1,302 +0,0 @@
|
|||
[compose]
|
||||
date = 20160720
|
||||
id = DP-1.0-20160720.t.8
|
||||
respin = 8
|
||||
type = test
|
||||
|
||||
[product]
|
||||
family = Dummy Product
|
||||
name = DP-1.0-20160720.t.8
|
||||
short = DP
|
||||
type = ga
|
||||
variants = Client,Everything,Live,Server
|
||||
version = 1.0
|
||||
|
||||
[product-Server-Gluster]
|
||||
is_layered = true
|
||||
name = Gluster
|
||||
short = Gluster
|
||||
type = ga
|
||||
version = 2.3
|
||||
|
||||
[variant-Client]
|
||||
arches = i386,x86_64
|
||||
id = Client
|
||||
name = Client
|
||||
type = variant
|
||||
uid = Client
|
||||
variants = Client-optional
|
||||
|
||||
[variant-Client-optional]
|
||||
arches = i386,x86_64
|
||||
id = optional
|
||||
name = optional
|
||||
type = optional
|
||||
uid = Client-optional
|
||||
|
||||
[variant-Client-optional.i386]
|
||||
debug_dir = Client-optional/i386/debug/tree
|
||||
debug_packages = Client-optional/i386/debug/tree/Packages
|
||||
debug_repository = Client-optional/i386/debug/tree
|
||||
debug_tree = Client-optional/i386/debug/tree
|
||||
debuginfo = Client-optional/i386/debug/tree
|
||||
os_dir = Client-optional/i386/os
|
||||
os_tree = Client-optional/i386/os
|
||||
packages = Client-optional/i386/os/Packages
|
||||
repository = Client-optional/i386/os
|
||||
source_dir = Client-optional/source/tree
|
||||
source_packages = Client-optional/source/tree/Packages
|
||||
source_repository = Client-optional/source/tree
|
||||
source_tree = Client-optional/source/tree
|
||||
|
||||
[variant-Client-optional.x86_64]
|
||||
debug_dir = Client-optional/x86_64/debug/tree
|
||||
debug_packages = Client-optional/x86_64/debug/tree/Packages
|
||||
debug_repository = Client-optional/x86_64/debug/tree
|
||||
debug_tree = Client-optional/x86_64/debug/tree
|
||||
debuginfo = Client-optional/x86_64/debug/tree
|
||||
os_dir = Client-optional/x86_64/os
|
||||
os_tree = Client-optional/x86_64/os
|
||||
packages = Client-optional/x86_64/os/Packages
|
||||
repository = Client-optional/x86_64/os
|
||||
source_dir = Client-optional/source/tree
|
||||
source_packages = Client-optional/source/tree/Packages
|
||||
source_repository = Client-optional/source/tree
|
||||
source_tree = Client-optional/source/tree
|
||||
|
||||
[variant-Client.i386]
|
||||
debug_dir = Client/i386/debug/tree
|
||||
debug_packages = Client/i386/debug/tree/Packages
|
||||
debug_repository = Client/i386/debug/tree
|
||||
debug_tree = Client/i386/debug/tree
|
||||
debuginfo = Client/i386/debug/tree
|
||||
iso_dir = Client/i386/iso
|
||||
isos = Client/i386/iso
|
||||
os_dir = Client/i386/os
|
||||
os_tree = Client/i386/os
|
||||
packages = Client/i386/os/Packages
|
||||
repository = Client/i386/os
|
||||
source_dir = Client/source/tree
|
||||
source_iso_dir = Client/source/iso
|
||||
source_isos = Client/source/iso
|
||||
source_packages = Client/source/tree/Packages
|
||||
source_repository = Client/source/tree
|
||||
source_tree = Client/source/tree
|
||||
|
||||
[variant-Client.x86_64]
|
||||
debug_dir = Client/x86_64/debug/tree
|
||||
debug_packages = Client/x86_64/debug/tree/Packages
|
||||
debug_repository = Client/x86_64/debug/tree
|
||||
debug_tree = Client/x86_64/debug/tree
|
||||
debuginfo = Client/x86_64/debug/tree
|
||||
iso_dir = Client/x86_64/iso
|
||||
isos = Client/x86_64/iso
|
||||
os_dir = Client/x86_64/os
|
||||
os_tree = Client/x86_64/os
|
||||
packages = Client/x86_64/os/Packages
|
||||
repository = Client/x86_64/os
|
||||
source_dir = Client/source/tree
|
||||
source_iso_dir = Client/source/iso
|
||||
source_isos = Client/source/iso
|
||||
source_packages = Client/source/tree/Packages
|
||||
source_repository = Client/source/tree
|
||||
source_tree = Client/source/tree
|
||||
|
||||
[variant-Everything]
|
||||
arches = i386,x86_64
|
||||
id = Everything
|
||||
name = Everything
|
||||
type = variant
|
||||
uid = Everything
|
||||
|
||||
[variant-Everything.i386]
|
||||
debug_dir = Everything/i386/debug/tree
|
||||
debug_packages = Everything/i386/debug/tree/Packages
|
||||
debug_repository = Everything/i386/debug/tree
|
||||
debug_tree = Everything/i386/debug/tree
|
||||
debuginfo = Everything/i386/debug/tree
|
||||
iso_dir = Everything/i386/iso
|
||||
isos = Everything/i386/iso
|
||||
os_dir = Everything/i386/os
|
||||
os_tree = Everything/i386/os
|
||||
packages = Everything/i386/os/Packages
|
||||
repository = Everything/i386/os
|
||||
source_dir = Everything/source/tree
|
||||
source_iso_dir = Everything/source/iso
|
||||
source_isos = Everything/source/iso
|
||||
source_packages = Everything/source/tree/Packages
|
||||
source_repository = Everything/source/tree
|
||||
source_tree = Everything/source/tree
|
||||
|
||||
[variant-Everything.x86_64]
|
||||
debug_dir = Everything/x86_64/debug/tree
|
||||
debug_packages = Everything/x86_64/debug/tree/Packages
|
||||
debug_repository = Everything/x86_64/debug/tree
|
||||
debug_tree = Everything/x86_64/debug/tree
|
||||
debuginfo = Everything/x86_64/debug/tree
|
||||
iso_dir = Everything/x86_64/iso
|
||||
isos = Everything/x86_64/iso
|
||||
os_dir = Everything/x86_64/os
|
||||
os_tree = Everything/x86_64/os
|
||||
packages = Everything/x86_64/os/Packages
|
||||
repository = Everything/x86_64/os
|
||||
source_dir = Everything/source/tree
|
||||
source_iso_dir = Everything/source/iso
|
||||
source_isos = Everything/source/iso
|
||||
source_packages = Everything/source/tree/Packages
|
||||
source_repository = Everything/source/tree
|
||||
source_tree = Everything/source/tree
|
||||
|
||||
[variant-Live]
|
||||
arches = x86_64
|
||||
id = Live
|
||||
name = Live
|
||||
type = variant
|
||||
uid = Live
|
||||
|
||||
[variant-Live.x86_64]
|
||||
debug_dir = Live/x86_64/debug/tree
|
||||
debug_packages = Live/x86_64/debug/tree/Packages
|
||||
debug_repository = Live/x86_64/debug/tree
|
||||
debug_tree = Live/x86_64/debug/tree
|
||||
debuginfo = Live/x86_64/debug/tree
|
||||
iso_dir = Live/x86_64/iso
|
||||
isos = Live/x86_64/iso
|
||||
os_dir = Live/x86_64/os
|
||||
os_tree = Live/x86_64/os
|
||||
packages = Live/x86_64/os/Packages
|
||||
repository = Live/x86_64/os
|
||||
source_dir = Live/source/tree
|
||||
source_iso_dir = Live/source/iso
|
||||
source_isos = Live/source/iso
|
||||
source_packages = Live/source/tree/Packages
|
||||
source_repository = Live/source/tree
|
||||
source_tree = Live/source/tree
|
||||
|
||||
[variant-Server]
|
||||
arches = s390x,x86_64
|
||||
id = Server
|
||||
name = Server
|
||||
type = variant
|
||||
uid = Server
|
||||
variants = Server-Gluster,Server-ResilientStorage,Server-optional
|
||||
|
||||
[variant-Server-Gluster]
|
||||
arches = x86_64
|
||||
id = Gluster
|
||||
name = Gluster Layered Product
|
||||
type = layered-product
|
||||
uid = Server-Gluster
|
||||
|
||||
[variant-Server-Gluster.x86_64]
|
||||
debug_dir = Server-Gluster/x86_64/debug/tree
|
||||
debug_packages = Server-Gluster/x86_64/debug/tree/Packages
|
||||
debug_repository = Server-Gluster/x86_64/debug/tree
|
||||
debug_tree = Server-Gluster/x86_64/debug/tree
|
||||
debuginfo = Server-Gluster/x86_64/debug/tree
|
||||
os_dir = Server-Gluster/x86_64/os
|
||||
os_tree = Server-Gluster/x86_64/os
|
||||
packages = Server-Gluster/x86_64/os/Packages
|
||||
repository = Server-Gluster/x86_64/os
|
||||
source_dir = Server-Gluster/source/tree
|
||||
source_packages = Server-Gluster/source/tree/Packages
|
||||
source_repository = Server-Gluster/source/tree
|
||||
source_tree = Server-Gluster/source/tree
|
||||
|
||||
[variant-Server-ResilientStorage]
|
||||
arches = x86_64
|
||||
id = ResilientStorage
|
||||
name = Resilient Storage
|
||||
type = addon
|
||||
uid = Server-ResilientStorage
|
||||
|
||||
[variant-Server-ResilientStorage.x86_64]
|
||||
debug_dir = Server/x86_64/debug/tree
|
||||
debug_packages = Server/x86_64/debug/tree/addons/ResilientStorage
|
||||
debug_repository = Server/x86_64/debug/tree/addons/ResilientStorage
|
||||
debug_tree = Server/x86_64/debug/tree
|
||||
debuginfo = Server/x86_64/debug/tree/addons/ResilientStorage
|
||||
os_dir = Server/x86_64/os
|
||||
os_tree = Server/x86_64/os
|
||||
packages = Server/x86_64/os/addons/ResilientStorage
|
||||
repository = Server/x86_64/os/addons/ResilientStorage
|
||||
source_dir = Server/source/tree
|
||||
source_packages = Server/source/tree/addons/ResilientStorage
|
||||
source_repository = Server/source/tree/addons/ResilientStorage
|
||||
source_tree = Server/source/tree
|
||||
|
||||
[variant-Server-optional]
|
||||
arches = s390x,x86_64
|
||||
id = optional
|
||||
name = optional
|
||||
type = optional
|
||||
uid = Server-optional
|
||||
|
||||
[variant-Server-optional.s390x]
|
||||
debug_dir = Server-optional/s390x/debug/tree
|
||||
debug_packages = Server-optional/s390x/debug/tree/Packages
|
||||
debug_repository = Server-optional/s390x/debug/tree
|
||||
debug_tree = Server-optional/s390x/debug/tree
|
||||
debuginfo = Server-optional/s390x/debug/tree
|
||||
os_dir = Server-optional/s390x/os
|
||||
os_tree = Server-optional/s390x/os
|
||||
packages = Server-optional/s390x/os/Packages
|
||||
repository = Server-optional/s390x/os
|
||||
source_dir = Server-optional/source/tree
|
||||
source_packages = Server-optional/source/tree/Packages
|
||||
source_repository = Server-optional/source/tree
|
||||
source_tree = Server-optional/source/tree
|
||||
|
||||
[variant-Server-optional.x86_64]
|
||||
debug_dir = Server-optional/x86_64/debug/tree
|
||||
debug_packages = Server-optional/x86_64/debug/tree/Packages
|
||||
debug_repository = Server-optional/x86_64/debug/tree
|
||||
debug_tree = Server-optional/x86_64/debug/tree
|
||||
debuginfo = Server-optional/x86_64/debug/tree
|
||||
os_dir = Server-optional/x86_64/os
|
||||
os_tree = Server-optional/x86_64/os
|
||||
packages = Server-optional/x86_64/os/Packages
|
||||
repository = Server-optional/x86_64/os
|
||||
source_dir = Server-optional/source/tree
|
||||
source_packages = Server-optional/source/tree/Packages
|
||||
source_repository = Server-optional/source/tree
|
||||
source_tree = Server-optional/source/tree
|
||||
|
||||
[variant-Server.s390x]
|
||||
debug_dir = Server/s390x/debug/tree
|
||||
debug_packages = Server/s390x/debug/tree/Packages
|
||||
debug_repository = Server/s390x/debug/tree
|
||||
debug_tree = Server/s390x/debug/tree
|
||||
debuginfo = Server/s390x/debug/tree
|
||||
iso_dir = Server/s390x/iso
|
||||
isos = Server/s390x/iso
|
||||
os_dir = Server/s390x/os
|
||||
os_tree = Server/s390x/os
|
||||
packages = Server/s390x/os/Packages
|
||||
repository = Server/s390x/os
|
||||
source_dir = Server/source/tree
|
||||
source_iso_dir = Server/source/iso
|
||||
source_isos = Server/source/iso
|
||||
source_packages = Server/source/tree/Packages
|
||||
source_repository = Server/source/tree
|
||||
source_tree = Server/source/tree
|
||||
|
||||
[variant-Server.x86_64]
|
||||
debug_dir = Server/x86_64/debug/tree
|
||||
debug_packages = Server/x86_64/debug/tree/Packages
|
||||
debug_repository = Server/x86_64/debug/tree
|
||||
debug_tree = Server/x86_64/debug/tree
|
||||
debuginfo = Server/x86_64/debug/tree
|
||||
iso_dir = Server/x86_64/iso
|
||||
isos = Server/x86_64/iso
|
||||
os_dir = Server/x86_64/os
|
||||
os_tree = Server/x86_64/os
|
||||
packages = Server/x86_64/os/Packages
|
||||
repository = Server/x86_64/os
|
||||
source_dir = Server/source/tree
|
||||
source_iso_dir = Server/source/iso
|
||||
source_isos = Server/source/iso
|
||||
source_packages = Server/source/tree/Packages
|
||||
source_repository = Server/source/tree
|
||||
source_tree = Server/source/tree
|
||||
|
||||
|
|
@ -15,18 +15,6 @@ from compose_utils.legacy import write_legacy_composeinfo
|
|||
BASE_PATH = os.path.join(os.path.dirname(__file__), 'composes', 'DP-1.0-20160720.t.8')
|
||||
|
||||
|
||||
def get_expected(pref=''):
|
||||
import pkg_resources
|
||||
from distutils.version import LooseVersion
|
||||
try:
|
||||
productmd_ver = LooseVersion(pkg_resources.get_distribution('productmd').version)
|
||||
if productmd_ver == LooseVersion('1.1'):
|
||||
return pref + '.productmd11.composeinfo'
|
||||
except pkg_resources.DistributionNotFound:
|
||||
pass
|
||||
return pref + '.composeinfo'
|
||||
|
||||
|
||||
class LegacyComposeInfoTest(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
|
|
@ -35,7 +23,7 @@ class LegacyComposeInfoTest(unittest.TestCase):
|
|||
def test_write_legacy_file(self):
|
||||
output = StringIO()
|
||||
write_legacy_composeinfo(self.compose.info, output)
|
||||
with open(os.path.join(BASE_PATH, 'compose', get_expected())) as f:
|
||||
with open(os.path.join(BASE_PATH, 'compose', '.composeinfo')) as f:
|
||||
expected = f.read().split()
|
||||
self.assertEqual(output.getvalue().split(), expected)
|
||||
|
||||
|
|
@ -44,7 +32,7 @@ class LegacyComposeInfoTest(unittest.TestCase):
|
|||
write_legacy_composeinfo(
|
||||
self.compose.info, output, variants=["Client", "Server"]
|
||||
)
|
||||
with open(os.path.join(BASE_PATH, 'compose', get_expected(".filtered"))) as f:
|
||||
with open(os.path.join(BASE_PATH, 'compose', '.filtered.composeinfo')) as f:
|
||||
expected = f.read().split()
|
||||
self.assertEqual(output.getvalue().split(), expected)
|
||||
|
||||
|
|
@ -58,7 +46,7 @@ class LegacyComposeInfoTest(unittest.TestCase):
|
|||
setattr(self.compose.info.variants['Server'].paths, type, {})
|
||||
|
||||
write_legacy_composeinfo(self.compose.info, output)
|
||||
with open(os.path.join(BASE_PATH, 'compose', get_expected('.empty'))) as f:
|
||||
with open(os.path.join(BASE_PATH, 'compose', '.empty.composeinfo')) as f:
|
||||
expected = f.read().split()
|
||||
self.assertEqual(output.getvalue().split(), expected)
|
||||
|
||||
|
|
@ -78,7 +66,7 @@ class LegacyComposeInfoTest(unittest.TestCase):
|
|||
# Mark Client as addon for Server.
|
||||
write_legacy_composeinfo(self.compose.info, output, [('Server', 'Client')])
|
||||
self.maxDiff = None
|
||||
with open(os.path.join(BASE_PATH, 'compose', get_expected('.addon'))) as f:
|
||||
with open(os.path.join(BASE_PATH, 'compose', '.addon.composeinfo')) as f:
|
||||
expected = f.read().split()
|
||||
self.assertEqual(output.getvalue().split(), expected)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue