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 16:05:31 UTC
[1/3] incubator-trafficcontrol git commit: fix ref to TC_VERSION
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/1.8.x 8dc3f0cfe -> 8766dbcb3
fix ref to TC_VERSION
(cherry picked from commit e06fbf852c91aea48103366db99f94857e72857a)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/8766dbcb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/8766dbcb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/8766dbcb
Branch: refs/heads/1.8.x
Commit: 8766dbcb38105fbc97b955b4733defe40c83db00
Parents: c1e1af2
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 16:05:01 2016 +0000
----------------------------------------------------------------------
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/8766dbcb/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; }
[2/3] 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
(cherry picked from commit 3003a304cf34c255ca0e6381f8b60d1bce392d47)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/c1e1af27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/c1e1af27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/c1e1af27
Branch: refs/heads/1.8.x
Commit: c1e1af2702f6a581d18af5840b149b0eb0a3999b
Parents: b32c990
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 16:05:01 2016 +0000
----------------------------------------------------------------------
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/c1e1af27/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/3] 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
(cherry picked from commit 7868dd931ffe3e1388f587e2e735289ba824f69a)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/b32c9900
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/b32c9900
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/b32c9900
Branch: refs/heads/1.8.x
Commit: b32c99002279f2c78c797397dacd2803cdf80b9f
Parents: 8dc3f0c
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 16:05:01 2016 +0000
----------------------------------------------------------------------
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/b32c9900/traffic_monitor/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_monitor/pom.xml b/traffic_monitor/pom.xml
index d4c5f0a..5366a2e 100644
--- a/traffic_monitor/pom.xml
+++ b/traffic_monitor/pom.xml
@@ -281,7 +281,8 @@
<configuration>
<rules>
<requireEnvironmentVariable>
- <variableName>GIT_REV_COUNT</variableName>
+ <variableName>BUILD_NUMBER</variableName>
+ <variableName>RHEL_VERSION</variableName>
</requireEnvironmentVariable>
</rules>
<fail>true</fail>
@@ -318,7 +319,7 @@
</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/b32c9900/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>