Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Accumulated SnabbBot and SnabbDoc fixes #1432

Merged
merged 14 commits into from
Nov 8, 2019
Merged

Accumulated SnabbBot and SnabbDoc fixes #1432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
25a8d95
snabb_bot: delete $tmpdir on startup
eugeneia Nov 14, 2017
971627f
snabb_bot: configure git user name and email
eugeneia Nov 14, 2017
29e2303
snabb_bot: add timeout to cushion broken test cases
eugeneia Feb 8, 2018
6d1594a
snabb_bot: print SNABB_PCI_INTEL1G{0,1} / snabb_doc: set git user/email
eugeneia Feb 9, 2018
44f6ab0
snabb_doc: fixup git user/email config
eugeneia Feb 9, 2018
d0430d2
Merge branch 'master' into snabb_bot-fixes
eugeneia Jun 1, 2018
65f0a75
snabb_bot: fix bug that compared benchmark results with wrong target
eugeneia Jun 5, 2018
f49720a
snabb_bot: make checkout/merge more robust
eugeneia Jun 5, 2018
90c3be7
snabb_bot: fix bug in benchmark regression testing
eugeneia Jun 25, 2018
db1320f
snabb_bot.sh: do not attempt to initialize submodules
eugeneia Jan 7, 2019
3f16ef7
snabb_doc.sh: support multiple tags pointing at the same commit.
eugeneia Jul 14, 2019
a9ec5e1
Merge branch 'snabb_bot-fixes' into snabb_doc-multi-tags
eugeneia Jul 14, 2019
6d888d0
snabb_bot.sh: run as many tests as possible, don't abort on failure
eugeneia Jul 16, 2019
fa596cd
Merge branch 'snabb_bot-fixes' into snabb_doc-multi-tags
eugeneia Jul 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 29 additions & 23 deletions src/scripts/snabb_bot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,10 @@ function init {
fi
export logdir="$SNABBBOTDIR/log"
export tmpdir="$SNABBBOTDIR/tmp"
rm -rf "$tmpdir"
mkdir -p "$SNABBBOTDIR" "$logdir" "$tmpdir"
}

function clean { rm -rf "$tmpdir"; }

function fetch_pull_requests {
local url="https://api.github.com/repos/$REPO/pulls?per_page=100"
if [[ -n "$CLIENT_ID" && -n "$CLIENT_SECRET" ]]; then
Expand Down Expand Up @@ -73,15 +72,17 @@ function pull_request_new_p {
}

function clone_upstream {
local url="https://github.com/$REPO.git"
if [[ -n "$GITHUB_CREDENTIALS" ]]; then
git clone "https://$GITHUB_CREDENTIALS@github.com/$REPO.git" $(repo_path)
else
git clone "https://github.com/$REPO.git" $(repo_path)
url="https://$GITHUB_CREDENTIALS@github.com/$REPO.git"
fi
git clone $url $(repo_path) \
&& (cd $(repo_path)
git config user.email "snabb_bot.service@$(hostname)"
git config user.name "Snabb Bot")
}

function dock_build { (cd src && scripts/dock.sh "(cd .. && make)"); }
function build { git submodule update --init && dock_build; }
function build { (cd src && scripts/dock.sh "(cd .. && make)"); }

function log_status {
if grep "ERROR" $(pull_request_log $1) >/dev/null 2>&1; then
Expand All @@ -105,6 +106,8 @@ function log_header {
pci_info SNABB_PCI1 $SNABB_PCI1
pci_info SNABB_PCI_INTEL0 $SNABB_PCI_INTEL0
pci_info SNABB_PCI_INTEL1 $SNABB_PCI_INTEL1
pci_info SNABB_PCI_INTEL1G0 $SNABB_PCI_INTEL1G0
pci_info SNABB_PCI_INTEL1G1 $SNABB_PCI_INTEL1G1
pci_info SNABB_PCI_SOLARFLARE0 $SNABB_PCI_SOLARFLARE0
pci_info SNABB_PCI_SOLARFLARE1 $SNABB_PCI_SOLARFLARE1
echo
Expand All @@ -113,14 +116,16 @@ function log_header {
function benchmark_results { echo $tmpdir/$1_benchmarks; }

function benchmark_target1 {
git checkout --force $(target_head $1) \
git clean -f -f \
&& git checkout --force $(target_head $1) \
&& build \
&& dock_make benchmarks > $(benchmark_results $1)
&& dock_make benchmarks > $(benchmark_results $(pull_request_target $1))
}
function benchmark_target { benchmark_target1 $1 >/dev/null 2>&1; }

function merge_pr_with_target1 {
git fetch origin pull/$1/head:pr$1 \
git clean -f -f \
&& git fetch origin pull/$1/head:pr$1 \
&& git checkout --force pr$1 \
&& git merge $(target_head $1) \
&& build
Expand All @@ -130,19 +135,22 @@ function merge_pr_with_target {
if [ "$?" != 0 ]; then
echo "ERROR: Failed to build $1"
echo "$out"
git status
echo
return 1
fi
}

function dock_make { (cd src/; scripts/dock.sh make $1); }
function dock_make {
(cd src/; timeout --foreground 1h scripts/dock.sh make $1);
}

function check_for_performance_regressions {
echo "Checking for performance regressions:"
dock_make benchmarks > $(benchmark_results pr)
for bench in $(cut -d " " -f 1 $(benchmark_results pr)); do
if grep $bench $(benchmark_results current) >/dev/null 2>&1; then
echo $(grep "$bench " $(benchmark_results current)) \
if grep "$bench " $(benchmark_results $1) >/dev/null 2>&1; then
echo $(grep "$bench " $(benchmark_results $1)) \
$(grep "$bench " $(benchmark_results pr)) \
| awk '
BEGIN {
Expand All @@ -164,15 +172,14 @@ BEGIN {

function check_test_suite {
echo "Checking test suite:"
if ! dock_make test_ci; then
dock_make test | tee make-test.log
echo
echo "Errors during tests:"
for log in $(grep ERROR make-test.log | awk '{print $2}'); do
echo $log:
cat src/$log
echo
echo "ERROR during tests:"
for log in src/testlog/*; do
echo $log:
cat $log
echo
done
fi
done
echo
}

Expand Down Expand Up @@ -224,10 +231,9 @@ for id in $(pull_request_ids); do
|| benchmark_target $id
log_header $id
if merge_pr_with_target $id; then
check_for_performance_regressions $id
check_for_performance_regressions $(pull_request_target $id)
check_test_suite
fi) 2>&1 > $(pull_request_log $id)
[ ! -z "$GITHUB_CREDENTIALS" ] || continue
post_status $id $(log_status $id) $(post_gist $(pull_request_log $id))
done
clean
17 changes: 11 additions & 6 deletions src/scripts/snabb_doc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,10 @@ function fetch_pr_head {

function ensure_docs_cloned {
[ -d $docdir ] || \
git clone https://$GITHUB_CREDENTIALS@github.com/$DOCREPO.git $docdir
git clone https://$GITHUB_CREDENTIALS@github.com/$DOCREPO.git $docdir \
&& (cd $docdir
git config user.email "snabb_doc.service@$(hostname)"
git config user.name "Snabb Doc")
mkdir -p $docdir/{sha1,tag}
}

Expand Down Expand Up @@ -116,11 +119,13 @@ init
ensure_docs_cloned || exit 1
fetch_pull_requests && clone_upstream || exit 1

# Build manual for current tag unless it already exists
if [ ! -f $(tag_out $(current_tag)) ]; then
build_doc $(current_tag) $(tag_out $(current_tag)) \
&& cp $(tag_out $(current_tag)) $(index_out)
fi
# Build manual for current tag(s) unless it already exists
for tag in $(current_tag); do
if [ ! -f $(tag_out $tag) ]; then
build_doc $tag $(tag_out $tag) \
&& cp $(tag_out $tag) $(index_out)
fi
done

# Build manual for open PRs and link it as status
for id in $(pull_request_ids); do
Expand Down