Change in vdsm[master]: vdsm.spec: remove sed software_version/revision

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: vdsm.spec: remove sed software_version/revision
......................................................................

vdsm.spec: remove sed software_version/revision

VDSM should report the full version/revision.
Revert commit 23a0c7199371a8f6b767b8f49c87da11b466d7da

Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=893193
Signed-off-by: Douglas Schilling Landgraf 
---
M vdsm.spec.in
M vdsm/dsaversion.py.in
2 files changed, 0 insertions(+), 7 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/52/12952/1

diff --git a/vdsm.spec.in b/vdsm.spec.in
index ed71ab9..d5d2b16 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -450,11 +450,6 @@
 %endif
 %configure %{?with_hooks:--enable-hooks}
 make
-# Setting software_version and software_revision in dsaversion.py
-baserelease=`echo "%{release}" | sed 's/([0-9]+(.[0-9]+)?).*/\1/'`
-baseversion=`echo "%{version}" | sed 's/([0-9]+(.[0-9]+)?).*/\1/'`
-sed -i -e 's/^software_version =.*/software_version = "'"${baseversion}"'"/' \
-       -e 's/^software_revision =.*/software_revision = "'"${baserelease}"'"/' vdsm/dsaversion.py

%install
 rm -rf %{buildroot}
diff --git a/vdsm/dsaversion.py.in b/vdsm/dsaversion.py.in
index d0160fc..a71953e 100644
--- a/vdsm/dsaversion.py.in
+++ b/vdsm/dsaversion.py.in
@@ -23,8 +23,6 @@
 python based components
 """
 version_name = "Snow Man"
-# FIXME: As soon as we can provide a long version/release to oVirt-Engine
-#        remove from vdsm.spec the sed to replace the below macros
 software_version = "@PACKAGE_VERSION@"
 software_revision = "@PACKAGE_RELEASE@"

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: vdsm.spec: remove sed software_version/revision
......................................................................

Patch Set 1:

Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1527/ (1/2)

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: vdsm.spec: remove sed software_version/revision
......................................................................

Patch Set 1:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1564/ (2/2)

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: vdsm.spec: remove sed software_version/revision
......................................................................

Patch Set 1:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1564/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1527/ : SUCCESS

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: oVirt Jenkins CI Server

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: vdsm.spec: remove sed software_version/revision
......................................................................

Patch Set 1: I would prefer that you didn't submit this

commit 23a0c7199371a8f6b767b8f49c87da11b466d7da had reasons. They may have been bad, but we should not introduce regression like that for old Engines that expect k.l-m.n version-release.

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding new Name Release Version field

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: dsaversion: Adding new Name Release Version field
......................................................................

Patch Set 2:

Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1631/ (1/2)

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding new Name Release Version field

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: dsaversion: Adding new Name Release Version field
......................................................................

Patch Set 2:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1675/ (2/2)

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding new Name Release Version field

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: dsaversion: Adding new Name Release Version field
......................................................................

Patch Set 2: Verified

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding new Name Release Version field

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: dsaversion: Adding new Name Release Version field
......................................................................

Patch Set 2:

Build Successful

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1631/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1675/ : SUCCESS

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding new Name Release Version field

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: dsaversion: Adding new Name Release Version field
......................................................................

Patch Set 3:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1676/ (1/2)

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding new Name Release Version field

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: dsaversion: Adding new Name Release Version field
......................................................................

Patch Set 3:

Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1632/ (2/2)

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding new Name Release Version field

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: dsaversion: Adding new Name Release Version field
......................................................................

Patch Set 3: Verified

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding new Name Release Version field

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: dsaversion: Adding new Name Release Version field
......................................................................

Patch Set 3:

Build Successful

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1632/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1676/ : SUCCESS

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding new Name Release Version field

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: dsaversion: Adding new Name Release Version field
......................................................................

Patch Set 3: I would prefer that you didn't submit this

(2 inline comments)

....................................................
File vdsm/dsaversion.py.in
Line 26: # FIXME: As soon as we can provide a long version/release to oVirt-Engine
Line 27: #        remove from vdsm.spec the sed to replace the below macros
Line 28: software_version = "@PACKAGE_VERSION@"
Line 29: software_revision = "@PACKAGE_RELEASE@"
Line 30: nvr = "%s @PACKAGE_VERSION@.@PACKAGE_RELEASE@" % version_name
nvr is an ugly name. I know that I raised it, but it's not an excuse ;-)
in rpm world, nvr always looks like

vdsm-4.10.444-12.f18

No Snow Men.
Line 31: 
Line 32: version_info = {
Line 33:     'version_name': version_name,
Line 34:     'software_version': software_version,

Line 32: version_info = {
Line 33:     'version_name': version_name,
Line 34:     'software_version': software_version,
Line 35:     'software_revision': software_revision,
Line 36:     'nvr': nvr,
I do not see any reason to expose this to Engine.
Line 37:     'supportedENGINEs': ['3.0', '3.1'],
Line 38:     'supportedProtocols': ['2.2', '2.3'],
Line 39:     'clusterLevels': ['3.0', '3.1', '3.2'],

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding software_release

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: dsaversion: Adding software_release
......................................................................

Patch Set 4:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1694/ (1/2)

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding software_release

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: dsaversion: Adding software_release
......................................................................

Patch Set 4:

Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1649/ (2/2)

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding software_release

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: dsaversion: Adding software_release
......................................................................

Patch Set 4: Verified

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding software_release

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: dsaversion: Adding software_release
......................................................................

Patch Set 4:

Build Successful

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1649/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1694/ : SUCCESS

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding software_release

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: dsaversion: Adding software_release
......................................................................

Patch Set 4: I would prefer that you didn't submit this

(1 inline comment)

....................................................
File vdsm/dsaversion.py.in
Line 26: # FIXME: As soon as we can provide a long version/release to oVirt-Engine
Line 27: #        remove from vdsm.spec the sed to replace the below macros
Line 28: software_version = "@PACKAGE_VERSION@"
Line 29: software_revision = "@PACKAGE_RELEASE@"
Line 30: software_release = "@PACKAGE_VERSION@.@PACKAGE_RELEASE@"
sorry, I still dislike the name. it's not just the release. it's version AND release. "rpmVR" may be more exact.
Line 31: 
Line 32: version_info = {
Line 33:     'version_name': version_name,
Line 34:     'software_version': software_version,

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding rpm_version_revision

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: dsaversion: Adding rpm_version_revision
......................................................................

Patch Set 5:

Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1654/ (2/2)

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding rpm_version_revision

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: dsaversion: Adding rpm_version_revision
......................................................................

Patch Set 5:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1699/ (1/2)

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding rpm_version_revision

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: dsaversion: Adding rpm_version_revision
......................................................................

Patch Set 5: Verified

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding rpm_version_revision

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: dsaversion: Adding rpm_version_revision
......................................................................

Patch Set 5:

Build Successful

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1654/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1699/ : SUCCESS

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding rpm_version_revision

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: dsaversion: Adding rpm_version_revision
......................................................................

Patch Set 5: I would prefer that you didn't submit this

Debian people are going to hate us for this name!
I'm sorry Douglas, this simply needs some more thinking. How about raw_version_release? ("raw" as untampered)

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Zhou Zheng Sheng 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding rpm_version_revision

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: dsaversion: Adding rpm_version_revision
......................................................................

Patch Set 5:

indeed Dan, I forgot this point. I do believe package_version is good enough. All distro use their own package style to distribute the software. Thanks!

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Zhou Zheng Sheng 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding raw_version_revision

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: dsaversion: Adding raw_version_revision
......................................................................

Patch Set 6:

Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1659/ (1/2)

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Zhou Zheng Sheng 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding raw_version_revision

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: dsaversion: Adding raw_version_revision
......................................................................

Patch Set 6:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1704/ (2/2)

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Zhou Zheng Sheng 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding raw_version_revision

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: dsaversion: Adding raw_version_revision
......................................................................

Patch Set 6: Verified

raw is good enough as well, let's move forward. Thanks!

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Zhou Zheng Sheng 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding raw_version_revision

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: dsaversion: Adding raw_version_revision
......................................................................

Patch Set 6: Fails

Build Failed

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1659/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1704/ : FAILURE

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Zhou Zheng Sheng 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding raw_version_revision

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: dsaversion: Adding raw_version_revision
......................................................................

Patch Set 6:

error not related with the patch.

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Zhou Zheng Sheng 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding raw_version_revision

Zhou Zheng Sheng has posted comments on this change.

Change subject: dsaversion: Adding raw_version_revision
......................................................................

Patch Set 6: Looks good to me, but someone else must approve

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Zhou Zheng Sheng 
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: dsaversion: Adding raw_version_revision

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: dsaversion: Adding raw_version_revision
......................................................................

dsaversion: Adding raw_version_revision

Due commit 23a0c7199371a8f6b767b8f49c87da11b466d7da, currently
we cannot change the way we show version and release or it
will affect old oVirt Engine versions. To keep compatible,
this patch will add raw_version_revision which can be used
to show the version and revision during VDSM initialization.

Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=893193
Signed-off-by: Douglas Schilling Landgraf 
---
M vdsm/dsaversion.py.in
M vdsm/vdsm
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Douglas Schilling Landgraf: Verified
  Dan Kenigsberg: Looks good to me, approved
  Zhou Zheng Sheng: Looks good to me, but someone else must approve

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Zhou Zheng Sheng

Change in vdsm[master]: dsaversion: Adding raw_version_revision

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: dsaversion: Adding raw_version_revision
......................................................................

Patch Set 6: Looks good to me, approved

--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Eli Mesika 
Gerrit-Reviewer: Yair Zaslavsky 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: Zhou Zheng Sheng