add generic master merge into release/* branches (#6249)
This commit is contained in:
Alvin Huang
GitHub
parent
f5471c7f8d
commit
f834854f8a
|
|
@ -500,8 +500,142 @@ jobs:
|
|||
ENVOY_VERSIONS: "1.10.0"
|
||||
steps: *ENVOY_INTEGRATION_TEST_STEPS
|
||||
|
||||
# This job merges master into the 'current' branch (${CIRCLE_BRANCH}) specified
|
||||
# in the branch filtering of the workflow
|
||||
merge-master:
|
||||
docker:
|
||||
- image: *GOLANG_IMAGE
|
||||
steps:
|
||||
- add_ssh_keys:
|
||||
fingerprints:
|
||||
- c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
|
||||
- checkout
|
||||
- run:
|
||||
name: Merge Consul OSS master branch into current branch
|
||||
command: |
|
||||
set -eu -o pipefail
|
||||
|
||||
# Configure Git
|
||||
git config --global user.email "hashicorp-ci@users.noreply.github.com"
|
||||
git config --global user.name "hashicorp-ci"
|
||||
|
||||
# Fetch latest master
|
||||
git fetch origin
|
||||
|
||||
# Create a merge branch to run tests on
|
||||
git_merge_branch="ci/master-merge-${CIRCLE_BRANCH}-$(date +%Y%m%d%H%M%S)"
|
||||
git checkout -b "${git_merge_branch}"
|
||||
latest_oss_commit="$(git rev-parse origin/master)"
|
||||
|
||||
if ! errors=$(git merge -m "Merge Consul OSS branch 'master' at commit ${latest_oss_commit}" "${latest_oss_commit}"); then
|
||||
printf "oss/master merge into ${CIRCLE_BRANCH} failed because git was unable to auto-merge!\n${errors}"
|
||||
curl -X POST -H 'Content-type: application/json' \
|
||||
--data \
|
||||
"{ \
|
||||
\"attachments\": [ \
|
||||
{ \
|
||||
\"fallback\": \"master merge into ${CIRCLE_BRANCH} failed because git was unable to auto-merge!\", \
|
||||
\"text\": \"Nightly *master* merge into *${CIRCLE_BRANCH}* failed!\n\nBuild Log: ${CIRCLE_BUILD_URL}\n\nGit was unable to auto-merge due to possible merge conflict.\n\n*Errors:*\n${errors}\", \
|
||||
\"footer\": \"${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}\", \
|
||||
\"ts\": \"$(date +%s)\", \
|
||||
\"color\": \"danger\" \
|
||||
} \
|
||||
] \
|
||||
}" ${CONSUL_SLACK_WEBHOOK_URL}
|
||||
exit 1
|
||||
fi
|
||||
|
||||
git push origin "${git_merge_branch}"
|
||||
sleep 15 # Wait for merge branch to start CircleCI pipeline
|
||||
|
||||
# Wait for OSS merge branch CircleCI pipeline to finish
|
||||
# return shallow results for better performance
|
||||
project_url="https://circleci.com/api/v1.1/project/github/hashicorp/consul/tree/${git_merge_branch}?shallow=true"
|
||||
echo "Waiting for master merge branch CI pipeline to finish..."
|
||||
builds=
|
||||
unfinished_builds="will be populated in the until loop below"
|
||||
min_waited=0
|
||||
until [[ -z "${unfinished_builds}" ]]; do
|
||||
builds="$(curl \
|
||||
--header 'Accept: application/json' \
|
||||
--show-error \
|
||||
--silent \
|
||||
"${project_url}")"
|
||||
unfinished_builds="$(echo "${builds}" \
|
||||
| jq --raw-output '.[] | select(.lifecycle!="finished") | .workflows.job_name')"
|
||||
sleep 60
|
||||
let "min_waited += 1"
|
||||
echo "Waited ${min_waited} min..."
|
||||
done
|
||||
|
||||
# Fail this job if the merge branch CI pipeline failed
|
||||
# unsuccessful_builds will be a multiline string variable with a line format of " $job_name: $build_url"
|
||||
unsuccessful_builds="$(echo "${builds}" \
|
||||
| jq --raw-output '.[] | select(.outcome!="success") | "\(.workflows.job_name): \(.build_url)"')"
|
||||
if [[ -n "${unsuccessful_builds}" ]]; then
|
||||
printf "master merge CI pipeline jobs failed:\n${unsuccessful_builds}\n"
|
||||
curl -X POST -H 'Content-type: application/json' \
|
||||
--data \
|
||||
"{ \
|
||||
\"attachments\": [ \
|
||||
{ \
|
||||
\"fallback\": \"Nightly Master Merge Failed!\", \
|
||||
\"text\": \"Nightly *master* merge into *${CIRCLE_BRANCH}* failed!\n\nBuild Log: ${CIRCLE_BUILD_URL}\n\nAttempted merge from: https://github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/tree/${git_merge_branch}\n\nThere may be a merge conflict to resolve.\", \
|
||||
\"footer\": \"${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}\", \
|
||||
\"ts\": \"$(date +%s)\", \
|
||||
\"color\": \"danger\" \
|
||||
} \
|
||||
] \
|
||||
}" ${CONSUL_SLACK_WEBHOOK_URL}
|
||||
exit 1
|
||||
fi
|
||||
|
||||
current_ref=$(git rev-parse HEAD)
|
||||
# Set CLA check to pass
|
||||
echo "Setting CLA check"
|
||||
curl -u "${HASHICORP_CI_GITHUB_TOKEN}:" -X POST \
|
||||
--header "Accept: application/json" \
|
||||
--show-error \
|
||||
--silent \
|
||||
--fail \
|
||||
--output /dev/null \
|
||||
-d "{ \"state\": \"success\", \
|
||||
\"target_url\": \"https://cla.hashicorp.com/hashicorp/consul\", \
|
||||
\"description\": \"Contributor License Agreement is signed.\", \
|
||||
\"context\": \"license/cla\"}" https://api.github.com/repos/hashicorp/consul/statuses/${current_ref}
|
||||
|
||||
# CircleCI jobs passed, merging to release branch
|
||||
echo "master merge CI pipeline passed successfully so merging to ${CIRCLE_BRANCH}!"
|
||||
git checkout "${CIRCLE_BRANCH}"
|
||||
git merge "${git_merge_branch}"
|
||||
git push origin "${CIRCLE_BRANCH}"
|
||||
git push --delete origin "${git_merge_branch}"
|
||||
curl -X POST -H 'Content-type: application/json' \
|
||||
--data \
|
||||
"{ \
|
||||
\"attachments\": [ \
|
||||
{ \
|
||||
\"fallback\": \"Nightly master merge success!\", \
|
||||
\"text\": \"Nightly *master* merge into *${CIRCLE_BRANCH}* succeeded!\", \
|
||||
\"footer\": \"${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}\", \
|
||||
\"ts\": \"$(date +%s)\", \
|
||||
\"color\": \"good\" \
|
||||
} \
|
||||
] \
|
||||
}" ${CONSUL_SLACK_WEBHOOK_URL}
|
||||
|
||||
workflows:
|
||||
version: 2
|
||||
merge-master-to-release:
|
||||
jobs:
|
||||
- merge-master
|
||||
triggers:
|
||||
- schedule:
|
||||
cron: "0 2 * * *" # 2AM UTC <> 10PM EST <> 7PM PST should have no impact
|
||||
filters:
|
||||
branches:
|
||||
only:
|
||||
- /^release\/.*$/
|
||||
go-tests:
|
||||
jobs:
|
||||
- check-vendor
|
||||
|
|
|
|||
Loading…
Reference in New Issue