diff options
author | Pedro Alvarez Piedehierro <palvarez89@gmail.com> | 2017-05-22 00:02:37 +0000 |
---|---|---|
committer | Pedro Alvarez Piedehierro <palvarez89@gmail.com> | 2017-05-22 00:02:37 +0000 |
commit | ec0db0ce061d922d13f0592444d10fcc47a34216 (patch) | |
tree | d3be06c9a0ae142bfe242a2d5fa70b53b67da942 | |
parent | 010aaeedfed6d1bdad723af565276e74d0ad0711 (diff) | |
parent | 65bf07f0fe6ec48dc8425c3d42813c18ded31d92 (diff) | |
download | infrastructure-ec0db0ce061d922d13f0592444d10fcc47a34216.tar.gz |
Merge branch 'pedro/gitlab-bot-multichannel' into 'master'
baserock_bots: configure Gitlab bot for Baserock too
See merge request !2
-rw-r--r-- | baserock_bots/config.js | 52 | ||||
-rw-r--r-- | baserock_bots/gitlab-bot.yml | 2 |
2 files changed, 45 insertions, 9 deletions
diff --git a/baserock_bots/config.js b/baserock_bots/config.js index 5c8ea793..15173a1a 100644 --- a/baserock_bots/config.js +++ b/baserock_bots/config.js @@ -1,17 +1,53 @@ module.exports = { // IRC server to connect to. - server: 'irc.gimp.org', + servers: { + gimp: 'irc.gimp.org', + freenode: 'irc.freenode.net' + }, // List of channels / people to report to. - reports: { - '#buildstream': ['push', 'merge_request', 'issue'] - // 'somebody': ['push', 'merge_request', 'issue', 'build'] - }, + triggers: [ + { + project: 'baserock/definitions', + network: 'freenode', + reports: { + '#baserock': ['push', 'merge_request', 'issue'] + } + }, + { + project: 'baserock/infrastructure', + network: 'freenode', + reports: { + '#baserock': ['push', 'merge_request', 'issue'] + } + }, + { + project: 'baserock/lorries', + network: 'freenode', + reports: { + '#baserock': ['push', 'merge_request', 'issue'] + } + }, + { + project: 'baserock/ybd', + network: 'freenode', + reports: { + '#baserock': ['push', 'merge_request', 'issue'] + } + }, + { + project: 'BuildStream/buildstream', + network: 'gimp', + reports: { + '#buildstream': ['push', 'merge_request', 'issue'] + } + }, + ], // IRC nick/names for the bot - nick: 'gitlab-bst', - userName: 'gitlab-bst', - realName: 'Gitlab Bot for BuildStream', + nick: 'gitlab-br-bot', + userName: 'gitlab-br-bot', + realName: 'Gitlab Bot provided by Baserock', // Secret as entered in the Gitlab Webhook instance. secret: '{{ gitlab_buildstream_secret }}', diff --git a/baserock_bots/gitlab-bot.yml b/baserock_bots/gitlab-bot.yml index f47cacd9..4e3549df 100644 --- a/baserock_bots/gitlab-bot.yml +++ b/baserock_bots/gitlab-bot.yml @@ -4,7 +4,7 @@ vars_files: - gitlab_buildstream_secret.yml vars: - - gitlab_to_irc_url: https://framagit.org/bnjbvr/gitlab-to-irc + - gitlab_to_irc_url: https://gitlab.com/palvarez89/gitlab-to-irc - gitlab_to_irc_branch: master - gitlab_to_irc_install_location: /home/ubuntu/gitlab-to-irc tasks: |