You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by jv...@apache.org on 2016/11/28 16:45:28 UTC
[5/6] incubator-trafficcontrol git commit: use $BUILD_NUMBER from env
for traffic_router version
use $BUILD_NUMBER from env for traffic_router version
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/cb93b43e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/cb93b43e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/cb93b43e
Branch: refs/heads/master
Commit: cb93b43e1c347c3838f493d387086af1a2519e81
Parents: 646b7e9
Author: Dan Kirkwood <da...@gmail.com>
Authored: Mon Nov 21 19:55:40 2016 +0000
Committer: Jan van Doorn <jv...@apache.org>
Committed: Mon Nov 28 16:42:45 2016 +0000
----------------------------------------------------------------------
traffic_router/build/build_rpm.sh | 2 +-
traffic_router/build/pom.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/cb93b43e/traffic_router/build/build_rpm.sh
----------------------------------------------------------------------
diff --git a/traffic_router/build/build_rpm.sh b/traffic_router/build/build_rpm.sh
index a7fc5ff..43d6943 100755
--- a/traffic_router/build/build_rpm.sh
+++ b/traffic_router/build/build_rpm.sh
@@ -56,7 +56,7 @@ function buildRpmTrafficRouter () {
installDnsSec
cd "$TR_DIR" || { echo "Could not cd to $TR_DIR: $?"; exit 1; }
- export GIT_REV_COUNT=$(getRevCount)
+ export BUILD_NUMBER=${BUILD_NUMBER:-$(getBuildNumber)}
mvn -P rpm-build -Dmaven.test.skip=true -DminimumTPS=1 clean package || \
{ echo "RPM BUILD FAILED: $?"; exit 1; }
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/cb93b43e/traffic_router/build/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/build/pom.xml b/traffic_router/build/pom.xml
index fc30608..a4e611b 100644
--- a/traffic_router/build/pom.xml
+++ b/traffic_router/build/pom.xml
@@ -87,7 +87,7 @@
<configuration>
<rules>
<requireEnvironmentVariable>
- <variableName>GIT_REV_COUNT</variableName>
+ <variableName>BUILD_NUMBER</variableName>
</requireEnvironmentVariable>
</rules>
<fail>true</fail>
@@ -125,7 +125,7 @@
<configuration>
<group>Applications/Internet</group>
<name>${project.parent.artifactId}</name>
- <release>${env.GIT_REV_COUNT}.${buildNumber}.el6</release>
+ <release>${env.BUILD_NUMBER}.el6</release>
<needarch>x86_64</needarch>
<mappings>
<mapping>