From a4d39c0dbd068aa3f85d120157a1f6f164d7af26 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Tue, 6 Mar 2018 12:22:34 -0600 Subject: [PATCH] ceph-volume-ansible-prs: use github_status_setup from build_utils.sh Signed-off-by: Andrew Schoen --- ceph-volume-ansible-prs/build/build | 47 +++-------------------------- 1 file changed, 4 insertions(+), 43 deletions(-) diff --git a/ceph-volume-ansible-prs/build/build b/ceph-volume-ansible-prs/build/build index a2640c1f..e306937d 100644 --- a/ceph-volume-ansible-prs/build/build +++ b/ceph-volume-ansible-prs/build/build @@ -3,49 +3,10 @@ set -ex env WORKDIR=$(mktemp -td tox.XXXXXXXXXX) -# This job is meant to be triggered from a Github Pull Request, only when the -# job is executed in that way a few "special" variables become available. So -# this build script tries to use those first but then it will try to figure it -# out using Git directly so that if triggered manually it can attempt to -# actually work. -SHA=$ghprbActualCommit -BRANCH=$ghprbSourceBranch - - -# Find out the name of the remote branch from the Pull Request. This is otherwise not -# available by the plugin. Without grepping for `heads` output will look like: -# -# 855ce630695ed9ca53c314b7e261ec3cc499787d refs/heads/wip-volume-tests -if [ -z "$ghprbSourceBranch" ]; then - BRANCH=`git ls-remote origin | grep $GIT_PREVIOUS_COMMIT | grep heads | cut -d '/' -f 3` - SHA=$GIT_PREVIOUS_COMMIT -fi - -# sometimes, $GIT_PREVIOUS_COMMIT will not help grep from ls-remote, so we fallback -# to looking for GIT_COMMIT (e.g. if the branch has not been rebased to be the tip) -if [ -z "$BRANCH" ]; then - BRANCH=`git ls-remote origin | grep $GIT_COMMIT | grep heads | cut -d '/' -f 3` - SHA=$GIT_COMMIT -fi - -# Finally, we verify one last time to bail if nothing really worked here to determine -# this -if [ -z "$BRANCH" ]; then - echo "Could not determine \$BRANCH var from \$ghprbSourceBranch" - echo "or by using \$GIT_PREVIOUS_COMMIT and \$GIT_COMMIT" - exit 1 -fi - -# if ghprbActualCommit is not available, and the previous checks were not able to determine -# the SHA1, then the last attempt should be to try and set it to the env passed in as a parameter (GITHUB_SHA) -SHA="${ghprbActualCommit:-$GITHUB_SHA}" -if [ -z "$SHA" ]; then - echo "Could not determine \$SHA var from \$ghprbActualCommit" - echo "or by using \$GIT_PREVIOUS_COMMIT or \$GIT_COMMIT" - echo "or even looking at the \$GITHUB_SHA parameter for this job" - exit 1 -fi - +# set up variables needed for +# githubstatus to report back to the github PR +# if this project was started manually +github_status_setup # TODO: at this point a `curl` to shaman is needed to verify that the repo is # ready to be consumed -- 2.39.5