[Libreoffice-commits] dev-tools.git: ciabot/config-example.cfg ciabot/config.pl.sample ciabot/.gitignore ciabot/INSTALL ciabot/irker-cia-proxy.py ciabot/libreoffice-bugzilla2.py ciabot/libreoffice-cia
ciabot/.gitignore|1 ciabot/INSTALL | 19 -- ciabot/README| 109 -- ciabot/config-example.cfg| 16 -- ciabot/config.pl.sample | 11 - ciabot/irker-cia-proxy.py| 152 ciabot/libreoffice-bugzilla2.py | 231 --- ciabot/libreoffice-ciabot.pl | 290 --- ciabot/projmap.json |7 ciabot/run-libreoffice-ciabot.pl | 229 -- ciabot/setup/install | 34 ciabot/setup/irkerd.conf | 18 -- ciabot/setup/loircbot.conf | 19 -- ciabot/sigui-bugzilla.pl | 129 - ciabot/start-ciabot.sh |5 ciabot/start-irker.sh|7 16 files changed, 1277 deletions(-) New commits: commit aed5bd02b50032e9152f2f91c5632f6b44987c35 Author: Guilhem Moulin AuthorDate: Mon Jul 6 00:17:51 2020 +0200 Commit: Guilhem Moulin CommitDate: Mon Jul 6 00:17:51 2020 +0200 ciabot: Move subtree to infra/salt The repository now lives at https://git.libreoffice.org/infra/salt/+/master/ciabot/ . This makes it easier for the infra team to deploy changes to production. Subtree history was preserved during the operation: https://git.libreoffice.org/infra/salt/history/7162daff402d4ad235ed48e3872bc0b50faa2275 diff --git a/ciabot/.gitignore b/ciabot/.gitignore deleted file mode 100644 index 3e9cb72..000 --- a/ciabot/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/repositories diff --git a/ciabot/INSTALL b/ciabot/INSTALL deleted file mode 100644 index 3f36105..000 --- a/ciabot/INSTALL +++ /dev/null @@ -1,19 +0,0 @@ -The following steps are needed to use this code: - -Install some packages: -- Python - * git module (Debian: python-git) - * bugzilla module (Debian: python-bugzilla) - -Configure the software: -- Copy config-example.cfg -> config.cfg and change the defaults - - -- Have this directory as e.g. ~/prod - -Clone-out extra repositories -- git clone https://gitlab.com/esr/irker ~/git/irker -- git clone https://github.com/vmiklos/irker-cia-proxy ~/git/irker-cia-proxy - -Run the install script -- ~/git/dev-tools/ciabot/setup/install diff --git a/ciabot/README b/ciabot/README deleted file mode 100644 index 4ea4e1b..000 --- a/ciabot/README +++ /dev/null @@ -1,109 +0,0 @@ -How the IRC nofication part works: - -1) After a reboot, start-irker.sh and start-ciabot.sh has to be started -manually. The first starts irkerd, which -- in case of no errors -- has no -output. The second starts run-libreoffice-ciabot.pl in screen. - -2) run-libreoffice-ciabot.pl invokes libreoffice-ciabot.pl for each commit, which -has an XML output, piped into irker-cia-proxy.py, which sends the info to -irkerd. - - -TESTING - -How to test the IRC notification part: --- - -1) Take the IRC bot "offline", by editing ~/bin/irker-cia-proxy/projmap.json, -e.g. redirect the channel from #libreoffice-dev to some test channel. - -2) Run: - -cd ~/libreoffice/core -perl ~/bin/libreoffice-ciabot.pl core f9453275d2710f9d3e9a4cc1285a57db334a5e2e | (cd ~/bin/irker-cia-proxy; python irker-cia-proxy.py -s) - -3) Once you're happy with the result, change projmap.json back. - - -How to test the Bugzilla integration: -- - -- Follow the instructions in INSTALL to install packages and configure - the software. - - (NOTE: It's possible that for simple testing you won't have to - install repos besides dev-tools and LibreOffice core. More details - in the future :-) - -- Edit file projmap.json to change the IRC channel - -e.g. "to": "ircs://irc.freenode.net/libreoffice-dev" -> - "to": "ircs://irc.freenode.net/libreoffice-dev-test" - -- Edit config.cfg to change the url for the Bugzilla install - -e.g. url = bugs.libreoffice.org/xmlrpc.cgi -> - url = bugzilla-test.documentfoundation.org/xmlrpc.cgi - -Don't forget to also update the user/password for connecting. - -- If you don't have a LibreOffice core repo handy, clone one out - -https://wiki.documentfoundation.org/Development/BuildingOnLinux#Cloning_and_building - -- cd to the LibreOffice core repo - - cd ~/libreoffice/core - -- Run the script: - -That should give you text that looks like this (abbreviated for space): - - - -CIA Perl client for Git -1.0 - - ... - - -If that doesn't crash, let's go further. - -- Make a commit in the core repo (but do NOT push it!). - -Reference a test bug so you don't email anyone else. Example: - -commit 3da8ea79e9616332fdd13a78409e963a96318428 -Author: Robinson Tryon -Date: Sun Dec 7 19:49:36 2014 -0500 - -fdo#76789 - Test Git-Bugzilla integration scripts - -Testing the integration scripts in ciabot/ to make sure that they run -as expected against a new server setup. - -If the run is successful, you shouldn't see
[Libreoffice-commits] dev-tools.git: ciabot/config-example.cfg
ciabot/config-example.cfg |9 + 1 file changed, 9 insertions(+) New commits: commit 8d8316688ced02271757a58aeb1b448df76e2b0b Author: Miklos VajnaDate: Wed Oct 7 10:54:49 2015 +0200 ciabot: enable help/online/dev-tools bugzilla notifications Change-Id: I153780fcad063f4d9492f46bbb7ea14a97a78505 diff --git a/ciabot/config-example.cfg b/ciabot/config-example.cfg index 4d383ac..45d95f0 100644 --- a/ciabot/config-example.cfg +++ b/ciabot/config-example.cfg @@ -1,6 +1,15 @@ [core] location = /home/moggi/devel/libo_push/ +[help] +location = /home/ciabot/prod/help/ + +[online] +location = /home/ciabot/prod/online/ + +[contrib/dev-tools] +location = /home/ciabot/prod/contrib/dev-tools/ + [bugzilla] url = bugs.libreoffice.org/xmlrpc.cgi user = your.user.n...@bugs.com ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: ciabot/config-example.cfg
ciabot/config-example.cfg |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9ff56afdb6ca0f64aff38f9fc572673504456169 Author: Robinson Tryon qu...@runcibility.com Date: Thu Nov 27 08:12:06 2014 -0500 ciabot: Replace FDO Bugzilla url (to facilitate migration) Change-Id: I7fe177f11985a87f657fb5eb5487cde8dd150066 diff --git a/ciabot/config-example.cfg b/ciabot/config-example.cfg index 3671e1a..4d383ac 100644 --- a/ciabot/config-example.cfg +++ b/ciabot/config-example.cfg @@ -2,6 +2,6 @@ location = /home/moggi/devel/libo_push/ [bugzilla] -url = bugs.freedesktop.org/xmlrpc.cgi +url = bugs.libreoffice.org/xmlrpc.cgi user = your.user.n...@bugs.com password = MySecretPassword ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: ciabot/config-example.cfg ciabot/libreoffice-bugzilla2.py
ciabot/config-example.cfg |7 + ciabot/libreoffice-bugzilla2.py | 203 2 files changed, 210 insertions(+) New commits: commit 20ff074cdf9ce3f68fb8ef399b02dbf0649aea4d Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Sun Oct 26 21:36:02 2014 +0100 implement new git bugzilla script diff --git a/ciabot/config-example.cfg b/ciabot/config-example.cfg new file mode 100644 index 000..3671e1a --- /dev/null +++ b/ciabot/config-example.cfg @@ -0,0 +1,7 @@ +[core] +location = /home/moggi/devel/libo_push/ + +[bugzilla] +url = bugs.freedesktop.org/xmlrpc.cgi +user = your.user.n...@bugs.com +password = MySecretPassword diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py new file mode 100644 index 000..1a72143 --- /dev/null +++ b/ciabot/libreoffice-bugzilla2.py @@ -0,0 +1,203 @@ +# libreoffice git bugzilla integration +# Copyright (C) 2014 Markus Mohrhard +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. + +from __future__ import print_function + +import datetime +import os +import re +import sys, getopt +import git +import ConfigParser + +if hasattr(sys.version_info, major) and sys.version_info.major = 3: +# pylint: disable=F0401,E0611 +from urllib.parse import urlparse +else: +from urlparse import urlparse + +import bugzilla +from bugzilla import Bugzilla +from bugzilla.base import _BugzillaToken + +master_target = 4.4.0 +bug_regex = fdo#(\d+) + +class FreedesktopBZ: +bzclass = bugzilla.Bugzilla44 + +bz = None + +def connect(self): +config = ConfigParser.ConfigParser() +config.read('config.cfg') +url = config.get('bugzilla', 'url') +user = config.get('bugzilla', 'user') +password = config.get('bugzilla', 'password') +self.bz = self.bzclass(url=url) +self.bz.login(user=user, password=password) + +def update_whiteboard(self, commit, bugnr, new_version, branch, repo_name): +bug = self.bz.getbug(bugnr) +print(bug) +old_whiteboard = bug.getwhiteboard() + +m = re.search(new_version, old_whiteboard) +if m is not None and len(m.groups()) 0: +new_whiteboard = old_whiteboard + target: + new_version +bug.setwhiteboard(new_whiteboard) + +cgiturl = http://cgit.freedesktop.org/libreoffice/%s/commit/?id=%s; %(repo_name, commit.hexsha) +if branch is not None: +cgiturl = cgiturl + h= + branch +else: +branch = master + +comment_msg = %s committed a patch related to this issue. +It has been pushed to %s: + +%s + +%s +It will be available in %s. + +The patch should be included in the daily builds available at +http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More +information about daily builds can be found at: +http://wiki.documentfoundation.org/Testing_Daily_Builds +Affected users are encouraged to test the fix and report feedback. %(commit.author, branch, cgiturl, commit.summary, new_version) +print(comment_msg) +bug.addcomment(comment_msg) + + + + +def find_target_version(repo, branch): +if branch is None: +return master_target + +# check if committed to a release branch +# form libreoffice-x-y-z = will be available in x.y.z +match = re.search(libreoffice-(\d+)-(\d+)-(\d+), branch) +if match is not None: +return ..join(map(str, match.groups())) + +# form libreoffice-x-y +# branch of libreoffice-x-y-z exists = will be available in x.y.z+1 +# else +# tag libreoffice-x.y.0.z exists = will be available in x.y.0.z+1 (RC) +# else +# beta +match = re.search(libreoffice-(\d+)-(\d+), branch) +if match is not None: +base = ..join(map(str, match.groups())) +branches = repo.remote().refs +branch_names = [str(branch) for branch in branches] +print(branch_names) +search_string = libreoffice-+-.join(map(str, match.groups())) + -(\d+) +print(search_string) +micro_list = [m.group(1) for m in [re.search(search_string, branch) for branch in branch_names] if m is not None] +if micro_list.count() == 0: +# first search if we are at an RC already +search_string = libreoffice- + base + .0. + (\d+) +rc_list = [m.group(1) for m in