opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-03 12:17:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4071 from cevich/more_podbot

Browse Source 
Cirrus: More podbot/success improvements
This commit is contained in:
OpenShift Merge Robot
2019-09-22 16:57:54 +02:00
committed by GitHub
parent 0d95e3aa06 33b3d2914f
commit c0eff1a81c
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/cirrus/podbot.py
View File

@ -12,7 +12,7 @@ import sys
class IRC: class IRC:
response_timeout = 10 # seconds response_timeout = 30 # seconds
irc = socket.socket() irc = socket.socket()
def __init__(self, server, nickname, channel): def __init__(self, server, nickname, channel):
@ -90,9 +90,16 @@ class IRC:
if len(sys.argv) < 3: if len(sys.argv) < 3:
print("Error: Must pass desired nick and message as parameters") print("Error: Must pass desired nick and message as parameters")
else: else:
irc = IRC("irc.freenode.net", sys.argv[1], "#podman") for try_again in (True,False):
err = irc.connect(*os.environ.get('IRCID', 'Big Bug').split(" ", 2)) irc = IRC("irc.freenode.net", sys.argv[1], "#podman")
if not err: err = irc.connect(*os.environ.get('IRCID', 'Big Bug').split(" ", 2))
if err and try_again:
print("Trying again in 5 seconds...")
time.sleep(5)
continue
elif err:
break
irc.message(" ".join(sys.argv[2:])) irc.message(" ".join(sys.argv[2:]))
time.sleep(5.0) # avoid join/quit spam time.sleep(5.0) # avoid join/quit spam
irc.quit() irc.quit()
break

15
contrib/cirrus/success.sh
View File

@ -4,7 +4,7 @@ set -e
source $(dirname $0)/lib.sh source $(dirname $0)/lib.sh
req_env_var CIRRUS_BRANCH CIRRUS_BUILD_ID CIRRUS_REPO_FULL_NAME CIRRUS_BASE_SHA CIRRUS_CHANGE_IN_REPO req_env_var CIRRUS_BRANCH CIRRUS_REPO_FULL_NAME CIRRUS_BASE_SHA CIRRUS_CHANGE_IN_REPO CIRRUS_CHANGE_MESSAGE
cd $CIRRUS_WORKING_DIR cd $CIRRUS_WORKING_DIR
@ -25,9 +25,9 @@ then
# newline separated # newline separated
GITLOG="git log --format='%ae'" GITLOG="git log --format='%ae'"
COMMIT_AUTHORS=$($GITLOG $SHARANGE || $GITLOG -1 HEAD | \ COMMIT_AUTHORS=$($GITLOG $SHARANGE || $GITLOG -1 HEAD | \
sort -u | \
egrep -v "$EXCLUDE_RE" | \
tr --delete --complement "$EMAILCSET[:space:]" | \ tr --delete --complement "$EMAILCSET[:space:]" | \
egrep -v "$EXCLUDE_RE" | \
sort -u | \
tail -$MAX_NICKS) tail -$MAX_NICKS)
for c_email in $COMMIT_AUTHORS for c_email in $COMMIT_AUTHORS
@ -43,8 +43,13 @@ then
echo -e "\t\tNot found in $(basename $AUTHOR_NICKS_FILEPATH), using e-mail username." echo -e "\t\tNot found in $(basename $AUTHOR_NICKS_FILEPATH), using e-mail username."
NICK=$(echo "$c_email" | cut -d '@' -f 1) NICK=$(echo "$c_email" | cut -d '@' -f 1)
fi fi
echo -e "\tUsing nick $NICK" if ! echo "$NICKS" | grep -q "$NICK"
NICKS="${NICKS:+$NICKS, }$NICK" then
echo -e "\tUsing nick $NICK"
NICKS="${NICKS:+$NICKS, }$NICK"
else
echo -e "\tNot re-adding duplicate nick $NICK"
fi
done done
fi fi