| |
@@ -33,7 +33,8 @@
|
| |
from odcs.server.pungi import PungiSourceType
|
| |
from odcs.server.backend import (resolve_compose, get_reusable_compose,
|
| |
generate_compose, generate_pulp_compose,
|
| |
- generate_pungi_compose, validate_pungi_compose)
|
| |
+ generate_pungi_compose, validate_pungi_compose,
|
| |
+ _write_repo_file)
|
| |
from odcs.server.utils import makedirs
|
| |
import odcs.server.backend
|
| |
from .utils import ModelsBaseTest
|
| |
@@ -730,3 +731,64 @@
|
| |
db.session.commit()
|
| |
|
| |
validate_pungi_compose(self.c)
|
| |
+
|
| |
+
|
| |
+ class TestWriteRepoFile(ModelsBaseTest):
|
| |
+
|
| |
+ def setUp(self):
|
| |
+ super(TestWriteRepoFile, self).setUp()
|
| |
+
|
| |
+ self.c = Compose.create(
|
| |
+ db.session, "me", PungiSourceType.KOJI_TAG, "f26",
|
| |
+ COMPOSE_RESULTS["repository"], 60, packages='pkg1 pkg2 pkg3',
|
| |
+ arches="x86_64 i686")
|
| |
+ db.session.commit()
|
| |
+
|
| |
+ def tearDown(self):
|
| |
+ super(TestWriteRepoFile, self).tearDown()
|
| |
+ shutil.rmtree(self.c.toplevel_dir)
|
| |
+
|
| |
+ def test_write_repo_file_basearch(self):
|
| |
+ _write_repo_file(self.c)
|
| |
+ with open(self.c.result_repofile_path, "r") as f:
|
| |
+ data = f.read()
|
| |
+
|
| |
+ self.assertEqual(data, """[odcs-1]
|
| |
+ name=ODCS repository for compose odcs-1
|
| |
+ baseurl=http://localhost/odcs/latest-odcs-1-1/compose/Temporary/$basearch/os
|
| |
+ type=rpm-md
|
| |
+ skip_if_unavailable=False
|
| |
+ gpgcheck=0
|
| |
+ repo_gpgcheck=0
|
| |
+ enabled=1
|
| |
+ enabled_metadata=1
|
| |
+
|
| |
+ """)
|
| |
+
|
| |
+ def test_write_repo_file_expand_basearch(self):
|
| |
+ self.c.flags = COMPOSE_FLAGS["expand_basearch"]
|
| |
+ _write_repo_file(self.c)
|
| |
+ with open(self.c.result_repofile_path, "r") as f:
|
| |
+ data = f.read()
|
| |
+
|
| |
+ self.assertEqual(data, """[odcs-1-x86_64]
|
| |
+ name=ODCS repository for compose odcs-1-x86_64
|
| |
+ baseurl=http://localhost/odcs/latest-odcs-1-1/compose/Temporary/x86_64/os
|
| |
+ type=rpm-md
|
| |
+ skip_if_unavailable=False
|
| |
+ gpgcheck=0
|
| |
+ repo_gpgcheck=0
|
| |
+ enabled=1
|
| |
+ enabled_metadata=1
|
| |
+
|
| |
+ [odcs-1-i686]
|
| |
+ name=ODCS repository for compose odcs-1-i686
|
| |
+ baseurl=http://localhost/odcs/latest-odcs-1-1/compose/Temporary/i686/os
|
| |
+ type=rpm-md
|
| |
+ skip_if_unavailable=False
|
| |
+ gpgcheck=0
|
| |
+ repo_gpgcheck=0
|
| |
+ enabled=1
|
| |
+ enabled_metadata=1
|
| |
+
|
| |
+ """)
|
| |
See the README.md part of this change for the description of
expand_basearch
.We need this new flag to generate .repo file which can be used to install packages for both i686 and x86_64 even when you build on x86_64. This is not possible with $basearch, because it would be replaced by x86_64 by DNF and i686 packages would be unavailable.