Change in vdsm[master]: tool-tests: use variable from conf version in template files.
mooli tayer has posted comments on this change. Change subject: tool-tests: use variable from conf version in template files. .. Patch Set 5: The first was fixed 33531. regarding the gluster issue not really. Yaniv/Danken? -- To view, visit http://gerrit.ovirt.org/32713 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: David Caro Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tool-tests: use variable from conf version in template files.
mooli tayer has posted comments on this change. Change subject: tool-tests: use variable from conf version in template files. .. Patch Set 5: ps thanks dcaro -- To view, visit http://gerrit.ovirt.org/32713 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: David Caro Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tool-tests: use variable from conf version in template files.
David Caro has posted comments on this change. Change subject: tool-tests: use variable from conf version in template files. .. Patch Set 5: Three issues I see: A real one related to the code: ./tests/toolTests.py:309: undefined name 'Libvirt' One related to stall yum metadata (or so it seems): failure: repodata/c5c33bcb408dc935d117c85c76835f93eaadde4a333523ebd404a8b9b9707f33-primary.sqlite.bz2 from epel-testing: [Errno 256] No more mirrors to try. And one related to gluster rpms on el6: error: lua script failed: [string "%pretrans(glusterfs-libs-3.4.0.57rhs-1.el6_5.x86_64)"]:40: bad argument #2 to 'error' (number expected, got boolean) The first you should fix, the second I should fix, and the third needs some input from someone from gluster, do you know anyone there on gluster? -- To view, visit http://gerrit.ovirt.org/32713 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: David Caro Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tool-tests: use variable from conf version in template files.
mooli tayer has posted comments on this change. Change subject: tool-tests: use variable from conf version in template files. .. Patch Set 5: @dcaro, hi FYI: Different failures in create-rpms-* jobs. "One of the configured repositories failed (epel-testing)" and others -- To view, visit http://gerrit.ovirt.org/32713 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: David Caro Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tool-tests: use variable from conf version in template files.
oVirt Jenkins CI Server has posted comments on this change. Change subject: tool-tests: use variable from conf version in template files. .. Patch Set 5: Build Failed http://jenkins.ovirt.org/job/vdsm_master_create-rpms_merged_test_debug/240/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_verify-error-codes_merged/5873/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit-tests_merged/4033/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el7-x86_64_merged/43/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc20-x86_64_merged/39/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el6-x86_64_merged/45/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc21-x86_64_merged/19/ : FAILURE -- To view, visit http://gerrit.ovirt.org/32713 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tool-tests: use variable from conf version in template files.
Dan Kenigsberg has submitted this change and it was merged. Change subject: tool-tests: use variable from conf version in template files. .. tool-tests: use variable from conf version in template files. Replace LATEST_CONF_VERSION with current value from libvirt configure. This will save having to update all toolTests_*.conf files each time we bump a version. Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270 Signed-off-by: Mooli Tayer Reviewed-on: http://gerrit.ovirt.org/32713 Reviewed-by: Yaniv Bronhaim Reviewed-by: Dan Kenigsberg --- M tests/toolTests.py M tests/toolTests_lconf_ssl.conf M tests/toolTests_libvirt_logrotate.conf M tests/toolTests_libvirtd.conf M tests/toolTests_qemu_sanlock.conf M tests/toolTests_qemu_ssl.conf 6 files changed, 16 insertions(+), 14 deletions(-) Approvals: Yaniv Bronhaim: Looks good to me, but someone else must approve mooli tayer: Verified Dan Kenigsberg: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/32713 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tool-tests: use variable from conf version in template files.
Dan Kenigsberg has posted comments on this change. Change subject: tool-tests: use variable from conf version in template files. .. Patch Set 4: Code-Review+2 Raising score -- To view, visit http://gerrit.ovirt.org/32713 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tool-tests: use variable from conf version in template files.
Yaniv Bronhaim has posted comments on this change. Change subject: tool-tests: use variable from conf version in template files. .. Patch Set 4: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/32713 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tool-tests: use variable from conf version in template files.
oVirt Jenkins CI Server has posted comments on this change. Change subject: tool-tests: use variable from conf version in template files. .. Patch Set 4: Build Successful http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/11727/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/12671/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12516/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/32713 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tool-tests: use variable from conf version in template files.
mooli tayer has posted comments on this change. Change subject: tool-tests: use variable from conf version in template files. .. Patch Set 4: using template and not replace, remove debug print, rename CONF_VERSION LATEST_CONF_VERSION at tests. -- To view, visit http://gerrit.ovirt.org/32713 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tool-tests: use variable from conf version in template files.
mooli tayer has posted comments on this change. Change subject: tool-tests: use variable from conf version in template files. .. Patch Set 4: Verified+1 -- To view, visit http://gerrit.ovirt.org/32713 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tool-tests: use variable from conf version in template files.
oVirt Jenkins CI Server has posted comments on this change. Change subject: tool-tests: use variable from conf version in template files. .. Patch Set 3: Build Successful http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/11702/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/12646/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12491/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/32713 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tool-tests: use variable from conf version in template files.
mooli tayer has posted comments on this change. Change subject: tool-tests: use variable from conf version in template files. .. Patch Set 2: tested on fe20 and rhel6.5 -- To view, visit http://gerrit.ovirt.org/32713 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tool-tests: use variable from conf version in template files.
mooli tayer has posted comments on this change. Change subject: tool-tests: use variable from conf version in template files. .. Patch Set 2: Verified+1 -- To view, visit http://gerrit.ovirt.org/32713 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tool-tests: use variable from conf version in template files.
mooli tayer has posted comments on this change. Change subject: tool-tests: use variable from conf version in template files. .. Patch Set 3: Verified+1 -- To view, visit http://gerrit.ovirt.org/32713 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tool-tests: use variable from conf version in template files.
oVirt Jenkins CI Server has posted comments on this change. Change subject: tool-tests: use variable from conf version in template files. .. Patch Set 2: Code-Review-1 Verified-1 Build Failed http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/11699/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/12643/ : FAILURE http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12488/ : UNSTABLE -- To view, visit http://gerrit.ovirt.org/32713 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tool-tests: use variable from conf version in template files.
Dan Kenigsberg has posted comments on this change. Change subject: tool-tests: use variable from conf version in template files. .. Patch Set 1: Code-Review-1 (1 comment) http://gerrit.ovirt.org/#/c/32713/1/tests/toolTests.py File tests/toolTests.py: Line 313: "rt") as fin: Line 314: for line in fin: Line 315: fout.write(line.replace( Line 316: 'CONF_VERSION', Line 317: Libvirt.CONF_VERSION)) > This is the syntax of python standard templating - see the example in multi Mooli, Nir refers to: "foo %(bar)s" % dict(bar="brr") and I share his opinion that it's better than using replace(). Line 318: Line 319: def testValidatePositive(self): Line 320: libvirtConfigure = Libvirt() Line 321: -- To view, visit http://gerrit.ovirt.org/32713 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tool-tests: use variable from conf version in template files.
Yaniv Bronhaim has posted comments on this change. Change subject: tool-tests: use variable from conf version in template files. .. Patch Set 1: Code-Review+1 very important... -- To view, visit http://gerrit.ovirt.org/32713 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tool-tests: use variable from conf version in template files.
Nir Soffer has posted comments on this change. Change subject: tool-tests: use variable from conf version in template files. .. Patch Set 1: (1 comment) http://gerrit.ovirt.org/#/c/32713/1/tests/toolTests.py File tests/toolTests.py: Line 313: "rt") as fin: Line 314: for line in fin: Line 315: fout.write(line.replace( Line 316: 'CONF_VERSION', Line 317: Libvirt.CONF_VERSION)) > OK, will change. This is the syntax of python standard templating - see the example in multipath.py Line 318: Line 319: def testValidatePositive(self): Line 320: libvirtConfigure = Libvirt() Line 321: -- To view, visit http://gerrit.ovirt.org/32713 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tool-tests: use variable from conf version in template files.
mooli tayer has posted comments on this change. Change subject: tool-tests: use variable from conf version in template files. .. Patch Set 1: (1 comment) http://gerrit.ovirt.org/#/c/32713/1/tests/toolTests.py File tests/toolTests.py: Line 313: "rt") as fin: Line 314: for line in fin: Line 315: fout.write(line.replace( Line 316: 'CONF_VERSION', Line 317: Libvirt.CONF_VERSION)) > Use Python standard templating: OK, will change. I also think CONF_VERSION better be LATEST_CONF_VERSION (Since that's what the tests mean) Can you please explain what you meant by: "vdsm-%(CONF_VERSION)s" Thanks Line 318: Line 319: def testValidatePositive(self): Line 320: libvirtConfigure = Libvirt() Line 321: -- To view, visit http://gerrit.ovirt.org/32713 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tool-tests: use variable from conf version in template files.
Nir Soffer has posted comments on this change.
Change subject: tool-tests: use variable from conf version in template files.
..
Patch Set 1:
(1 comment)
http://gerrit.ovirt.org/#/c/32713/1/tests/toolTests.py
File tests/toolTests.py:
Line 313: "rt") as fin:
Line 314: for line in fin:
Line 315: fout.write(line.replace(
Line 316: 'CONF_VERSION',
Line 317: Libvirt.CONF_VERSION))
Use Python standard templating:
... vdsm-%(CONF_VERSION)s
Then you can replace the value with:
with open(infile) as f:
data = f.read()
data = data % {'CONF_VERSION': Libvirt.CONF_VERSION}
with open(outfile, 'w') as f:
f.write(data)
Line 318:
Line 319: def testValidatePositive(self):
Line 320: libvirtConfigure = Libvirt()
Line 321:
--
To view, visit http://gerrit.ovirt.org/32713
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: mooli tayer
Gerrit-Reviewer: Dan Kenigsberg
Gerrit-Reviewer: Nir Soffer
Gerrit-Reviewer: Yaniv Bronhaim
Gerrit-Reviewer: automat...@ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tool-tests: use variable from conf version in template files.
oVirt Jenkins CI Server has posted comments on this change. Change subject: tool-tests: use variable from conf version in template files. .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/12370/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/11426/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12215/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/32713 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: mooli tayer Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: tool-tests: use variable from conf version in template files.
mooli tayer has uploaded a new change for review.
Change subject: tool-tests: use variable from conf version in template files.
..
tool-tests: use variable from conf version in template files.
Replace CONF_VERSION with current value from libvirt configure.
This will save having to update all toolTests_*.conf files each
time we bump a version.
Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270
Signed-off-by: Mooli Tayer
---
M tests/toolTests.py
M tests/toolTests_lconf_ssl.conf
M tests/toolTests_libvirt_logrotate.conf
M tests/toolTests_libvirtd.conf
M tests/toolTests_qemu_sanlock.conf
M tests/toolTests_qemu_ssl.conf
6 files changed, 18 insertions(+), 14 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/13/32713/1
diff --git a/tests/toolTests.py b/tests/toolTests.py
index a66443d..2bb606d 100644
--- a/tests/toolTests.py
+++ b/tests/toolTests.py
@@ -307,10 +307,14 @@
# helpers
def _setConfig(self, *configurations):
for file_, type_ in configurations:
-shutil.copyfile(
-os.path.join(dirName, 'toolTests_' + type_ + '.conf'),
-self.test_env[file_]
-)
+with open(self.test_env[file_], "wt") as fout:
+with open(
+os.path.join(dirName, 'toolTests_' + type_ + '.conf'),
+"rt") as fin:
+for line in fin:
+fout.write(line.replace(
+'CONF_VERSION',
+Libvirt.CONF_VERSION))
def testValidatePositive(self):
libvirtConfigure = Libvirt()
diff --git a/tests/toolTests_lconf_ssl.conf b/tests/toolTests_lconf_ssl.conf
index 64b9c1a..ed29482 100644
--- a/tests/toolTests_lconf_ssl.conf
+++ b/tests/toolTests_lconf_ssl.conf
@@ -1,4 +1,4 @@
-## beginning of configuration section by vdsm-4.13.0
+## beginning of configuration section by vdsm-CONF_VERSION
listen_tcp=0
auth_tcp="sasl"
listen_addr="0.0.0.0"
@@ -10,4 +10,4 @@
log_outputs="1:file:/var/log/libvirt/libvirtd.log"
ca_file="/etc/pki/vdsm/certs/cacert.pem"
cert_file="/etc/pki/vdsm/certs/vdsmcert.pem\"
-## end of configuration section by vdsm-4.13.0
+## end of configuration section by vdsm-CONF_VERSION
diff --git a/tests/toolTests_libvirt_logrotate.conf
b/tests/toolTests_libvirt_logrotate.conf
index 5bf4272..16f853f 100644
--- a/tests/toolTests_libvirt_logrotate.conf
+++ b/tests/toolTests_libvirt_logrotate.conf
@@ -1,4 +1,4 @@
-## beginning of configuration section by vdsm-4.13.0
+## beginning of configuration section by vdsm-CONF_VERSION
/var/log/libvirt/libvirtd.log {
rotate 100
missingok
@@ -9,7 +9,7 @@
uncompresscmd /usr/bin/unxz
compressext .xz
}
-## end of configuration section by vdsm-4.13.0
+## end of configuration section by vdsm-CONF_VERSION
# VDSM backup/var/log/libvirt/libvirtd.log {
# VDSM backupweekly
# VDSM backupmissingok
diff --git a/tests/toolTests_libvirtd.conf b/tests/toolTests_libvirtd.conf
index 20b5f8c..326b398 100644
--- a/tests/toolTests_libvirtd.conf
+++ b/tests/toolTests_libvirtd.conf
@@ -1,4 +1,4 @@
-## beginning of configuration section by vdsm-4.13.0
+## beginning of configuration section by vdsm-CONF_VERSION
auto_disk_leases=0
require_lease_for_disks=0
-## end of configuration section by vdsm-4.13.0
+## end of configuration section by vdsm-CONF_VERSION
diff --git a/tests/toolTests_qemu_sanlock.conf
b/tests/toolTests_qemu_sanlock.conf
index d41018f..d0098e0 100644
--- a/tests/toolTests_qemu_sanlock.conf
+++ b/tests/toolTests_qemu_sanlock.conf
@@ -1,4 +1,4 @@
-## beginning of configuration section by vdsm-4.13.0
+## beginning of configuration section by vdsm-CONF_VERSION
LIBVIRTD_ARGS=--listen
DAEMON_COREFILE_LIMIT=unlimited
-## end of configuration section by vdsm-4.13.0
+## end of configuration section by vdsm-CONF_VERSION
diff --git a/tests/toolTests_qemu_ssl.conf b/tests/toolTests_qemu_ssl.conf
index 29e1e29..95eba0a 100644
--- a/tests/toolTests_qemu_ssl.conf
+++ b/tests/toolTests_qemu_ssl.conf
@@ -1,4 +1,4 @@
-## beginning of configuration section by vdsm-4.13.0
+## beginning of configuration section by vdsm-CONF_VERSION
spice_tls=1
dynamic_ownership=0
save_image_format="lzop"
@@ -7,4 +7,4 @@
remote_display_port_max=6923
lock_manager="sanlock"
auto_dump_path="/var/log/core"
-## end of configuration section by vdsm-4.13.0
+## end of configuration section by vdsm-CONF_VERSION
--
To view, visit http://gerrit.ovirt.org/32713
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f322cc647f81358febbcb89b8ec67fd2a2b2270
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: mooli tayer
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
