You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2016/06/29 00:38:16 UTC
[trafficserver] branch master updated (c05f02d -> c8328c6)
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a change to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git.
from c05f02d TS-4481: CPP API - clear handles and reload on demand. This closes #663.
new 4aea32d Add support for the mirror triggers for all branches
new c8328c6 TS-4481 clang-format
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
ci/jenkins/bin/gh-mirror.sh | 81 +++++++++++++++++++++++++---------------
lib/atscppapi/src/Transaction.cc | 8 ++--
2 files changed, 55 insertions(+), 34 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].
[trafficserver] 02/02: TS-4481 clang-format
Posted by zw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit c8328c655641355abe00a95c44eaf87aaf9a6a55
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Tue Jun 28 18:38:06 2016 -0600
TS-4481 clang-format
---
lib/atscppapi/src/Transaction.cc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/atscppapi/src/Transaction.cc b/lib/atscppapi/src/Transaction.cc
index 5f331e8..4bce19c 100644
--- a/lib/atscppapi/src/Transaction.cc
+++ b/lib/atscppapi/src/Transaction.cc
@@ -508,16 +508,16 @@ Transaction::getCachedResponse()
void
Transaction::resetHandles()
{
- state_->cached_request_hdr_buf_ = NULL;
- state_->cached_request_hdr_loc_ = NULL;
+ state_->cached_request_hdr_buf_ = NULL;
+ state_->cached_request_hdr_loc_ = NULL;
state_->cached_response_hdr_buf_ = NULL;
state_->cached_response_hdr_loc_ = NULL;
state_->client_response_hdr_buf_ = NULL;
state_->client_response_hdr_loc_ = NULL;
- state_->server_request_hdr_buf_ = NULL;
- state_->server_request_hdr_loc_ = NULL;
+ state_->server_request_hdr_buf_ = NULL;
+ state_->server_request_hdr_loc_ = NULL;
state_->server_response_hdr_buf_ = NULL;
state_->server_response_hdr_loc_ = NULL;
}
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 01/02: Add support for the mirror triggers for all
branches
Posted by zw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit 4aea32dd18d269590792109c1971fbc6eb1b4ca2
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Tue Jun 28 18:37:42 2016 -0600
Add support for the mirror triggers for all branches
---
ci/jenkins/bin/gh-mirror.sh | 81 ++++++++++++++++++++++++++++-----------------
1 file changed, 51 insertions(+), 30 deletions(-)
diff --git a/ci/jenkins/bin/gh-mirror.sh b/ci/jenkins/bin/gh-mirror.sh
index caeadd0..2544dde 100755
--- a/ci/jenkins/bin/gh-mirror.sh
+++ b/ci/jenkins/bin/gh-mirror.sh
@@ -16,9 +16,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-GIT=${GIT:-/usr/bin/git}
-GREP=${GREP:-/usr/bin/grep}
-
# This should probably be configurable ...
cd /home/mirror/trafficserver.git || exit
@@ -27,36 +24,60 @@ if [ "" == "$1" ]; then
echo "Must provide the auth token for Jenkins"
exit 1
fi
+token="build?token=$1"
+
+# Optional second argument is the base URL, no trailing slash
+BASE_URL=${2:-"https://ci.trafficserver.apache.org"}
+
+# Some environment overridable defines
+GIT=${GIT:-/usr/bin/git}
+GREP=${GREP:-/usr/bin/grep}
+CURL=${CURL:-/usr/bin/curl}
+
+# Get the ref in the current version of the tree
+function getRef() {
+ local branch="$1"
-# Prep the URLs
-URL="https://ci.trafficserver.apache.org/view/master/job"
-TOKEN="build?token=$1"
+ ${GIT} show-ref -s refs/heads/${branch}
+}
-# Save away previous ref-specs
-REF_4_2=$(${GIT} show-ref -s refs/heads/4.2.x)
-REF_5_3=$(${GIT} show-ref -s refs/heads/5.3.x)
-REF_6_2=$(${GIT} show-ref -s refs/heads/6.2.x)
-REF_master=$(${GIT} show-ref -s refs/heads/master)
+# Check the diff, and trigger builds as appropriate
+function checkBuild() {
+ local ref="$1"
+ local branch="$2"
+ local diff
+ # Do the actual diff from the previous ref to current branch head
+ diff=$(${GIT} log --name-only --pretty=format: ${ref}..refs/heads/${branch} | ${GREP} -v '^$')
+
+ # Check if commits have doc/ changes
+ echo -n "$diff" | ${GREP} -F -e doc/ > /dev/null
+ if [ 0 == $? ]; then
+ echo "Triggerd Docs build for ${branch}"
+ ${CURL} -o /dev/null -s ${BASE_URL}/view/${branch}/job/docs-${branch}/${token}
+ fi
+
+ # Check if commits have non doc/ changes
+ echo -n "$diff" | ${GREP} -F -v -e doc/ > /dev/null
+ if [ 0 == $? ]; then
+ echo "Triggered main build for ${branch}"
+ ${CURL} -o /dev/null -s ${BASE_URL}/view/${branch}/job/in_tree-${branch}/${token}
+ ${CURL} -o /dev/null -s ${BASE_URL}/view/${branch}/job/out_of_tree-${branch}/${token}
+ fi
+}
+
+# Save away previous ref-specs, you must save all branches
+REF_4_2=$(getRef "4.2.x")
+REF_5_3=$(getRef "5.3.x")
+REF_6_2=$(getRef "6.2.x")
+REF_master=$(getRef "master")
+
+# Do the updates
${GIT} remote update > /dev/null 2>&1
${GIT} update-server-info
-# Now find the changes
-DIFF_4_2=$(${GIT} log --name-only --pretty=format: ${REF_4_2}..refs/heads/4.2.x| ${GREP} -v '^$')
-DIFF_5_3=$(${GIT} log --name-only --pretty=format: ${REF_5_3}..refs/heads/5.3.x | ${GREP} -v '^$')
-DIFF_6_2=$(${GIT} log --name-only --pretty=format: ${REF_6_2}..refs/heads/6.2.x | ${GREP} -v '^$')
-DIFF_master=$(${GIT} log --name-only --pretty=format: ${REF_master}..refs/heads/master | ${GREP} -v '^$')
-
-# Check master, we have to diff twice, because some commits could trigger both
-echo -n "$DIFF_master" | ${GREP} -F -e doc/ > /dev/null
-if [ 0 == $? ]; then
- echo "Triggerd Docs build for master"
- curl -o /dev/null -s ${URL}/docs-master/${TOKEN}
-fi
-
-echo -n "$DIFF_master" | ${GREP} -F -v -e doc/ > /dev/null
-if [ 0 == $? ]; then
- echo "Triggered main build for master"
- curl -o /dev/null -s ${URL}/in_tree-master/${TOKEN}
- curl -o /dev/null -s ${URL}/out_of_tree-master/${TOKEN}
-fi
+# Check the branches, this makes assumptions that the Jenkins build are named after the branches
+checkBuild "$REF_4_2" "4.2.x"
+checkBuild "$REF_5_3" "5.3.x"
+checkBuild "$REF_6_2" "6.2.x"
+checkBuild "$REF_master" "master"
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.