You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by ne...@apache.org on 2016/11/30 15:51:09 UTC

[3/5] incubator-trafficcontrol git commit: use env BUILD_NUMBER and RHEL_NUMBER for release name

use env BUILD_NUMBER and RHEL_NUMBER for release name


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/7868dd93
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/7868dd93
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/7868dd93

Branch: refs/heads/master
Commit: 7868dd931ffe3e1388f587e2e735289ba824f69a
Parents: 8fb497d
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Nov 29 20:38:43 2016 +0000
Committer: Dave Neuman <ne...@apache.org>
Committed: Wed Nov 30 08:50:12 2016 -0700

----------------------------------------------------------------------
 traffic_monitor/pom.xml      | 5 +++--
 traffic_router/build/pom.xml | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7868dd93/traffic_monitor/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_monitor/pom.xml b/traffic_monitor/pom.xml
index b6887c7..5075610 100644
--- a/traffic_monitor/pom.xml
+++ b/traffic_monitor/pom.xml
@@ -301,7 +301,8 @@ under the License.
 						<configuration>
 							<rules>
 								<requireEnvironmentVariable>
-									<variableName>GIT_REV_COUNT</variableName>
+									<variableName>BUILD_NUMBER</variableName>
+									<variableName>RHEL_VERSION</variableName>
 								</requireEnvironmentVariable>
 							</rules>
 							<fail>true</fail>
@@ -338,7 +339,7 @@ under the License.
 						</executions>
 						<configuration>
 							<group>Applications/Internet</group>
-							<release>${env.GIT_REV_COUNT}.${buildNumber}.el6</release>
+							<release>${env.BUILD_NUMBER}.${env.RHEL_VERSION}</release>
 							<needarch>x86_64</needarch>
 							<mappings>
 								<mapping>

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7868dd93/traffic_router/build/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/build/pom.xml b/traffic_router/build/pom.xml
index a4e611b..dcb8835 100644
--- a/traffic_router/build/pom.xml
+++ b/traffic_router/build/pom.xml
@@ -88,6 +88,7 @@
 							<rules>
 								<requireEnvironmentVariable>
 									<variableName>BUILD_NUMBER</variableName>
+									<variableName>RHEL_VERSION</variableName>
 								</requireEnvironmentVariable>
 							</rules>
 							<fail>true</fail>
@@ -125,7 +126,7 @@
 						<configuration>
 							<group>Applications/Internet</group>
 							<name>${project.parent.artifactId}</name>
-							<release>${env.BUILD_NUMBER}.el6</release>
+							<release>${env.BUILD_NUMBER}.${env.RHEL_VERSION}</release>
 							<needarch>x86_64</needarch>
 							<mappings>
 								<mapping>