Merge "Add auxiliary repo to ubuntu and centos"
This commit is contained in:
commit
64f114c02a
@ -1237,6 +1237,10 @@
|
||||
name: "mos"
|
||||
uri: "http://{settings.MASTER_IP}:8080/{cluster.release.version}/centos/x86_64"
|
||||
priority: null
|
||||
- type: "rpm"
|
||||
name: "Auxiliary"
|
||||
uri: "http://{settings.MASTER_IP}:8080/{cluster.release.version}/centos/auxiliary"
|
||||
priority: null
|
||||
generated:
|
||||
cobbler:
|
||||
profile:
|
||||
@ -1316,6 +1320,12 @@
|
||||
suite: "mos6.1-holdback"
|
||||
section: "main restricted"
|
||||
priority: 1100
|
||||
- type: "deb"
|
||||
name: "Auxiliary"
|
||||
uri: "http://{settings.MASTER_IP}:8080/{cluster.release.version}/ubuntu/auxiliary"
|
||||
suite: "auxiliary"
|
||||
section: "main restricted"
|
||||
priority: 1050
|
||||
generated:
|
||||
repo_setup:
|
||||
installer_kernel:
|
||||
|
@ -422,12 +422,20 @@ class TestAlwaysEditable(BaseIntegrationTest):
|
||||
self._put(data, expect_code=403)
|
||||
|
||||
attrs = self.cluster.attributes.editable
|
||||
self.assertEqual(attrs['repo_setup']['repos']['value'], [{
|
||||
'type': 'rpm',
|
||||
'name': 'mos',
|
||||
'uri': 'http://127.0.0.1:8080/2014.2-6.1/centos/x86_64',
|
||||
'priority': None,
|
||||
}])
|
||||
self.assertItemsEqual(attrs['repo_setup']['repos']['value'], [
|
||||
{
|
||||
'type': 'rpm',
|
||||
'name': 'mos',
|
||||
'uri': 'http://127.0.0.1:8080/2014.2-6.1/centos/x86_64',
|
||||
'priority': None,
|
||||
},
|
||||
{
|
||||
'type': 'rpm',
|
||||
'name': 'Auxiliary',
|
||||
'uri': 'http://127.0.0.1:8080/2014.2-6.1/centos/auxiliary',
|
||||
'priority': None,
|
||||
},
|
||||
])
|
||||
|
||||
|
||||
class TestVmwareAttributes(BaseIntegrationTest):
|
||||
|
@ -80,7 +80,7 @@ class TestHooksSerializersUbuntu(BaseTaskSerializationTestUbuntu):
|
||||
task = tasks_serializer.UploadMOSRepo(
|
||||
task_config, self.cluster, self.nodes)
|
||||
serialized = list(task.serialize())
|
||||
self.assertEqual(len(serialized), 14)
|
||||
self.assertEqual(len(serialized), 16)
|
||||
self.assertEqual(serialized[0]['type'], 'shell')
|
||||
self.assertEqual(
|
||||
serialized[0]['parameters']['cmd'], '> /etc/apt/sources.list')
|
||||
@ -96,8 +96,10 @@ class TestHooksSerializersUbuntu(BaseTaskSerializationTestUbuntu):
|
||||
self.assertEqual(serialized[10]['type'], 'upload_file')
|
||||
self.assertEqual(serialized[11]['type'], 'upload_file')
|
||||
self.assertEqual(serialized[12]['type'], 'upload_file')
|
||||
self.assertEqual(serialized[13]['type'], 'shell')
|
||||
self.assertEqual(serialized[13]['parameters']['cmd'], 'apt-get update')
|
||||
self.assertEqual(serialized[13]['type'], 'upload_file')
|
||||
self.assertEqual(serialized[14]['type'], 'upload_file')
|
||||
self.assertEqual(serialized[15]['type'], 'shell')
|
||||
self.assertEqual(serialized[15]['parameters']['cmd'], 'apt-get update')
|
||||
self.assertItemsEqual(serialized[3]['uids'], self.all_uids)
|
||||
|
||||
|
||||
@ -126,11 +128,12 @@ class TestHooksSerializers(BaseTaskSerializationTest):
|
||||
task = tasks_serializer.UploadMOSRepo(
|
||||
task_config, self.cluster, self.nodes)
|
||||
serialized = list(task.serialize())
|
||||
self.assertEqual(len(serialized), 2)
|
||||
self.assertEqual(len(serialized), 3)
|
||||
self.assertEqual(serialized[0]['type'], 'upload_file')
|
||||
self.assertEqual(serialized[1]['type'], 'shell')
|
||||
self.assertEqual(serialized[1]['parameters']['cmd'], 'yum clean all')
|
||||
self.assertItemsEqual(serialized[1]['uids'], self.all_uids)
|
||||
self.assertEqual(serialized[1]['type'], 'upload_file')
|
||||
self.assertEqual(serialized[2]['type'], 'shell')
|
||||
self.assertEqual(serialized[2]['parameters']['cmd'], 'yum clean all')
|
||||
self.assertItemsEqual(serialized[2]['uids'], self.all_uids)
|
||||
|
||||
def test_serialize_rados_with_ceph(self):
|
||||
task_config = {'id': 'restart_radosgw',
|
||||
@ -294,7 +297,7 @@ class TestPreTaskSerialization(BaseTaskSerializationTestUbuntu):
|
||||
self.graph = deployment_graph.AstuteGraph(self.cluster)
|
||||
self.cluster.release.operating_system = consts.RELEASE_OS.ubuntu
|
||||
tasks = self.graph.pre_tasks_serialize(self.nodes)
|
||||
self.assertEqual(len(tasks), 17)
|
||||
self.assertEqual(len(tasks), 19)
|
||||
tasks_tests = [('shell', ['master']),
|
||||
('shell', sorted(self.all_uids)),
|
||||
('upload_file', sorted(self.all_uids)),
|
||||
@ -309,6 +312,8 @@ class TestPreTaskSerialization(BaseTaskSerializationTestUbuntu):
|
||||
('upload_file', sorted(self.all_uids)),
|
||||
('upload_file', sorted(self.all_uids)),
|
||||
('upload_file', sorted(self.all_uids)),
|
||||
('upload_file', sorted(self.all_uids)),
|
||||
('upload_file', sorted(self.all_uids)),
|
||||
('copy_files', sorted(self.all_uids)),
|
||||
('sync', sorted(self.all_uids)),
|
||||
('shell', sorted(self.all_uids))]
|
||||
|
Loading…
Reference in New Issue
Block a user