Douglas Schilling Landgraf has uploaded a new change for review.
Change subject: BZ#822158: fail to join host to cluster ......................................................................
BZ#822158: fail to join host to cluster
Do not use @PACKAGE_VERSION@ and @PACKAGE_RELEASE@
Change-Id: I0dbe689482913ed46e65ada327d387d6305916a3 Signed-off-by: Douglas Schilling Landgraf dougsland@redhat.com --- M vdsm.spec.in M vdsm/dsaversion.py.in 2 files changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/10/4910/1 -- To view, visit http://gerrit.ovirt.org/4910 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange Gerrit-Change-Id: I0dbe689482913ed46e65ada327d387d6305916a3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf dougsland@redhat.com
Dan Kenigsberg has posted comments on this change.
Change subject: BZ#822158: fail to join host to cluster ......................................................................
Patch Set 1: I would prefer that you didn't submit this
(2 inline comments)
Thanks Douglas, that's highly important. But please verify that the dsaversion being produced is legible to Engine.
.................................................... Commit Message Line 9: Do not use @PACKAGE_VERSION@ and @PACKAGE_RELEASE@ Please mention dsaversion and explain why - Engine cannot handle anything bug X.Y version/release.
.................................................... File vdsm.spec.in Line 320: sed -i 's/^software_version =.*/software_version = "%{version}"/;s/software_revision =.*/software_revision = "'"$baserelease"'"/' vdsm/dsaversion.py better break this long line.
but more importantly, we cannot take %{version} verbatim, as it has 3 parts, and Engine handles only two. Please make sure software_version=X.Y
-- To view, visit http://gerrit.ovirt.org/4910 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I0dbe689482913ed46e65ada327d387d6305916a3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com
Douglas Schilling Landgraf has posted comments on this change.
Change subject: BZ#822158: fail to join host to cluster ......................................................................
Patch Set 2: (1 inline comment)
.................................................... File vdsm.spec.in Line 322: -e 's/software_revision =.*/software_revision = "'"${baserelease}"'"/' vdsm/dsaversion.py /me forgot ^ in software_revision
-- To view, visit http://gerrit.ovirt.org/4910 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I0dbe689482913ed46e65ada327d387d6305916a3 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com
Dan Kenigsberg has posted comments on this change.
Change subject: BZ#822158: fail to join host to cluster ......................................................................
Patch Set 3: Looks good to me, approved
but please verify this against Engine so we know the bug is behind us.
-- To view, visit http://gerrit.ovirt.org/4910 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I0dbe689482913ed46e65ada327d387d6305916a3 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com
Douglas Schilling Landgraf has posted comments on this change.
Change subject: BZ#822158: fail to join host to cluster ......................................................................
Patch Set 3: Verified
-- To view, visit http://gerrit.ovirt.org/4910 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I0dbe689482913ed46e65ada327d387d6305916a3 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com
Dan Kenigsberg has posted comments on this change.
Change subject: BZ#822158: fail to join host to cluster ......................................................................
Patch Set 3: Fails; No score
I am afraid this would fail tests/functional/restTests.RestTest.testVersion
Could you fix REST to handle build-less version?
-- To view, visit http://gerrit.ovirt.org/4910 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I0dbe689482913ed46e65ada327d387d6305916a3 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Adam Litke agl@us.ibm.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com
Adam Litke has posted comments on this change.
Change subject: BZ#822158: fail to join host to cluster ......................................................................
Patch Set 3: I would prefer that you didn't submit this
Since this is a backwards compatibility issue, you could just add two new fields to dsaversion.py called: software_version_compat, and software_revision_compat. Then, you can set these to whatever values you want for engine compatibility. In the xmlrpc binding, you can overwrite the real values with the compat values.
-- To view, visit http://gerrit.ovirt.org/4910 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I0dbe689482913ed46e65ada327d387d6305916a3 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Adam Litke agl@us.ibm.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com
Dan Kenigsberg has posted comments on this change.
Change subject: BZ#822158: fail to join host to cluster ......................................................................
Patch Set 3:
unfortunately, this is not just backward compatibility - current Engine upstream cannot/wouldn't accept a change in the versioning standard reported by Vdsm.
I'd suggest moving to v4.10, and changing the REST test accordingly.
-- To view, visit http://gerrit.ovirt.org/4910 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I0dbe689482913ed46e65ada327d387d6305916a3 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Adam Litke agl@us.ibm.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com
Douglas Schilling Landgraf has posted comments on this change.
Change subject: BZ#822158: fail to join host to cluster ......................................................................
Patch Set 4: Verified
-- To view, visit http://gerrit.ovirt.org/4910 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I0dbe689482913ed46e65ada327d387d6305916a3 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Adam Litke agl@us.ibm.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com
Adam Litke has posted comments on this change.
Change subject: BZ#822158: fail to join host to cluster ......................................................................
Patch Set 4: Verified
-- To view, visit http://gerrit.ovirt.org/4910 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I0dbe689482913ed46e65ada327d387d6305916a3 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Adam Litke agl@us.ibm.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com
Adam Litke has posted comments on this change.
Change subject: BZ#822158: fail to join host to cluster ......................................................................
Patch Set 4: Looks good to me, but someone else must approve
-- To view, visit http://gerrit.ovirt.org/4910 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I0dbe689482913ed46e65ada327d387d6305916a3 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Adam Litke agl@us.ibm.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com
Dan Kenigsberg has posted comments on this change.
Change subject: BZ#822158: fail to join host to cluster ......................................................................
Patch Set 4: Looks good to me, approved
-- To view, visit http://gerrit.ovirt.org/4910 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment Gerrit-Change-Id: I0dbe689482913ed46e65ada327d387d6305916a3 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Adam Litke agl@us.ibm.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com
Dan Kenigsberg has submitted this change and it was merged.
Change subject: BZ#822158: fail to join host to cluster ......................................................................
BZ#822158: fail to join host to cluster
Currently dsavesion.py will expand the macros @PACKAGE_VERSION@ and @PACKAGE_RELEASE@ to the full version/release of vdsm However, oVirt Engine cannot handle version/release with more then 3 digits, example: 4.9.6, only 4.9.
Change-Id: I0dbe689482913ed46e65ada327d387d6305916a3 Signed-off-by: Douglas Schilling Landgraf dougsland@redhat.com --- M vdsm.spec.in M vdsm/dsaversion.py.in 2 files changed, 7 insertions(+), 0 deletions(-)
Approvals: Douglas Schilling Landgraf: Verified Adam Litke: Verified; Looks good to me, but someone else must approve Dan Kenigsberg: Looks good to me, approved
-- To view, visit http://gerrit.ovirt.org/4910 To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged Gerrit-Change-Id: I0dbe689482913ed46e65ada327d387d6305916a3 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf dougsland@redhat.com Gerrit-Reviewer: Adam Litke agl@us.ibm.com Gerrit-Reviewer: Dan Kenigsberg danken@redhat.com Gerrit-Reviewer: Douglas Schilling Landgraf dougsland@redhat.com
vdsm-patches@lists.fedorahosted.org