Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2022-02-18 23:02:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Fri Feb 18 23:02:59 2022 rev:378 rq:955798 version:20220217.8b1acc1d
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2022-02-17 23:41:43.895700316 +0100
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1958/openSUSE-release-tools.changes
2022-02-18 23:03:31.965410079 +0100
@@ -1,0 +2,13 @@
+Thu Feb 17 11:56:07 UTC 2022 - [email protected]
+
+- Update to version 20220217.8b1acc1d:
+ * Remove --by-develproject for adi command
+
+-------------------------------------------------------------------
+Thu Feb 17 10:51:46 UTC 2022 - [email protected]
+
+- Update to version 20220217.3f8763ae:
+ * use set -e to catch more issues with the script
+ * rename JeOS to Minimal and remove Vagrant images
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20220217.28577584.obscpio
New:
----
openSUSE-release-tools-20220217.8b1acc1d.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.WaEGLn/_old 2022-02-18 23:03:32.753410017 +0100
+++ /var/tmp/diff_new_pack.WaEGLn/_new 2022-02-18 23:03:32.757410017 +0100
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20220217.28577584
+Version: 20220217.8b1acc1d
Release: 0
Summary: Tools to aid in staging and release work for openSUSE/SUSE
License: GPL-2.0-or-later AND MIT
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.WaEGLn/_old 2022-02-18 23:03:32.805410013 +0100
+++ /var/tmp/diff_new_pack.WaEGLn/_new 2022-02-18 23:03:32.809410012 +0100
@@ -1,7 +1,7 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param>
- <param
name="changesrevision">4fe336df4c24ff2acabcdcc2b4c30689fe2ebff4</param>
+ <param
name="changesrevision">177a654eb192e7133fbd89bfd4b11063c5dd8877</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20220217.28577584.obscpio ->
openSUSE-release-tools-20220217.8b1acc1d.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220217.28577584/gocd/checkers.suse.gocd.yaml
new/openSUSE-release-tools-20220217.8b1acc1d/gocd/checkers.suse.gocd.yaml
--- old/openSUSE-release-tools-20220217.28577584/gocd/checkers.suse.gocd.yaml
2022-02-17 09:15:12.000000000 +0100
+++ new/openSUSE-release-tools-20220217.8b1acc1d/gocd/checkers.suse.gocd.yaml
2022-02-17 12:55:16.000000000 +0100
@@ -131,7 +131,6 @@
osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:GA rebuild
osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:GA list
--supersede
- osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:GA adi
--by-develproject
osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:GA select
--non-interactive --merge --try-strategies
osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:GA
unselect --cleanup
osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:GA repair
--cleanup
@@ -165,7 +164,6 @@
osc -A https://api.suse.de staging -p
SUSE:SLE-15-SP3:Update:Products:MicroOS52 rebuild
osc -A https://api.suse.de staging -p
SUSE:SLE-15-SP3:Update:Products:MicroOS52 list --supersede
- osc -A https://api.suse.de staging -p
SUSE:SLE-15-SP3:Update:Products:MicroOS52 adi --by-develproject
osc -A https://api.suse.de staging -p
SUSE:SLE-15-SP3:Update:Products:MicroOS52 select --non-interactive --merge
--try-strategies
osc -A https://api.suse.de staging -p
SUSE:SLE-15-SP3:Update:Products:MicroOS52 unselect --cleanup
osc -A https://api.suse.de staging -p
SUSE:SLE-15-SP3:Update:Products:MicroOS52 repair --cleanup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220217.28577584/gocd/checkers.suse.gocd.yaml.erb
new/openSUSE-release-tools-20220217.8b1acc1d/gocd/checkers.suse.gocd.yaml.erb
---
old/openSUSE-release-tools-20220217.28577584/gocd/checkers.suse.gocd.yaml.erb
2022-02-17 09:15:12.000000000 +0100
+++
new/openSUSE-release-tools-20220217.8b1acc1d/gocd/checkers.suse.gocd.yaml.erb
2022-02-17 12:55:16.000000000 +0100
@@ -131,7 +131,6 @@
osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:GA rebuild
osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:GA list
--supersede
- osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:GA adi
--by-develproject
osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:GA select
--non-interactive --merge --try-strategies
osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:GA
unselect --cleanup
osc -A https://api.suse.de staging -p SUSE:SLE-15-SP4:GA repair
--cleanup
@@ -165,7 +164,6 @@
osc -A https://api.suse.de staging -p
SUSE:SLE-15-SP3:Update:Products:MicroOS52 rebuild
osc -A https://api.suse.de staging -p
SUSE:SLE-15-SP3:Update:Products:MicroOS52 list --supersede
- osc -A https://api.suse.de staging -p
SUSE:SLE-15-SP3:Update:Products:MicroOS52 adi --by-develproject
osc -A https://api.suse.de staging -p
SUSE:SLE-15-SP3:Update:Products:MicroOS52 select --non-interactive --merge
--try-strategies
osc -A https://api.suse.de staging -p
SUSE:SLE-15-SP3:Update:Products:MicroOS52 unselect --cleanup
osc -A https://api.suse.de staging -p
SUSE:SLE-15-SP3:Update:Products:MicroOS52 repair --cleanup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220217.28577584/gocd/sp4.target.gocd.yaml
new/openSUSE-release-tools-20220217.8b1acc1d/gocd/sp4.target.gocd.yaml
--- old/openSUSE-release-tools-20220217.28577584/gocd/sp4.target.gocd.yaml
2022-02-17 09:15:12.000000000 +0100
+++ new/openSUSE-release-tools-20220217.8b1acc1d/gocd/sp4.target.gocd.yaml
2022-02-17 12:55:16.000000000 +0100
@@ -81,8 +81,9 @@
- staging-bot
tasks:
- script: |-
+ set -e
PRODUCTS=$(osc -A https://api.suse.de ls SUSE:SLE-15-SP4:GA | grep
"^SLES15-SP4" | grep -v release)
- for product in kiwi-templates-JeOS SLES-15-SP4-Vagrant
sles15-image 000product $PRODUCTS; do
+ for product in kiwi-templates-Minimal sles15-image 000product
$PRODUCTS; do
osc -A https://api.suse.de release SUSE:SLE-15-SP4:GA $product
done
sleep 600
@@ -150,8 +151,9 @@
- staging-bot
tasks:
- script: |-
+ set -e
PRODUCTS=$(osc -A https://api.suse.de ls SUSE:SLE-15-SP4:GA
| grep "^SLES15-SP4" | grep -v release)
- for product in kiwi-templates-JeOS SLES-15-SP4-Vagrant
sles15-image 000product $PRODUCTS; do
+ for product in kiwi-templates-Minimal sles15-image
000product $PRODUCTS; do
osc -A https://api.suse.de release SUSE:SLE-15-SP4:GA
$product
done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220217.28577584/gocd/staging.bot.gocd.yaml
new/openSUSE-release-tools-20220217.8b1acc1d/gocd/staging.bot.gocd.yaml
--- old/openSUSE-release-tools-20220217.28577584/gocd/staging.bot.gocd.yaml
2022-02-17 09:15:12.000000000 +0100
+++ new/openSUSE-release-tools-20220217.8b1acc1d/gocd/staging.bot.gocd.yaml
2022-02-17 12:55:16.000000000 +0100
@@ -52,7 +52,7 @@
export HOME=$tempdir
osc -A https://api.opensuse.org staging -p openSUSE:Factory
list --supersede
- osc -A https://api.opensuse.org staging -p openSUSE:Factory adi
--by-develproject
+ osc -A https://api.opensuse.org staging -p openSUSE:Factory adi
osc -A https://api.opensuse.org staging -p openSUSE:Factory
unselect --cleanup
osc -A https://api.opensuse.org staging -p openSUSE:Factory
repair --cleanup
rm -rf $tempdir
@@ -108,7 +108,7 @@
export HOME=$tempdir
osc -A https://api.opensuse.org staging -p
openSUSE:Backports:SLE-15-SP4 list --supersede
- osc -A https://api.opensuse.org staging -p
openSUSE:Backports:SLE-15-SP4 adi --by-develproject
+ osc -A https://api.opensuse.org staging -p
openSUSE:Backports:SLE-15-SP4 adi
osc -A https://api.opensuse.org staging -p
openSUSE:Backports:SLE-15-SP4 unselect --cleanup
osc -A https://api.opensuse.org staging -p
openSUSE:Backports:SLE-15-SP4 repair --cleanup
rm -rf $tempdir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220217.28577584/gocd/staging.bot.gocd.yaml.erb
new/openSUSE-release-tools-20220217.8b1acc1d/gocd/staging.bot.gocd.yaml.erb
--- old/openSUSE-release-tools-20220217.28577584/gocd/staging.bot.gocd.yaml.erb
2022-02-17 09:15:12.000000000 +0100
+++ new/openSUSE-release-tools-20220217.8b1acc1d/gocd/staging.bot.gocd.yaml.erb
2022-02-17 12:55:16.000000000 +0100
@@ -54,7 +54,7 @@
export HOME=$tempdir
osc -A https://api.opensuse.org staging -p openSUSE:<%= project
%> list --supersede
- osc -A https://api.opensuse.org staging -p openSUSE:<%= project
%> adi --by-develproject
+ osc -A https://api.opensuse.org staging -p openSUSE:<%= project
%> adi
osc -A https://api.opensuse.org staging -p openSUSE:<%= project
%> unselect --cleanup
osc -A https://api.opensuse.org staging -p openSUSE:<%= project
%> repair --cleanup
rm -rf $tempdir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220217.28577584/osc-staging.py
new/openSUSE-release-tools-20220217.8b1acc1d/osc-staging.py
--- old/openSUSE-release-tools-20220217.28577584/osc-staging.py 2022-02-17
09:15:12.000000000 +0100
+++ new/openSUSE-release-tools-20220217.8b1acc1d/osc-staging.py 2022-02-17
12:55:16.000000000 +0100
@@ -86,8 +86,6 @@
@cmdln.option('--move', action='store_true',
help='force the selection to become a move')
[email protected]('--by-develproject', action='store_true',
- help='split the requests by devel project')
@cmdln.option('--split', action='store_true',
help='split the requests into individual groups')
@cmdln.option('--supersede', action='store_true',
@@ -297,7 +295,7 @@
Usage:
osc staging accept [--force] [--no-cleanup] [STAGING...]
- osc staging adi [--move] [--by-develproject] [--split] [REQUEST...]
+ osc staging adi [--move] [--split] [REQUEST...]
osc staging check [STAGING...]
osc staging check_duplicate_binaries
osc staging check_local_links
@@ -583,7 +581,7 @@
elif cmd == 'lock':
lock.hold(opts.message)
elif cmd == 'adi':
- AdiCommand(api).perform(args[1:], move=opts.move,
by_dp=opts.by_develproject, split=opts.split)
+ AdiCommand(api).perform(args[1:], move=opts.move, split=opts.split)
elif cmd == 'rebuild':
RebuildCommand(api).perform(args[1:], opts.force)
elif cmd == 'repair':
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20220217.28577584/osclib/adi_command.py
new/openSUSE-release-tools-20220217.8b1acc1d/osclib/adi_command.py
--- old/openSUSE-release-tools-20220217.28577584/osclib/adi_command.py
2022-02-17 09:15:12.000000000 +0100
+++ new/openSUSE-release-tools-20220217.8b1acc1d/osclib/adi_command.py
2022-02-17 12:55:16.000000000 +0100
@@ -4,15 +4,11 @@
from colorama import Fore
from osc import oscerr
-from osc.core import get_request
-from osc.core import show_package_meta
from osc import conf
-from osclib.select_command import SelectCommand
from osclib.supersede_command import SupersedeCommand
from osclib.request_finder import RequestFinder
from osclib.request_splitter import RequestSplitter
-from xml.etree import cElementTree as ET
class AdiCommand:
def __init__(self, api):
@@ -73,7 +69,7 @@
for p in self.api.get_adi_projects():
self.check_adi_project(p)
- def create_new_adi(self, wanted_requests, by_dp=False, split=False):
+ def create_new_adi(self, wanted_requests, split=False):
source_projects_expand = self.config.get('source_projects_expand',
'').split()
# if we don't call it, there is no invalidate function added
requests = self.api.get_open_requests()
@@ -91,8 +87,6 @@
else:
if split:
splitter.group_by('./@id')
- elif by_dp:
- splitter.group_by('./action/target/@devel_project')
else:
splitter.group_by('./action/source/@project')
@@ -130,7 +124,7 @@
print(line + Fore.GREEN + ' (staged in {})'.format(name) +
Fore.RESET)
- def perform(self, packages, move=False, by_dp=False, split=False):
+ def perform(self, packages, move=False, split=False):
"""
Perform the list command
"""
@@ -152,4 +146,4 @@
else:
self.check_adi_projects()
if self.api.is_user_member_of(self.api.user,
self.api.cstaging_group):
- self.create_new_adi((), by_dp=by_dp, split=split)
+ self.create_new_adi((), split=split)
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.WaEGLn/_old 2022-02-18 23:03:33.549409955 +0100
+++ /var/tmp/diff_new_pack.WaEGLn/_new 2022-02-18 23:03:33.553409955 +0100
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20220217.28577584
-mtime: 1645085712
-commit: 28577584d295f9400d25ef06f0783b6018806e11
+version: 20220217.8b1acc1d
+mtime: 1645098916
+commit: 8b1acc1d2db3be83b6de5db54ff384ca7f581854
