You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2016/11/30 18:15:21 UTC
[1/9] incubator-trafficcontrol git commit: fix ref to TC_VERSION
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/psql-rebase d78f91181 -> e8ae0a047
fix ref to TC_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/e8ae0a04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/e8ae0a04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/e8ae0a04
Branch: refs/heads/psql-rebase
Commit: e8ae0a0478f15ae9c8ddaebe2e8fe922baa55e43
Parents: c565864
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Nov 29 22:56:56 2016 +0000
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Wed Nov 30 11:14:44 2016 -0700
----------------------------------------------------------------------
traffic_router/build/build_rpm.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e8ae0a04/traffic_router/build/build_rpm.sh
----------------------------------------------------------------------
diff --git a/traffic_router/build/build_rpm.sh b/traffic_router/build/build_rpm.sh
index 20d3910..da559fd 100755
--- a/traffic_router/build/build_rpm.sh
+++ b/traffic_router/build/build_rpm.sh
@@ -105,7 +105,6 @@ function checkEnvironment() {
echo "TC_VERSION: $TC_VERSION"
echo "RPM: $RPM"
echo "--------------------------------------------------"
- export TRAFFIC_CONTROL_VERSION="$TC_VERSION"
}
# ---------------------------------------
@@ -115,7 +114,7 @@ function initBuildArea() {
tr_dest=$(createSourceDir traffic_router)
- export MVN_CMD="mvn versions:set -DnewVersion=$TRAFFIC_CONTROL_VERSION"
+ export MVN_CMD="mvn versions:set -DnewVersion=$TC_VERSION"
echo $MVN_CMD
(cd $TR_DIR; $MVN_CMD)
cp -r "$TR_DIR"/{build,connector,core} "$tr_dest"/. || { echo "Could not copy to $tr_dest: $?"; exit 1; }
[5/9] incubator-trafficcontrol git commit: cd to traffic_monitor
prior to mvn call
Posted by da...@apache.org.
cd to traffic_monitor prior to mvn call
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/6aab6499
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/6aab6499
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/6aab6499
Branch: refs/heads/psql-rebase
Commit: 6aab64993fadabb2d45898608e34bea136bd7e22
Parents: 1317b3f
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Nov 29 16:18:55 2016 +0000
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Wed Nov 30 11:14:44 2016 -0700
----------------------------------------------------------------------
traffic_monitor/build/build_rpm.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/6aab6499/traffic_monitor/build/build_rpm.sh
----------------------------------------------------------------------
diff --git a/traffic_monitor/build/build_rpm.sh b/traffic_monitor/build/build_rpm.sh
index e8970a0..cb14028 100755
--- a/traffic_monitor/build/build_rpm.sh
+++ b/traffic_monitor/build/build_rpm.sh
@@ -62,9 +62,9 @@ function initBuildArea() {
tm_dest=$(createSourceDir traffic_monitor)
export TRAFFIC_CONTROL_VERSION="$TC_VERSION"
- export MVN_CMD="mvn versions:set -DnewVersion=$TRAFFIC_CONTROL_VERSION"
- echo $MVN_CMD
- $MVN_CMD
+ local mvn_cmd="mvn versions:set -DnewVersion=$TRAFFIC_CONTROL_VERSION"
+ echo $mvn_cmd
+ (cd "$TM_DIR"; $mvn_cmd)
cp -r "$TM_DIR"/{build,etc,src} "$tm_dest"/. || { echo "Could not copy to $tm_dest: $?"; exit 1; }
cp "$TM_DIR"/pom.xml "$tm_dest" || { echo "Could not copy to $tm_dest: $?"; exit 1; }
[9/9] incubator-trafficcontrol git commit: use env BUILD_NUMBER and
RHEL_NUMBER for release name
Posted by da...@apache.org.
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/2a7dbec7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/2a7dbec7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/2a7dbec7
Branch: refs/heads/psql-rebase
Commit: 2a7dbec79abebd9285b786b9435aa1df4c62667b
Parents: 4fe8db0
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Nov 29 20:38:43 2016 +0000
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Wed Nov 30 11:14:44 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/2a7dbec7/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/2a7dbec7/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>
[2/9] incubator-trafficcontrol git commit: up traffic_monitor and
traffic_router to version 1.9.0
Posted by da...@apache.org.
up traffic_monitor and traffic_router to version 1.9.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/c05986a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/c05986a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/c05986a2
Branch: refs/heads/psql-rebase
Commit: c05986a25ff9a2cc785f501cbe6d8eff76af2147
Parents: 2a7dbec
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Nov 29 20:47:47 2016 +0000
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Wed Nov 30 11:14:44 2016 -0700
----------------------------------------------------------------------
traffic_monitor/pom.xml | 2 +-
traffic_router/build/pom.xml | 2 +-
traffic_router/configuration/pom.xml | 2 +-
traffic_router/connector/pom.xml | 2 +-
traffic_router/core/pom.xml | 2 +-
traffic_router/geolocation/pom.xml | 2 +-
traffic_router/neustar/pom.xml | 2 +-
traffic_router/pom.xml | 2 +-
traffic_router/shared/pom.xml | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c05986a2/traffic_monitor/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_monitor/pom.xml b/traffic_monitor/pom.xml
index 5075610..7c59495 100644
--- a/traffic_monitor/pom.xml
+++ b/traffic_monitor/pom.xml
@@ -26,7 +26,7 @@ under the License.
<groupId>com.comcast.cdn.traffic_control</groupId>
<artifactId>traffic_monitor</artifactId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
<packaging>war</packaging>
<scm>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c05986a2/traffic_router/build/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/build/pom.xml b/traffic_router/build/pom.xml
index dcb8835..a860b15 100644
--- a/traffic_router/build/pom.xml
+++ b/traffic_router/build/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
<artifactId>traffic_router</artifactId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
</parent>
<scm>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c05986a2/traffic_router/configuration/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/configuration/pom.xml b/traffic_router/configuration/pom.xml
index 5f80e15..0d0ff89 100644
--- a/traffic_router/configuration/pom.xml
+++ b/traffic_router/configuration/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>traffic_router</artifactId>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c05986a2/traffic_router/connector/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/connector/pom.xml b/traffic_router/connector/pom.xml
index 74e0a07..3878e3e 100644
--- a/traffic_router/connector/pom.xml
+++ b/traffic_router/connector/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
<artifactId>traffic_router</artifactId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
</parent>
<artifactId>traffic_router_connector</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c05986a2/traffic_router/core/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/core/pom.xml b/traffic_router/core/pom.xml
index f2ec0cd..cfb97c2 100644
--- a/traffic_router/core/pom.xml
+++ b/traffic_router/core/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
<artifactId>traffic_router</artifactId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
</parent>
<artifactId>traffic_router_core</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c05986a2/traffic_router/geolocation/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/geolocation/pom.xml b/traffic_router/geolocation/pom.xml
index c2d6224..3e95cf1 100644
--- a/traffic_router/geolocation/pom.xml
+++ b/traffic_router/geolocation/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>traffic_router</artifactId>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c05986a2/traffic_router/neustar/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/neustar/pom.xml b/traffic_router/neustar/pom.xml
index 002467c..48a5326 100644
--- a/traffic_router/neustar/pom.xml
+++ b/traffic_router/neustar/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>traffic_router</artifactId>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c05986a2/traffic_router/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/pom.xml b/traffic_router/pom.xml
index 78badf3..1148c49 100644
--- a/traffic_router/pom.xml
+++ b/traffic_router/pom.xml
@@ -18,7 +18,7 @@
<artifactId>traffic_router</artifactId>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
<packaging>pom</packaging>
<name>traffic_router</name>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c05986a2/traffic_router/shared/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/shared/pom.xml b/traffic_router/shared/pom.xml
index d9cd43a..329038c 100644
--- a/traffic_router/shared/pom.xml
+++ b/traffic_router/shared/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>traffic_router</artifactId>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
[7/9] incubator-trafficcontrol git commit: [TC-54] - Obtain the ATS
user's UID after package installation during ORT.
Posted by da...@apache.org.
[TC-54] - Obtain the ATS user's UID after package installation during ORT.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/4fe8db00
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/4fe8db00
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/4fe8db00
Branch: refs/heads/psql-rebase
Commit: 4fe8db003175728de42b65e20b041471ed6a7977
Parents: 6aab649
Author: Jeff Elsloo <je...@cable.comcast.com>
Authored: Mon Nov 28 15:52:20 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Wed Nov 30 11:14:44 2016 -0700
----------------------------------------------------------------------
traffic_ops/bin/traffic_ops_ort.pl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/4fe8db00/traffic_ops/bin/traffic_ops_ort.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/bin/traffic_ops_ort.pl b/traffic_ops/bin/traffic_ops_ort.pl
index 0d9f018..8a75bdf 100755
--- a/traffic_ops/bin/traffic_ops_ort.pl
+++ b/traffic_ops/bin/traffic_ops_ort.pl
@@ -172,7 +172,6 @@ my %install_tracker;
my $config_dirs = undef;
my $cfg_file_tracker = undef;
my $ssl_tracker = undef;
-my $ats_uid = getpwnam("ats");
####-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-####
#### Start main flow
@@ -198,7 +197,8 @@ if ( $script_mode == $BADASS || $script_mode == $INTERACTIVE || $script_mode ==
my $header_comment = &get_header_comment($traffic_ops_host);
&process_packages( $hostname_short, $traffic_ops_host );
-
+# get the ats user's UID after package installation in case this is the initial badass
+my $ats_uid = getpwnam("ats");
&process_chkconfig( $hostname_short, $traffic_ops_host );
#### First time
[4/9] incubator-trafficcontrol git commit: if not in git tree,
no tarball
Posted by da...@apache.org.
if not in git tree, no tarball
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/e4084dc0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/e4084dc0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/e4084dc0
Branch: refs/heads/psql-rebase
Commit: e4084dc00ab35d64ce1771ff092daac96a4e258b
Parents: d78f911
Author: Dan Kirkwood <da...@gmail.com>
Authored: Fri Nov 11 18:41:11 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Wed Nov 30 11:14:44 2016 -0700
----------------------------------------------------------------------
build/functions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e4084dc0/build/functions.sh
----------------------------------------------------------------------
diff --git a/build/functions.sh b/build/functions.sh
index 6fa861f..c237288 100755
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -58,7 +58,7 @@ function isInGitTree() {
function getBuildNumber() {
local in_git=$()
if isInGitTree; then
- local commits=$(git rev-list HEAD 2>/dev/null | wc -l)
+ local commits=$(getRevCount)
local sha=$(git rev-parse --short=8 HEAD)
echo "$commits.$sha"
else
[6/9] incubator-trafficcontrol git commit: revcount and commit from
buildno
Posted by da...@apache.org.
revcount and commit from buildno
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/06a565a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/06a565a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/06a565a4
Branch: refs/heads/psql-rebase
Commit: 06a565a421a4899ce838088e7a7e389c49f69bad
Parents: e4084dc
Author: Dan Kirkwood <da...@gmail.com>
Authored: Sat Nov 12 19:00:25 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Wed Nov 30 11:14:44 2016 -0700
----------------------------------------------------------------------
build/functions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/06a565a4/build/functions.sh
----------------------------------------------------------------------
diff --git a/build/functions.sh b/build/functions.sh
index c237288..6fa861f 100755
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -58,7 +58,7 @@ function isInGitTree() {
function getBuildNumber() {
local in_git=$()
if isInGitTree; then
- local commits=$(getRevCount)
+ local commits=$(git rev-list HEAD 2>/dev/null | wc -l)
local sha=$(git rev-parse --short=8 HEAD)
echo "$commits.$sha"
else
[8/9] incubator-trafficcontrol git commit: cd to traffic_router prior
to setting version
Posted by da...@apache.org.
cd to traffic_router prior to setting 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/c5658641
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/c5658641
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/c5658641
Branch: refs/heads/psql-rebase
Commit: c5658641036df73fd8ddd64f2ed8d8db323320d9
Parents: c05986a
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Nov 29 22:39:40 2016 +0000
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Wed Nov 30 11:14:44 2016 -0700
----------------------------------------------------------------------
traffic_router/build/build_rpm.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c5658641/traffic_router/build/build_rpm.sh
----------------------------------------------------------------------
diff --git a/traffic_router/build/build_rpm.sh b/traffic_router/build/build_rpm.sh
index 43d6943..20d3910 100755
--- a/traffic_router/build/build_rpm.sh
+++ b/traffic_router/build/build_rpm.sh
@@ -117,7 +117,7 @@ function initBuildArea() {
export MVN_CMD="mvn versions:set -DnewVersion=$TRAFFIC_CONTROL_VERSION"
echo $MVN_CMD
- $MVN_CMD
+ (cd $TR_DIR; $MVN_CMD)
cp -r "$TR_DIR"/{build,connector,core} "$tr_dest"/. || { echo "Could not copy to $tr_dest: $?"; exit 1; }
cp "$TR_DIR"/pom.xml "$tr_dest" || { echo "Could not copy to $tr_dest: $?"; exit 1; }
[3/9] incubator-trafficcontrol git commit: separate BUILD_NUMBER and
RHEL_NUMBER during build
Posted by da...@apache.org.
separate BUILD_NUMBER and RHEL_NUMBER during build
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/1317b3f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/1317b3f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/1317b3f4
Branch: refs/heads/psql-rebase
Commit: 1317b3f42d8667d0d1e11433059a9daa9869b6b7
Parents: 06a565a
Author: Dan Kirkwood <da...@gmail.com>
Authored: Mon Nov 28 15:36:32 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Wed Nov 30 11:14:44 2016 -0700
----------------------------------------------------------------------
build/functions.sh | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/1317b3f4/build/functions.sh
----------------------------------------------------------------------
diff --git a/build/functions.sh b/build/functions.sh
index 6fa861f..874c7e0 100755
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -93,7 +93,8 @@ function getCommit() {
# ---------------------------------------
function checkEnvironment {
export TC_VERSION=$(getVersion "$TC_DIR")
- export BUILD_NUMBER="${BUILD_NUMBER:-$(getBuildNumber)}.$(getRhelVersion)"
+ export BUILD_NUMBER=$(getBuildNumber)
+ export RHEL_VERSION=$(getRhelVersion)
export WORKSPACE=${WORKSPACE:-$TC_DIR}
export RPMBUILD="$WORKSPACE/rpmbuild"
export DIST="$WORKSPACE/dist"
@@ -115,6 +116,7 @@ function checkEnvironment {
echo "=================================================="
echo "WORKSPACE: $WORKSPACE"
echo "BUILD_NUMBER: $BUILD_NUMBER"
+ echo "RHEL_VERSION: $RHEL_VERSION"
echo "TC_VERSION: $TC_VERSION"
echo "--------------------------------------------------"
}
@@ -130,15 +132,16 @@ function createSourceDir() {
# ---------------------------------------
function buildRpm () {
for package in "$@"; do
- local rpm="${package}-${TC_VERSION}-${BUILD_NUMBER}.$(uname -m).rpm"
- local srpm="${package}-${TC_VERSION}-${BUILD_NUMBER}.src.rpm"
+ local pre="${package}-${TC_VERSION}-${BUILD_NUMBER}.${RHEL_VERSION}"
+ local rpm="${pre}.$(uname -m).rpm"
+ local srpm="${pre}.src.rpm"
echo "Building the rpm."
cd "$RPMBUILD" && \
rpmbuild --define "_topdir $(pwd)" \
--define "traffic_control_version $TC_VERSION" \
--define "commit $(getCommit)" \
- --define "build_number $BUILD_NUMBER" \
+ --define "build_number $BUILD_NUMBER.$RHEL_VERSION" \
-ba SPECS/$package.spec || \
{ echo "RPM BUILD FAILED: $?"; exit 1; }