- Engine-commits - oVirt List Archives

Change in ovirt-engine[master]: sercon: rename ssh certs when copying in /etc
by sbonazzo＠redhat.com 17 Jul '15

17 Jul '15

Sandro Bonazzola has submitted this change and it was merged. Change subject: sercon: rename ssh certs when copying in /etc ...................................................................... sercon: rename ssh certs when copying in /etc Fixes missing rename of the certs file when copied on the final path under /etc. Previously the files where just copied. Change-Id: I9aff7680a125b06b388b3e7730ecaa82d7548eed Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M packaging/setup/plugins/ovirt-engine-setup/vmconsole_proxy_helper/pki.py 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Sandro Bonazzola: Looks good to me, approved Simone Tiraboschi: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Francesco Romani: Verified -- To view, visit https://gerrit.ovirt.org/43239 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9aff7680a125b06b388b3e7730ecaa82d7548eed Gerrit-PatchSet: 9 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Simone Tiraboschi <stirabos(a)redhat.com> Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-hosted-engine-setup[master]: Revert "packaging: setup: adding --deploy-hc CLI option" Ski...
by sbonazzo＠redhat.com 17 Jul '15

17 Jul '15

Sandro Bonazzola has submitted this change and it was merged. Change subject: Revert "packaging: setup: adding --deploy-hc CLI option" Skipping HC stuff on master, keeping it on 2.0 as an HC developing branch. ...................................................................... Revert "packaging: setup: adding --deploy-hc CLI option" Skipping HC stuff on master, keeping it on 2.0 as an HC developing branch. This reverts commit b3f6536acb863fb0b6e798676e54f3fce0ed8155. Change-Id: If41326575992b97b5767170fcc85de0d36978ed8 Signed-off-by: Simone Tiraboschi <stirabos(a)redhat.com> --- M man/hosted-engine.8 M man/ovirt-hosted-engine-setup.8 M src/bin/hosted-engine.in M src/bin/ovirt-hosted-engine-setup M src/plugins/ovirt-hosted-engine-setup/core/misc.py M templates/Makefile.am D templates/hc.answer.conf.in 7 files changed, 2 insertions(+), 49 deletions(-) Approvals: Sandro Bonazzola: Verified; Looks good to me, approved Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/43763 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If41326575992b97b5767170fcc85de0d36978ed8 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-hosted-engine-setup Gerrit-Branch: master Gerrit-Owner: Simone Tiraboschi <stirabos(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in jenkins[master]: publish-rpms-nightly-master: drop reports from f22
by sbonazzo＠redhat.com 17 Jul '15

17 Jul '15

Sandro Bonazzola has submitted this change and it was merged. Change subject: publish-rpms-nightly-master: drop reports from f22 ...................................................................... publish-rpms-nightly-master: drop reports from f22 dropping ovirt-reports from F22 on master, missing java-1.7 dep. Change-Id: Ice7f405afb70a66575aaa47e25027752dd6cc4b9 Signed-off-by: Sandro Bonazzola <sbonazzo(a)redhat.com> --- M jobs/confs/yaml/builders/copy-create-job-artifact.yaml M jobs/confs/yaml/jobs/ovirt/publish-rpms-nightly-master.yaml 2 files changed, 10 insertions(+), 17 deletions(-) Approvals: Sandro Bonazzola: Verified; Looks good to me; Ready for merge Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/43758 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ice7f405afb70a66575aaa47e25027752dd6cc4b9 Gerrit-PatchSet: 1 Gerrit-Project: jenkins Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>

1 0

Change in jenkins[master]: publish-rpms-nightly-master: fix f22 repoclosure
by sbonazzo＠redhat.com 17 Jul '15

17 Jul '15

Sandro Bonazzola has submitted this change and it was merged. Change subject: publish-rpms-nightly-master: fix f22 repoclosure ...................................................................... publish-rpms-nightly-master: fix f22 repoclosure Change-Id: I1da1552b4e8ccf56a16fea8f46349a55bfd7bd8d Signed-off-by: Sandro Bonazzola <sbonazzo(a)redhat.com> --- M jobs/confs/yaml/builders/copy-create-job-artifact.yaml M jobs/confs/yaml/jobs/ovirt/publish-rpms-nightly-master.yaml 2 files changed, 9 insertions(+), 7 deletions(-) Approvals: Sandro Bonazzola: Verified; Looks good to me; Ready for merge Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/43757 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1da1552b4e8ccf56a16fea8f46349a55bfd7bd8d Gerrit-PatchSet: 1 Gerrit-Project: jenkins Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: David Caro <dcaroest(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>

1 0

Change in jenkins[master]: publish-rpms-nightly-master: add ovirt-register
by sbonazzo＠redhat.com 17 Jul '15

17 Jul '15

Sandro Bonazzola has submitted this change and it was merged. Change subject: publish-rpms-nightly-master: add ovirt-register ...................................................................... publish-rpms-nightly-master: add ovirt-register Add ovirt-register_master_build-artifacts-el7-x86_64 to publish-rpms-nightly-master. Change-Id: Id44854475728f1c0c849b7eebb69478b9dd08470 Signed-off-by: Sandro Bonazzola <sbonazzo(a)redhat.com> --- M jobs/confs/yaml/jobs/ovirt/publish-rpms-nightly-master.yaml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Sandro Bonazzola: Verified; Looks good to me; Ready for merge Jenkins CI: Passed CI tests -- To view, visit https://gerrit.ovirt.org/43756 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id44854475728f1c0c849b7eebb69478b9dd08470 Gerrit-PatchSet: 1 Gerrit-Project: jenkins Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <sbonazzo(a)redhat.com> Gerrit-Reviewer: Anatoly Litovsky <tlitovsk(a)redhat.com> Gerrit-Reviewer: David Caro <dcaroest(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: Resurrect VdsBrokerObjectBuilderTest
by amureini＠redhat.com 16 Jul '15

16 Jul '15

Allon Mureinik has submitted this change and it was merged. Change subject: core: Resurrect VdsBrokerObjectBuilderTest ...................................................................... core: Resurrect VdsBrokerObjectBuilderTest VdsBrokerObjectBuilderTest was commented out in patch 7469b8d5392840a30e1cb8e6a05eafce83114d6c, since it used PowerMock which slowed down the build considerably. This patch uncomments the class and properly removes PowerMock usages so this test can be used again. With regard to performance, this test runs in ~800 milliseconds on my laptop, which is completely reasonable, although exact times may change depending on the machine, the load it's experiencing, etc. Note that this patch is pretty raw, and just introduces the minimal work required to re-enable this test. Following patches in the series will continue to improve this class as per the project's standards. Changes performed: * Uncommented all the class. * Removed the top "TODO" comment, as this patch does exactly that. * Removed PowerMockito calls and annotations. * Replaced the test runner with MockitoJUnitRunner. * Re-introduced JsonObjectDeserializer#deserializeUnformattedJson removed in b2983fad2002ac47cfc98a7d84401daa85874c5e that's needed for asserting the disk statistics results. * Removed usages of XmlRpcStruct and replaced them with Map<String, Object> as done in VdsBrokerObjectsBuilder in commit fa3c96ad55ed3aac5b0a923c0a30363c57d5c293. * Reordered the imports to comply with the checkstyle verification added in commit a4f50e3be1717fd9cc60314f87b3d56bae6ba048. Change-Id: I7b05b287f7938fa26197dc4dfd3f5681ea7a86a2 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectDeserializer.java M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectBuilderTest.java 2 files changed, 338 insertions(+), 346 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/43734 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7b05b287f7938fa26197dc4dfd3f5681ea7a86a2 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: core: Fix typo doulbe -> double
by amureini＠redhat.com 16 Jul '15

16 Jul '15

Allon Mureinik has submitted this change and it was merged. Change subject: core: Fix typo doulbe -> double ...................................................................... core: Fix typo doulbe -> double Change-Id: I355b5437fe37ff0f288eb9a3c878bd54e150387d Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectBuilderTest.java 1 file changed, 12 insertions(+), 12 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/43741 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I355b5437fe37ff0f288eb9a3c878bd54e150387d Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: core: Diamond generics
by amureini＠redhat.com 16 Jul '15

16 Jul '15

Allon Mureinik has submitted this change and it was merged. Change subject: core: Diamond generics ...................................................................... core: Diamond generics Employed Java 7 style diamond generics to improve the class' readability. Change-Id: I4b8de9110d9cd55cebc5a670986959bf718311aa Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectBuilderTest.java 1 file changed, 9 insertions(+), 9 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/43740 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4b8de9110d9cd55cebc5a670986959bf718311aa Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: core: Simplify assertions
by amureini＠redhat.com 16 Jul '15

16 Jul '15

Allon Mureinik has submitted this change and it was merged. Change subject: core: Simplify assertions ...................................................................... core: Simplify assertions Simplified assertEquals(null, someVariable) assertions to easier to read assertNull(someVariable) statements. Change-Id: I26129af764d546722af5615ff8773161b67c0b27 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectBuilderTest.java 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/43739 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I26129af764d546722af5615ff8773161b67c0b27 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0

Change in ovirt-engine[master]: core: Java style constants
by amureini＠redhat.com 16 Jul '15

16 Jul '15

Allon Mureinik has submitted this change and it was merged. Change subject: core: Java style constants ...................................................................... core: Java style constants Fixed the conceptual constants in VdsBrokerObjectBuilderTest to be private static final and to be named in UPPER_CASE, as per Java's coding standard. Change-Id: Ib81b146f49708cd2d8ae562d352d955cb3500866 Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectBuilderTest.java 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: Tal Nisan: Looks good to me, approved Jenkins CI: Passed CI tests Allon Mureinik: Verified -- To view, visit https://gerrit.ovirt.org/43737 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib81b146f49708cd2d8ae562d352d955cb3500866 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org

1 0