Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2019-05-14 13:43:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Tue May 14 13:43:25 2019 rev:173 rq:702666 version:20190513.f2460434
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2019-05-13 14:52:39.803109597 +0200
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.5148/openSUSE-release-tools.changes
2019-05-14 13:43:36.968671621 +0200
@@ -1,0 +2,55 @@
+Mon May 13 14:18:50 UTC 2019 - [email protected]
+
+- Update to version 20190513.f2460434:
+ * Run staging-installcheck exclusively on python3
+
+-------------------------------------------------------------------
+Mon May 13 12:35:33 UTC 2019 - [email protected]
+
+- Update to version 20190513.b0d4f352:
+ * Even more fixes for pkglistgen on python3
+
+-------------------------------------------------------------------
+Mon May 13 11:36:33 UTC 2019 - [email protected]
+
+- Update to version 20190513.9c9e6e94:
+ * suppkg_rebuild: Fix TypeError on python3
+
+-------------------------------------------------------------------
+Mon May 13 11:24:43 UTC 2019 - [email protected]
+
+- Update to version 20190513.b98a02f3:
+ * pkglistgen needs to run in the python3 container
+
+-------------------------------------------------------------------
+Mon May 13 09:56:25 UTC 2019 - [email protected]
+
+- Update to version 20190513.03a54802:
+ * Close the rabbit connection more carefully
+
+-------------------------------------------------------------------
+Mon May 13 07:12:05 UTC 2019 - [email protected]
+
+- Update to version 20190513.ccca194f:
+ * Even more python3 fixes for pkglistgen
+
+-------------------------------------------------------------------
+Mon May 13 06:24:56 UTC 2019 - [email protected]
+
+- Update to version 20190513.780404f4:
+ * Fix path to pkglistgen.py
+ * Fix update_repo_handler in python3
+
+-------------------------------------------------------------------
+Sun May 12 20:48:40 UTC 2019 - [email protected]
+
+- Update to version 20190512.90426046:
+ * Fix repository_path_expand to also work in Factory stagings
+
+-------------------------------------------------------------------
+Sun May 12 19:37:51 UTC 2019 - [email protected]
+
+- Update to version 20190512.e68bcda3:
+ * Fix problems with pkglistgen under python3
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20190512.4ef0c623.obscpio
New:
----
openSUSE-release-tools-20190513.f2460434.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.bqfqcH/_old 2019-05-14 13:43:38.620675115 +0200
+++ /var/tmp/diff_new_pack.bqfqcH/_new 2019-05-14 13:43:38.644675165 +0200
@@ -31,7 +31,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20190512.4ef0c623
+Version: 20190513.f2460434
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.bqfqcH/_old 2019-05-14 13:43:39.136676206 +0200
+++ /var/tmp/diff_new_pack.bqfqcH/_new 2019-05-14 13:43:39.168676274 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param>
- <param
name="changesrevision">4ef0c6230dee65338fd62b0fe38e2b6a4bcd5ac9</param>
+ <param
name="changesrevision">3828715e4632866235771e7921d06154bf8d8a53</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20190512.4ef0c623.obscpio ->
openSUSE-release-tools-20190513.f2460434.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190512.4ef0c623/PubSubConsumer.py
new/openSUSE-release-tools-20190513.f2460434/PubSubConsumer.py
--- old/openSUSE-release-tools-20190512.4ef0c623/PubSubConsumer.py
2019-05-12 20:34:20.000000000 +0200
+++ new/openSUSE-release-tools-20190513.f2460434/PubSubConsumer.py
2019-05-13 16:17:12.000000000 +0200
@@ -7,7 +7,10 @@
from datetime import datetime
class PubSubConsumer(object):
- """This is an example consumer that will handle unexpected interactions
+ """
+ Based on
https://github.com/pika/pika/blob/master/examples/asynchronous_consumer_example.py
+
+ This is an example consumer that will handle unexpected interactions
with RabbitMQ such as channel and connection closures.
If RabbitMQ closes the connection, it will reopen it. You should
@@ -30,6 +33,7 @@
self._connection = None
self._channel = None
self._closing = False
+ self._consuming = False
self._consumer_tag = None
self._prefix = amqp_prefix
self._timer_id = None
@@ -77,8 +81,12 @@
def close_connection(self):
"""This method closes the connection to RabbitMQ."""
- self.logger.info('Closing connection')
- self._connection.close()
+ self._consuming = False
+ if self._connection.is_closing or self._connection.is_closed:
+ self.logger.info('Connection is closing or already closed')
+ else:
+ self.logger.info('Closing connection')
+ self._connection.close()
def add_on_connection_close_callback(self):
"""This method adds an on close callback that will be invoked by pika
@@ -302,6 +310,7 @@
self._consumer_tag = self._channel.basic_consume(self.queue_name,
self.on_message,
auto_ack=False)
+ self._consuming = True
def on_bindok(self, unused_frame):
"""Invoked by pika when the Queue.Bind method has completed. At this
@@ -348,11 +357,15 @@
"""
self.logger.debug('Stopping')
- self._closing = True
- self.stop_consuming()
- self._connection.ioloop.start()
- self.logger.debug('Stopped')
-
+ if not self._closing:
+ self._closing = True
+ self.logger.debug('Stopping')
+ if self._consuming:
+ self.stop_consuming()
+ #self._connection.ioloop.start()
+ else:
+ self._connection.ioloop.stop()
+ self.logger.debug('Stopped')
def main():
LOG_FORMAT = ('%(levelname) -10s %(asctime)s %(name) -30s %(funcName) '
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190512.4ef0c623/gocd/pkglistgen.factory.gocd.yaml
new/openSUSE-release-tools-20190513.f2460434/gocd/pkglistgen.factory.gocd.yaml
---
old/openSUSE-release-tools-20190512.4ef0c623/gocd/pkglistgen.factory.gocd.yaml
2019-05-12 20:34:20.000000000 +0200
+++
new/openSUSE-release-tools-20190513.f2460434/gocd/pkglistgen.factory.gocd.yaml
1970-01-01 01:00:00.000000000 +0100
@@ -1,74 +0,0 @@
-format_version: 3
-pipelines:
- Pkglistgen.openSUSE_Factory:
- group: Factory.pkglistgen
- lock_behavior: unlockWhenFinished
- environment_variables:
- OSC_CONFIG: /home/go/config/oscrc-staging-bot
- timer:
- spec: 0 40 * ? * *
- only_on_changes: false
- materials:
- git:
- git: https://github.com/openSUSE/openSUSE-release-tools.git
- stages:
- - pkglistgen:
- approval:
- type: manual
- jobs:
- openSUSE_Factory_target:
- resources:
- - repo-checker3
- tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -d -A
https://api.opensuse.org update_and_solve -p openSUSE:Factory -s target
- openSUSE_Factory_rings:
- resources:
- - repo-checker3
- tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -d -A
https://api.opensuse.org update_and_solve -p openSUSE:Factory -s rings
- openSUSE_Factory_ARM:
- resources:
- - repo-checker3
- tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -d -A
https://api.opensuse.org update_and_solve -p openSUSE:Factory:ARM
- openSUSE_Factory_PowerPC:
- resources:
- - repo-checker3
- tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -d -A
https://api.opensuse.org update_and_solve -p openSUSE:Factory:PowerPC
- openSUSE_Factory_zSystems:
- resources:
- - repo-checker3
- tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -d -A
https://api.opensuse.org update_and_solve -p openSUSE:Factory:zSystems
- Update.Repos.Factory:
- group: Factory.pkglistgen
- lock_behavior: unlockWhenFinished
- environment_variables:
- OSC_CONFIG: /home/go/config/oscrc-staging-bot
- timer:
- spec: 0 0 21 ? * *
- only_on_changes: false
- materials:
- git:
- git: https://github.com/openSUSE/openSUSE-release-tools.git
- stages:
- - Update:
- approval:
- type: manual
- jobs:
- openSUSE_Factory:
- resources:
- - repo-checker3
- tasks:
- - script: python3 /usr/bin/osrt-pkglistgen --apiurl
https://api.opensuse.org handle_update_repos openSUSE:Factory
- openSUSE_Factory_ARM:
- resources:
- - repo-checker3
- tasks:
- - script: python3 /usr/bin/osrt-pkglistgen --apiurl
https://api.opensuse.org handle_update_repos openSUSE:Factory:ARM
- openSUSE_Factory_PowerPC:
- resources:
- - repo-checker3
- tasks:
- - script: python3 /usr/bin/osrt-pkglistgen --apiurl
https://api.opensuse.org handle_update_repos openSUSE:Factory:PowerPC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190512.4ef0c623/gocd/pkglistgen.factory.gocd.yaml.erb
new/openSUSE-release-tools-20190513.f2460434/gocd/pkglistgen.factory.gocd.yaml.erb
---
old/openSUSE-release-tools-20190512.4ef0c623/gocd/pkglistgen.factory.gocd.yaml.erb
2019-05-12 20:34:20.000000000 +0200
+++
new/openSUSE-release-tools-20190513.f2460434/gocd/pkglistgen.factory.gocd.yaml.erb
1970-01-01 01:00:00.000000000 +0100
@@ -1,55 +0,0 @@
-format_version: 3
-pipelines:
- Pkglistgen.openSUSE_Factory:
- group: Factory.pkglistgen
- lock_behavior: unlockWhenFinished
- environment_variables:
- OSC_CONFIG: /home/go/config/oscrc-staging-bot
- timer:
- spec: 0 40 * ? * *
- only_on_changes: false
- materials:
- git:
- git: https://github.com/openSUSE/openSUSE-release-tools.git
- stages:
- - pkglistgen:
- approval:
- type: manual
- jobs:
-<% ['openSUSE:Factory/target', 'openSUSE:Factory/rings',
'openSUSE:Factory:ARM', 'openSUSE:Factory:PowerPC',
'openSUSE:Factory:zSystems'].each do |project|
- project=project.split('/')
- name=project[0].gsub(':', '_')
- if project.size > 1
- options="-s #{project[1]}"
- name = name + "_#{project[1]}"
- end
- -%>
- <%= name %>:
- resources:
- - repo-checker3
- tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -d -A
https://api.opensuse.org update_and_solve -p <%= project[0] %> <%= options %>
-<% end -%>
- Update.Repos.Factory:
- group: Factory.pkglistgen
- lock_behavior: unlockWhenFinished
- environment_variables:
- OSC_CONFIG: /home/go/config/oscrc-staging-bot
- timer:
- spec: 0 0 21 ? * *
- only_on_changes: false
- materials:
- git:
- git: https://github.com/openSUSE/openSUSE-release-tools.git
- stages:
- - Update:
- approval:
- type: manual
- jobs:
-<% %w(openSUSE:Factory openSUSE:Factory:ARM openSUSE:Factory:PowerPC).each do
|project| -%>
- <%= project.gsub(':', '_') %>:
- resources:
- - repo-checker3
- tasks:
- - script: python3 /usr/bin/osrt-pkglistgen --apiurl
https://api.opensuse.org handle_update_repos <%= project %>
-<% end -%>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190512.4ef0c623/gocd/pkglistgen.leap.gocd.yaml
new/openSUSE-release-tools-20190513.f2460434/gocd/pkglistgen.leap.gocd.yaml
--- old/openSUSE-release-tools-20190512.4ef0c623/gocd/pkglistgen.leap.gocd.yaml
2019-05-12 20:34:20.000000000 +0200
+++ new/openSUSE-release-tools-20190513.f2460434/gocd/pkglistgen.leap.gocd.yaml
1970-01-01 01:00:00.000000000 +0100
@@ -1,63 +0,0 @@
-format_version: 3
-pipelines:
- Pkglistgen.openSUSE_Leap:
- group: Leap.15.1.pkglistgen
- lock_behavior: unlockWhenFinished
- environment_variables:
- OSC_CONFIG: /home/go/config/oscrc-staging-bot
- timer:
- spec: 0 10 * ? * *
- only_on_changes: false
- materials:
- git:
- git: https://github.com/openSUSE/openSUSE-release-tools.git
- stages:
- - pkglistgen:
- approval:
- type: manual
- jobs:
- openSUSE_Leap_15.1:
- resources:
- - repo-checker
- tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -d -A
https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.1 -s target
- openSUSE_Leap_15.1_Ring:
- resources:
- - repo-checker
- tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -d -A
https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.1 -s rings
- openSUSE_Leap_15.1_ARM:
- resources:
- - repo-checker
- tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -d -A
https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.1:ARM
- openSUSE_Leap_15.1_PowerPC:
- resources:
- - repo-checker
- tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -d -A
https://api.opensuse.org update_and_solve -p openSUSE:Leap:15.1:PowerPC
- Update.Repos.Leap:
- group: Leap.15.1.pkglistgen
- lock_behavior: unlockWhenFinished
- environment_variables:
- OSC_CONFIG: /home/go/config/oscrc-staging-bot
- timer:
- spec: 0 0 21 ? * *
- only_on_changes: false
- materials:
- git:
- git: https://github.com/openSUSE/openSUSE-release-tools.git
- stages:
- - Update:
- approval:
- type: manual
- jobs:
- Leap:
- tasks:
- - script: python3 /usr/bin/osrt-pkglistgen --apiurl
https://api.opensuse.org handle_update_repos openSUSE:Leap:15.1
- Leap_ARM:
- tasks:
- - script: python3 /usr/bin/osrt-pkglistgen --apiurl
https://api.opensuse.org handle_update_repos openSUSE:Leap:15.1:ARM
- Leap_PowerPC:
- tasks:
- - script: python3 /usr/bin/osrt-pkglistgen --apiurl
https://api.opensuse.org handle_update_repos openSUSE:Leap:15.1:PowerPC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190512.4ef0c623/gocd/pkglistgen.opensuse.gocd.yaml
new/openSUSE-release-tools-20190513.f2460434/gocd/pkglistgen.opensuse.gocd.yaml
---
old/openSUSE-release-tools-20190512.4ef0c623/gocd/pkglistgen.opensuse.gocd.yaml
1970-01-01 01:00:00.000000000 +0100
+++
new/openSUSE-release-tools-20190513.f2460434/gocd/pkglistgen.opensuse.gocd.yaml
2019-05-13 16:17:12.000000000 +0200
@@ -0,0 +1,141 @@
+format_version: 3
+pipelines:
+ Pkglistgen.openSUSE_Factory:
+ group: Factory.pkglistgen
+ lock_behavior: unlockWhenFinished
+ environment_variables:
+ OSC_CONFIG: /home/go/config/oscrc-staging-bot
+ timer:
+ spec: 0 40 * ? * *
+ only_on_changes: false
+ materials:
+ git:
+ git: https://github.com/openSUSE/openSUSE-release-tools.git
+ stages:
+ - pkglistgen:
+ approval:
+ type: manual
+ jobs:
+ openSUSE_Factory_target:
+ resources:
+ - repo-checker3
+ tasks:
+ - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org
update_and_solve -p openSUSE:Factory -s target
+ openSUSE_Factory_rings:
+ resources:
+ - repo-checker3
+ tasks:
+ - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org
update_and_solve -p openSUSE:Factory -s rings
+ openSUSE_Factory_ARM:
+ resources:
+ - repo-checker3
+ tasks:
+ - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org
update_and_solve -p openSUSE:Factory:ARM
+ openSUSE_Factory_PowerPC:
+ resources:
+ - repo-checker3
+ tasks:
+ - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org
update_and_solve -p openSUSE:Factory:PowerPC
+ openSUSE_Factory_zSystems:
+ resources:
+ - repo-checker3
+ tasks:
+ - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org
update_and_solve -p openSUSE:Factory:zSystems
+ Update.Repos.Factory:
+ group: Factory.pkglistgen
+ lock_behavior: unlockWhenFinished
+ environment_variables:
+ OSC_CONFIG: /home/go/config/oscrc-staging-bot
+ timer:
+ spec: 0 0 21 ? * *
+ only_on_changes: false
+ materials:
+ git:
+ git: https://github.com/openSUSE/openSUSE-release-tools.git
+ stages:
+ - Update:
+ approval:
+ type: manual
+ jobs:
+ openSUSE_Factory:
+ resources:
+ - repo-checker3
+ tasks:
+ - script: python3 ./pkglistgen.py --apiurl
https://api.opensuse.org handle_update_repos openSUSE:Factory
+ openSUSE_Factory_ARM:
+ resources:
+ - repo-checker3
+ tasks:
+ - script: python3 ./pkglistgen.py --apiurl
https://api.opensuse.org handle_update_repos openSUSE:Factory:ARM
+ openSUSE_Factory_PowerPC:
+ resources:
+ - repo-checker3
+ tasks:
+ - script: python3 ./pkglistgen.py --apiurl
https://api.opensuse.org handle_update_repos openSUSE:Factory:PowerPC
+ Pkglistgen.openSUSE_Leap:
+ group: Leap.15.1.pkglistgen
+ lock_behavior: unlockWhenFinished
+ environment_variables:
+ OSC_CONFIG: /home/go/config/oscrc-staging-bot
+ timer:
+ spec: 0 10 * ? * *
+ only_on_changes: false
+ materials:
+ git:
+ git: https://github.com/openSUSE/openSUSE-release-tools.git
+ stages:
+ - pkglistgen:
+ approval:
+ type: manual
+ jobs:
+ openSUSE_Leap_15.1_target:
+ resources:
+ - repo-checker3
+ tasks:
+ - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org
update_and_solve -p openSUSE:Leap:15.1 -s target
+ openSUSE_Leap_15.1_rings:
+ resources:
+ - repo-checker3
+ tasks:
+ - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org
update_and_solve -p openSUSE:Leap:15.1 -s rings
+ openSUSE_Leap_15.1_ARM:
+ resources:
+ - repo-checker3
+ tasks:
+ - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org
update_and_solve -p openSUSE:Leap:15.1:ARM
+ openSUSE_Leap_15.1_PowerPC:
+ resources:
+ - repo-checker3
+ tasks:
+ - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org
update_and_solve -p openSUSE:Leap:15.1:PowerPC
+ Update.Repos.Leap:
+ group: Leap.15.1.pkglistgen
+ lock_behavior: unlockWhenFinished
+ environment_variables:
+ OSC_CONFIG: /home/go/config/oscrc-staging-bot
+ timer:
+ spec: 0 0 21 ? * *
+ only_on_changes: false
+ materials:
+ git:
+ git: https://github.com/openSUSE/openSUSE-release-tools.git
+ stages:
+ - Update:
+ approval:
+ type: manual
+ jobs:
+ openSUSE_Leap_15.1:
+ resources:
+ - repo-checker3
+ tasks:
+ - script: python3 ./pkglistgen.py --apiurl
https://api.opensuse.org handle_update_repos openSUSE:Leap:15.1
+ openSUSE_Leap_15.1_ARM:
+ resources:
+ - repo-checker3
+ tasks:
+ - script: python3 ./pkglistgen.py --apiurl
https://api.opensuse.org handle_update_repos openSUSE:Leap:15.1:ARM
+ openSUSE_Leap_15.1_PowerPC:
+ resources:
+ - repo-checker3
+ tasks:
+ - script: python3 ./pkglistgen.py --apiurl
https://api.opensuse.org handle_update_repos openSUSE:Leap:15.1:PowerPC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190512.4ef0c623/gocd/pkglistgen.opensuse.gocd.yaml.erb
new/openSUSE-release-tools-20190513.f2460434/gocd/pkglistgen.opensuse.gocd.yaml.erb
---
old/openSUSE-release-tools-20190512.4ef0c623/gocd/pkglistgen.opensuse.gocd.yaml.erb
1970-01-01 01:00:00.000000000 +0100
+++
new/openSUSE-release-tools-20190513.f2460434/gocd/pkglistgen.opensuse.gocd.yaml.erb
2019-05-13 16:17:12.000000000 +0200
@@ -0,0 +1,107 @@
+format_version: 3
+pipelines:
+ Pkglistgen.openSUSE_Factory:
+ group: Factory.pkglistgen
+ lock_behavior: unlockWhenFinished
+ environment_variables:
+ OSC_CONFIG: /home/go/config/oscrc-staging-bot
+ timer:
+ spec: 0 40 * ? * *
+ only_on_changes: false
+ materials:
+ git:
+ git: https://github.com/openSUSE/openSUSE-release-tools.git
+ stages:
+ - pkglistgen:
+ approval:
+ type: manual
+ jobs:
+<% ['openSUSE:Factory/target', 'openSUSE:Factory/rings',
'openSUSE:Factory:ARM', 'openSUSE:Factory:PowerPC',
'openSUSE:Factory:zSystems'].each do |project|
+ project=project.split('/')
+ name=project[0].gsub(':', '_')
+ if project.size > 1
+ options=" -s #{project[1]}"
+ name = name + "_#{project[1]}"
+ end
+ -%>
+ <%= name %>:
+ resources:
+ - repo-checker3
+ tasks:
+ - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org
update_and_solve -p <%= project[0] %><%= options %>
+<% end -%>
+ Update.Repos.Factory:
+ group: Factory.pkglistgen
+ lock_behavior: unlockWhenFinished
+ environment_variables:
+ OSC_CONFIG: /home/go/config/oscrc-staging-bot
+ timer:
+ spec: 0 0 21 ? * *
+ only_on_changes: false
+ materials:
+ git:
+ git: https://github.com/openSUSE/openSUSE-release-tools.git
+ stages:
+ - Update:
+ approval:
+ type: manual
+ jobs:
+<% %w(openSUSE:Factory openSUSE:Factory:ARM openSUSE:Factory:PowerPC).each do
|project| -%>
+ <%= project.gsub(':', '_') %>:
+ resources:
+ - repo-checker3
+ tasks:
+ - script: python3 ./pkglistgen.py --apiurl
https://api.opensuse.org handle_update_repos <%= project %>
+<% end -%>
+ Pkglistgen.openSUSE_Leap:
+ group: Leap.15.1.pkglistgen
+ lock_behavior: unlockWhenFinished
+ environment_variables:
+ OSC_CONFIG: /home/go/config/oscrc-staging-bot
+ timer:
+ spec: 0 10 * ? * *
+ only_on_changes: false
+ materials:
+ git:
+ git: https://github.com/openSUSE/openSUSE-release-tools.git
+ stages:
+ - pkglistgen:
+ approval:
+ type: manual
+ jobs:
+ <% ['openSUSE:Leap:15.1/target', 'openSUSE:Leap:15.1/rings',
'openSUSE:Leap:15.1:ARM', 'openSUSE:Leap:15.1:PowerPC'].each do |project|
+ project=project.split('/')
+ name=project[0].gsub(':', '_')
+ if project.size > 1
+ options=" -s #{project[1]}"
+ name = name + "_#{project[1]}"
+ end -%>
+ <%= name %>:
+ resources:
+ - repo-checker3
+ tasks:
+ - script: python3 ./pkglistgen.py -d -A https://api.opensuse.org
update_and_solve -p <%= project[0] %><%= options %>
+ <% end -%>
+Update.Repos.Leap:
+ group: Leap.15.1.pkglistgen
+ lock_behavior: unlockWhenFinished
+ environment_variables:
+ OSC_CONFIG: /home/go/config/oscrc-staging-bot
+ timer:
+ spec: 0 0 21 ? * *
+ only_on_changes: false
+ materials:
+ git:
+ git: https://github.com/openSUSE/openSUSE-release-tools.git
+ stages:
+ - Update:
+ approval:
+ type: manual
+ jobs:
+<% %w(openSUSE:Leap:15.1 openSUSE:Leap:15.1:ARM
openSUSE:Leap:15.1:PowerPC).each do |project| -%>
+ <%= project.gsub(':', '_') %>:
+ resources:
+ - repo-checker3
+ tasks:
+ - script: python3 ./pkglistgen.py --apiurl
https://api.opensuse.org handle_update_repos <%= project %>
+<% end -%>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190512.4ef0c623/gocd/pkglistgen_staging.gocd.yaml
new/openSUSE-release-tools-20190513.f2460434/gocd/pkglistgen_staging.gocd.yaml
---
old/openSUSE-release-tools-20190512.4ef0c623/gocd/pkglistgen_staging.gocd.yaml
2019-05-12 20:34:20.000000000 +0200
+++
new/openSUSE-release-tools-20190513.f2460434/gocd/pkglistgen_staging.gocd.yaml
2019-05-13 16:17:12.000000000 +0200
@@ -19,112 +19,112 @@
resources:
- repo-checker3
tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -A
https://api.opensuse.org update_and_solve
+ - script: python3 ./pkglistgen.py -A https://api.opensuse.org
update_and_solve
--staging openSUSE:Factory:Staging:A
--only-release-packages --force
"Staging.B":
resources:
- repo-checker3
tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -A
https://api.opensuse.org update_and_solve
+ - script: python3 ./pkglistgen.py -A https://api.opensuse.org
update_and_solve
--staging openSUSE:Factory:Staging:B
--only-release-packages --force
"Staging.C":
resources:
- repo-checker3
tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -A
https://api.opensuse.org update_and_solve
+ - script: python3 ./pkglistgen.py -A https://api.opensuse.org
update_and_solve
--staging openSUSE:Factory:Staging:C
--only-release-packages --force
"Staging.D":
resources:
- repo-checker3
tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -A
https://api.opensuse.org update_and_solve
+ - script: python3 ./pkglistgen.py -A https://api.opensuse.org
update_and_solve
--staging openSUSE:Factory:Staging:D
--only-release-packages --force
"Staging.E":
resources:
- repo-checker3
tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -A
https://api.opensuse.org update_and_solve
+ - script: python3 ./pkglistgen.py -A https://api.opensuse.org
update_and_solve
--staging openSUSE:Factory:Staging:E
--only-release-packages --force
"Staging.F":
resources:
- repo-checker3
tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -A
https://api.opensuse.org update_and_solve
+ - script: python3 ./pkglistgen.py -A https://api.opensuse.org
update_and_solve
--staging openSUSE:Factory:Staging:F
--only-release-packages --force
"Staging.G":
resources:
- repo-checker3
tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -A
https://api.opensuse.org update_and_solve
+ - script: python3 ./pkglistgen.py -A https://api.opensuse.org
update_and_solve
--staging openSUSE:Factory:Staging:G
--only-release-packages --force
"Staging.H":
resources:
- repo-checker3
tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -A
https://api.opensuse.org update_and_solve
+ - script: python3 ./pkglistgen.py -A https://api.opensuse.org
update_and_solve
--staging openSUSE:Factory:Staging:H
--only-release-packages --force
"Staging.I":
resources:
- repo-checker3
tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -A
https://api.opensuse.org update_and_solve
+ - script: python3 ./pkglistgen.py -A https://api.opensuse.org
update_and_solve
--staging openSUSE:Factory:Staging:I
--only-release-packages --force
"Staging.J":
resources:
- repo-checker3
tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -A
https://api.opensuse.org update_and_solve
+ - script: python3 ./pkglistgen.py -A https://api.opensuse.org
update_and_solve
--staging openSUSE:Factory:Staging:J
--only-release-packages --force
"Staging.K":
resources:
- repo-checker3
tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -A
https://api.opensuse.org update_and_solve
+ - script: python3 ./pkglistgen.py -A https://api.opensuse.org
update_and_solve
--staging openSUSE:Factory:Staging:K
--only-release-packages --force
"Staging.L":
resources:
- repo-checker3
tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -A
https://api.opensuse.org update_and_solve
+ - script: python3 ./pkglistgen.py -A https://api.opensuse.org
update_and_solve
--staging openSUSE:Factory:Staging:L
--only-release-packages --force
"Staging.M":
resources:
- repo-checker3
tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -A
https://api.opensuse.org update_and_solve
+ - script: python3 ./pkglistgen.py -A https://api.opensuse.org
update_and_solve
--staging openSUSE:Factory:Staging:M
--only-release-packages --force
"Staging.N":
resources:
- repo-checker3
tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -A
https://api.opensuse.org update_and_solve
+ - script: python3 ./pkglistgen.py -A https://api.opensuse.org
update_and_solve
--staging openSUSE:Factory:Staging:N
--only-release-packages --force
"Staging.O":
resources:
- repo-checker3
tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -A
https://api.opensuse.org update_and_solve
+ - script: python3 ./pkglistgen.py -A https://api.opensuse.org
update_and_solve
--staging openSUSE:Factory:Staging:O
--only-release-packages --force
"Staging.Gcc7":
resources:
- repo-checker3
tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -A
https://api.opensuse.org update_and_solve
+ - script: python3 ./pkglistgen.py -A https://api.opensuse.org
update_and_solve
--staging openSUSE:Factory:Staging:Gcc7
--only-release-packages --force
@@ -179,7 +179,7 @@
- repo-checker3
tasks:
- script: |-
- python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
+ python3 ./scripts/pkglistgen.py --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@@ -239,7 +239,7 @@
- repo-checker3
tasks:
- script: |-
- python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
+ python3 ./scripts/pkglistgen.py --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@@ -299,7 +299,7 @@
- repo-checker3
tasks:
- script: |-
- python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
+ python3 ./scripts/pkglistgen.py --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@@ -359,7 +359,7 @@
- repo-checker3
tasks:
- script: |-
- python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
+ python3 ./scripts/pkglistgen.py --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@@ -419,7 +419,7 @@
- repo-checker3
tasks:
- script: |-
- python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
+ python3 ./scripts/pkglistgen.py --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@@ -479,7 +479,7 @@
- repo-checker3
tasks:
- script: |-
- python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
+ python3 ./scripts/pkglistgen.py --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@@ -539,7 +539,7 @@
- repo-checker3
tasks:
- script: |-
- python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
+ python3 ./scripts/pkglistgen.py --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@@ -599,7 +599,7 @@
- repo-checker3
tasks:
- script: |-
- python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
+ python3 ./scripts/pkglistgen.py --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@@ -659,7 +659,7 @@
- repo-checker3
tasks:
- script: |-
- python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
+ python3 ./scripts/pkglistgen.py --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@@ -719,7 +719,7 @@
- repo-checker3
tasks:
- script: |-
- python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
+ python3 ./scripts/pkglistgen.py --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@@ -779,7 +779,7 @@
- repo-checker3
tasks:
- script: |-
- python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
+ python3 ./scripts/pkglistgen.py --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@@ -839,7 +839,7 @@
- repo-checker3
tasks:
- script: |-
- python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
+ python3 ./scripts/pkglistgen.py --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@@ -899,7 +899,7 @@
- repo-checker3
tasks:
- script: |-
- python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
+ python3 ./scripts/pkglistgen.py --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@@ -959,7 +959,7 @@
- repo-checker3
tasks:
- script: |-
- python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
+ python3 ./scripts/pkglistgen.py --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@@ -1019,7 +1019,7 @@
- repo-checker3
tasks:
- script: |-
- python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
+ python3 ./scripts/pkglistgen.py --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@@ -1079,7 +1079,7 @@
- repo-checker3
tasks:
- script: |-
- python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
+ python3 ./scripts/pkglistgen.py --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@@ -1108,35 +1108,35 @@
resources:
- repo-checker3
tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -A
https://api.opensuse.org update_and_solve
+ - script: python3 ./pkglistgen.py -A https://api.opensuse.org
update_and_solve
--staging openSUSE:Leap:15.1:Staging:A
--only-release-packages --force
"Staging.B":
resources:
- repo-checker3
tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -A
https://api.opensuse.org update_and_solve
+ - script: python3 ./pkglistgen.py -A https://api.opensuse.org
update_and_solve
--staging openSUSE:Leap:15.1:Staging:B
--only-release-packages --force
"Staging.C":
resources:
- repo-checker3
tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -A
https://api.opensuse.org update_and_solve
+ - script: python3 ./pkglistgen.py -A https://api.opensuse.org
update_and_solve
--staging openSUSE:Leap:15.1:Staging:C
--only-release-packages --force
"Staging.D":
resources:
- repo-checker3
tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -A
https://api.opensuse.org update_and_solve
+ - script: python3 ./pkglistgen.py -A https://api.opensuse.org
update_and_solve
--staging openSUSE:Leap:15.1:Staging:D
--only-release-packages --force
"Staging.E":
resources:
- repo-checker3
tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -A
https://api.opensuse.org update_and_solve
+ - script: python3 ./pkglistgen.py -A https://api.opensuse.org
update_and_solve
--staging openSUSE:Leap:15.1:Staging:E
--only-release-packages --force
@@ -1191,7 +1191,7 @@
- repo-checker3
tasks:
- script: |-
- python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
+ python3 ./scripts/pkglistgen.py --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
"Leap.Staging.B":
environment_variables:
STAGING_PROJECT: openSUSE:Leap:15.1:Staging:B
@@ -1243,7 +1243,7 @@
- repo-checker3
tasks:
- script: |-
- python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
+ python3 ./scripts/pkglistgen.py --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
"Leap.Staging.C":
environment_variables:
STAGING_PROJECT: openSUSE:Leap:15.1:Staging:C
@@ -1295,7 +1295,7 @@
- repo-checker3
tasks:
- script: |-
- python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
+ python3 ./scripts/pkglistgen.py --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
"Leap.Staging.D":
environment_variables:
STAGING_PROJECT: openSUSE:Leap:15.1:Staging:D
@@ -1347,7 +1347,7 @@
- repo-checker3
tasks:
- script: |-
- python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
+ python3 ./scripts/pkglistgen.py --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
"Leap.Staging.E":
environment_variables:
STAGING_PROJECT: openSUSE:Leap:15.1:Staging:E
@@ -1399,5 +1399,5 @@
- repo-checker3
tasks:
- script: |-
- python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
+ python3 ./scripts/pkglistgen.py --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190512.4ef0c623/gocd/pkglistgen_staging.gocd.yaml.erb
new/openSUSE-release-tools-20190513.f2460434/gocd/pkglistgen_staging.gocd.yaml.erb
---
old/openSUSE-release-tools-20190512.4ef0c623/gocd/pkglistgen_staging.gocd.yaml.erb
2019-05-12 20:34:20.000000000 +0200
+++
new/openSUSE-release-tools-20190513.f2460434/gocd/pkglistgen_staging.gocd.yaml.erb
2019-05-13 16:17:12.000000000 +0200
@@ -21,7 +21,7 @@
resources:
- repo-checker3
tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -A
https://api.opensuse.org update_and_solve
+ - script: python3 ./pkglistgen.py -A https://api.opensuse.org
update_and_solve
--staging openSUSE:Factory:Staging:<%= letter %>
--only-release-packages --force
<% end -%>
@@ -77,7 +77,7 @@
- repo-checker3
tasks:
- script: |-
- python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
+ python3 ./scripts/pkglistgen.py --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
- Enable.images.repo:
resources:
@@ -108,7 +108,7 @@
resources:
- repo-checker3
tasks:
- - script: python3 /usr/bin/osrt-pkglistgen -A
https://api.opensuse.org update_and_solve
+ - script: python3 ./pkglistgen.py -A https://api.opensuse.org
update_and_solve
--staging openSUSE:Leap:15.1:Staging:<%= letter %>
--only-release-packages --force
<% end %>
@@ -164,5 +164,5 @@
- repo-checker3
tasks:
- script: |-
- python3 /usr/bin/osrt-pkglistgen --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
+ python3 ./scripts/pkglistgen.py --debug -A $STAGING_API
update_and_solve --staging $STAGING_PROJECT --force
<% end %>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190512.4ef0c623/gocd/staging.bot.gocd.yaml
new/openSUSE-release-tools-20190513.f2460434/gocd/staging.bot.gocd.yaml
--- old/openSUSE-release-tools-20190512.4ef0c623/gocd/staging.bot.gocd.yaml
2019-05-12 20:34:20.000000000 +0200
+++ new/openSUSE-release-tools-20190513.f2460434/gocd/staging.bot.gocd.yaml
2019-05-13 16:17:12.000000000 +0200
@@ -20,11 +20,10 @@
jobs:
Run:
resources:
- - repo-checker
+ - repo-checker3
tasks:
- script: |-
- cd scripts
- ./staging-installcheck.py -A https://api.opensuse.org -p
openSUSE:Factory
+ python3 ./scripts/staging-installcheck.py -A
https://api.opensuse.org -p openSUSE:Factory
SBot.Regular.Factory:
group: Factory.pkglistgen
lock_behavior: unlockWhenFinished
@@ -71,11 +70,10 @@
jobs:
Run:
resources:
- - repo-checker
+ - repo-checker3
tasks:
- script: |-
- cd scripts
- ./staging-installcheck.py -A https://api.opensuse.org -p
openSUSE:Leap:15.1
+ python3 ./scripts/staging-installcheck.py -A
https://api.opensuse.org -p openSUSE:Leap:15.1
SBot.Regular.Leap.15.1:
group: Leap.15.1.pkglistgen
lock_behavior: unlockWhenFinished
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190512.4ef0c623/gocd/staging.bot.gocd.yaml.erb
new/openSUSE-release-tools-20190513.f2460434/gocd/staging.bot.gocd.yaml.erb
--- old/openSUSE-release-tools-20190512.4ef0c623/gocd/staging.bot.gocd.yaml.erb
2019-05-12 20:34:20.000000000 +0200
+++ new/openSUSE-release-tools-20190513.f2460434/gocd/staging.bot.gocd.yaml.erb
2019-05-13 16:17:12.000000000 +0200
@@ -22,11 +22,10 @@
jobs:
Run:
resources:
- - repo-checker
+ - repo-checker3
tasks:
- script: |-
- cd scripts
- ./staging-installcheck.py -A https://api.opensuse.org -p
openSUSE:<%= project %>
+ python3 ./scripts/staging-installcheck.py -A
https://api.opensuse.org -p openSUSE:<%= project %>
SBot.Regular.<%= nickname %>:
group: <%= nickname %>.pkglistgen
lock_behavior: unlockWhenFinished
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190512.4ef0c623/osclib/core.py
new/openSUSE-release-tools-20190513.f2460434/osclib/core.py
--- old/openSUSE-release-tools-20190512.4ef0c623/osclib/core.py 2019-05-12
20:34:20.000000000 +0200
+++ new/openSUSE-release-tools-20190513.f2460434/osclib/core.py 2019-05-13
16:17:12.000000000 +0200
@@ -352,27 +352,28 @@
http_POST(url, data=ET.tostring(root))
@memoize(session=True)
-def _repository_path_expand(apiurl, project, repo, repos):
+def _repository_path_expand(apiurl, project, repo):
"""Recursively list underlying projects."""
- # only the last repo for a project is remembered by OBS
- if project in repos:
- del repos[project]
-
- repos[project] = repo
+ repos = OrderedDict()
meta = ET.fromstringlist(show_project_meta(apiurl, project))
for path in meta.findall('.//repository[@name="{}"]/path'.format(repo)):
- _repository_path_expand(apiurl, path.get('project', project),
path.get('repository'), repos)
+ rp = repository_path_expand(apiurl, path.get('project', project),
path.get('repository'))
+ for project, repo in rp:
+ # only the last repo for a project is remembered by OBS
+ if project in repos:
+ del repos[project]
+ repos[project] = repo
return repos
@memoize(session=True)
def repository_path_expand(apiurl, project, repo):
"""Recursively list underlying projects."""
- repodict = OrderedDict()
- _repository_path_expand(apiurl, project, repo, repodict)
+ repodict = _repository_path_expand(apiurl, project, repo)
repos = []
+ repos.append([project, repo])
for project, repo in repodict.items():
repos.append([project, repo])
return repos
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190512.4ef0c623/pkglistgen/group.py
new/openSUSE-release-tools-20190513.f2460434/pkglistgen/group.py
--- old/openSUSE-release-tools-20190512.4ef0c623/pkglistgen/group.py
2019-05-12 20:34:20.000000000 +0200
+++ new/openSUSE-release-tools-20190513.f2460434/pkglistgen/group.py
2019-05-13 16:17:12.000000000 +0200
@@ -64,7 +64,7 @@
if not isinstance(package, dict):
self._add_to_packages(package)
continue
- name = package.keys()[0]
+ name = list(package)[0]
for rel in package[name]:
arch = None
if rel == 'locked':
@@ -98,8 +98,8 @@
# do not repeat packages
def ignore(self, without):
for arch in ['*'] + self.pkglist.filtered_architectures:
- s = set(without.solved_packages[arch].keys())
- s |= set(without.solved_packages['*'].keys())
+ s = set(without.solved_packages[arch])
+ s |= set(without.solved_packages['*'])
for p in s:
self.solved_packages[arch].pop(p, None)
for p in without.not_found.keys():
@@ -215,7 +215,7 @@
if not sel.isempty():
jobs += sel.jobs(solv.Job.SOLVER_LOCK)
- for n in solved[arch].keys() + suggested.keys():
+ for n in list(solved[arch]) + list(suggested):
if n in locked: continue
sel = pool.select(str(n), solv.Selection.SELECTION_NAME)
jobs += sel.jobs(solv.Job.SOLVER_INSTALL)
@@ -232,9 +232,9 @@
# compute common packages across all architectures
for arch in self.pkglist.filtered_architectures:
if common is None:
- common = set(solved[arch].keys())
+ common = set(solved[arch])
continue
- common &= set(solved[arch].keys())
+ common &= set(solved[arch])
if common is None:
common = set()
@@ -266,7 +266,7 @@
if len(packages & mp):
overlap.comment += '\n overlapping between ' + self.name + '
and ' + m.name + '\n'
for p in sorted(packages & mp):
- for arch in m.solved_packages.keys():
+ for arch in list(m.solved_packages):
if m.solved_packages[arch].get(p, None):
overlap.comment += ' # ' + m.name + '.' + arch +
': ' + m.solved_packages[arch][p] + '\n'
if self.solved_packages[arch].get(p, None):
@@ -287,12 +287,12 @@
else:
src = s.lookup_str(solv.SOLVABLE_SOURCENAME)
- if src in self.srcpkgs.keys():
+ if src in list(self.srcpkgs):
self.develpkgs[s.name] = self.srcpkgs[src]
def _filter_already_selected(self, modules, pkgdict):
# erase our own - so we don't filter our own
- for p in pkgdict.keys():
+ for p in list(pkgdict):
already_present = False
for m in modules:
for arch in ['*'] + self.pkglist.filtered_architectures:
@@ -325,7 +325,7 @@
if arch == '*':
missing = self.not_found
unresolvable = self.unresolvable.get(arch, dict())
- for name in sorted(packages.keys() + missing.keys() +
unresolvable.keys()):
+ for name in sorted(list(packages) + list(missing) +
list(unresolvable)):
if name in self.silents:
continue
if name in missing:
@@ -359,5 +359,5 @@
def summary(self):
ret = set()
for arch in ['*'] + self.pkglist.filtered_architectures:
- ret |= set(self.solved_packages[arch].keys())
+ ret |= set(self.solved_packages[arch])
return ret
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190512.4ef0c623/pkglistgen/tool.py
new/openSUSE-release-tools-20190513.f2460434/pkglistgen/tool.py
--- old/openSUSE-release-tools-20190512.4ef0c623/pkglistgen/tool.py
2019-05-12 20:34:20.000000000 +0200
+++ new/openSUSE-release-tools-20190513.f2460434/pkglistgen/tool.py
2019-05-13 16:17:12.000000000 +0200
@@ -125,7 +125,7 @@
with open(os.path.join(self.output_dir, fn), 'w') as fh:
for arch in archs:
x = group.toxml(arch, self.ignore_broken, None)
- x = ET.tostring(x, pretty_print=True)
+ x = ET.tostring(x, pretty_print=True, encoding='unicode')
fh.write(x)
def write_all_groups(self):
@@ -144,7 +144,7 @@
x = group.toxml(arch, self.ignore_broken, comment)
# only comment first time
comment = None
- x = ET.tostring(x, pretty_print=True)
+ x = ET.tostring(x, pretty_print=True, encoding='unicode')
x = re.sub(r'\s*<!-- reason:', ' <!-- reason:', x)
fh.write(x)
return summary
@@ -265,7 +265,7 @@
if unsorted and g == unsorted:
continue
for a in ('*', arch):
- filtered -= set(g.solved_packages[a].keys())
+ filtered -= set(g.solved_packages[a])
for package in filtered:
packages.setdefault(package, []).append(arch)
@@ -273,8 +273,8 @@
archpacks = set(archpacks)
unsorted.solved_packages[arch] = dict()
for g in modules:
- archpacks -= set(g.solved_packages[arch].keys())
- archpacks -= set(g.solved_packages['*'].keys())
+ archpacks -= set(g.solved_packages[arch])
+ archpacks -= set(g.solved_packages['*'])
unsorted.solved_packages[arch] = dict()
for p in archpacks:
unsorted.solved_packages[arch][p] = None
@@ -283,9 +283,9 @@
common = None
for arch in self.filtered_architectures:
if common is None:
- common = set(unsorted.solved_packages[arch].keys())
+ common = set(unsorted.solved_packages[arch])
continue
- common &= set(unsorted.solved_packages[arch].keys())
+ common &= set(unsorted.solved_packages[arch])
for p in common:
unsorted.solved_packages['*'][p] = None
for arch in self.filtered_architectures:
@@ -293,7 +293,7 @@
with open(os.path.join(self.output_dir, 'unsorted.yml'), 'w') as fh:
fh.write('unsorted:\n')
- for p in sorted(packages.keys()):
+ for p in sorted(packages):
fh.write(' - ')
fh.write(p)
if len(packages[p]) != len(self.filtered_architectures):
@@ -365,7 +365,7 @@
fh = open(solv_file, 'w')
p = subprocess.Popen(
['rpms2solv', '-m', '-', '-0'], stdin=subprocess.PIPE,
stdout=fh)
- p.communicate('\0'.join(files))
+ p.communicate(bytes('\0'.join(files), 'utf-8'))
p.wait()
fh.close()
@@ -381,7 +381,7 @@
root = yaml.safe_load(open(os.path.join(directory, 'config.yml')))
for item in root:
- key = item.keys()[0]
+ key = list(item)[0]
opts = item[key]
# cast 15.1 to string :)
key = str(key)
@@ -451,10 +451,10 @@
del pool
- for repo in sorted(dropped_repos.keys()):
+ for repo in sorted(dropped_repos):
repo_output = False
exclusives = dict()
- for name in sorted(drops.keys()):
+ for name in sorted(drops):
if drops[name]['repo'] != repo:
continue
if len(drops[name]['archs']) == len(self.all_architectures):
@@ -466,7 +466,7 @@
jarch = ' '.join(sorted(drops[name]['archs']))
exclusives.setdefault(jarch, []).append(name)
- for arch in sorted(exclusives.keys()):
+ for arch in sorted(exclusives):
if not repo_output:
print('#', repo, file=output)
repo_output = True
@@ -497,7 +497,7 @@
# the yml parser makes an array out of everything, so
# we loop a bit more than what we support
for group in self.output:
- groupname = group.keys()[0]
+ groupname = list(group)[0]
settings = group[groupname]
if not settings: # e.g. unsorted
settings = {}
@@ -557,7 +557,7 @@
else:
# No proper API function to perform the same operation.
print(subprocess.check_output(
- ' '.join(['cd', path, '&&', 'osc', 'addremove']), shell=True))
+ ' '.join(['cd', path, '&&', 'osc', 'addremove']), shell=True,
encoding='utf-8'))
package = Package(path)
package.commit(msg='Automatic update', skip_local_service_run=True)
@@ -672,7 +672,7 @@
for product_file in glob.glob(os.path.join(product_dir, '*.product')):
self.replace_product_version(product_file, product_version)
print(subprocess.check_output(
- [PRODUCT_SERVICE, product_file, product_dir, project]))
+ [PRODUCT_SERVICE, product_file, product_dir, project],
encoding='utf-8'))
for delete_kiwi in
target_config.get('pkglistgen-delete-kiwis-{}'.format(scope), '').split(' '):
delete_kiwis = glob.glob(os.path.join(product_dir, delete_kiwi))
@@ -709,7 +709,7 @@
summary_file = os.path.join(product_dir, 'summary.yml')
with open(summary_file, 'w') as f:
f.write('# Summary of packages in groups')
- for group in sorted(summary.keys()):
+ for group in sorted(summary):
# the unsorted group should appear filtered by
# unneeded.yml - so we need the content of unsorted.yml
# not unsorted.group (this grew a little unnaturally)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190512.4ef0c623/pkglistgen/update_repo_handler.py
new/openSUSE-release-tools-20190513.f2460434/pkglistgen/update_repo_handler.py
---
old/openSUSE-release-tools-20190512.4ef0c623/pkglistgen/update_repo_handler.py
2019-05-12 20:34:20.000000000 +0200
+++
new/openSUSE-release-tools-20190513.f2460434/pkglistgen/update_repo_handler.py
2019-05-13 16:17:12.000000000 +0200
@@ -41,8 +41,9 @@
factoryre = re.compile(r'openSUSE-(\d*)-i586-x86_64-Build.*')
url = urljoin(baseurl, 'media.1/media')
with requests.get(url) as media:
+ media.encoding = 'utf-8'
if media.status_code == requests.codes.ok:
- for i, line in enumerate(media.iter_lines()):
+ for i, line in enumerate(media.iter_lines(decode_unicode=True)):
if i != 1:
continue
build = factoryre.match(line)
@@ -86,7 +87,7 @@
f.write(repomd.content)
f.flush()
os.lseek(f.fileno(), 0, os.SEEK_SET)
- repo.add_repomdxml(f, 0)
+ repo.add_repomdxml(solv.xfopen_fd(None, f.fileno()), 0)
url = urljoin(baseurl, location)
with requests.get(url, stream=True) as primary:
if primary.status_code != requests.codes.ok:
@@ -100,7 +101,7 @@
f.write(content.read())
f.flush()
os.lseek(f.fileno(), 0, os.SEEK_SET)
- repo.add_rpmmd(f, None, 0)
+ repo.add_rpmmd(solv.xfopen_fd(None, f.fileno()), None, 0)
return True
return False
@@ -146,7 +147,7 @@
repo.create_stubs()
- ofh = open(name, 'w')
+ ofh = solv.xfopen(name, 'w')
repo.write(ofh)
ofh.flush()
@@ -192,7 +193,7 @@
root = yaml.safe_load(open(os.path.join(repo_dir, 'config.yml')))
for item in root:
- key = item.keys()[0]
+ key = list(item)[0]
opts = item[key]
# cast 15.1 to string :)
key = str(key)
@@ -234,6 +235,6 @@
os.unlink(solv_file)
url = osc.core.makeurl(apiurl, ['source', project, '000update-repos',
path + '.xz'])
- osc.core.http_PUT(url, data=open(packages_file + '.xz').read())
+ osc.core.http_PUT(url, data=open(packages_file + '.xz', 'rb').read())
del pool
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190512.4ef0c623/pkglistgen.py
new/openSUSE-release-tools-20190513.f2460434/pkglistgen.py
--- old/openSUSE-release-tools-20190512.4ef0c623/pkglistgen.py 2019-05-12
20:34:20.000000000 +0200
+++ new/openSUSE-release-tools-20190513.f2460434/pkglistgen.py 2019-05-13
16:17:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
from pkglistgen.cli import CommandLineInterface
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190512.4ef0c623/staging-installcheck.py
new/openSUSE-release-tools-20190513.f2460434/staging-installcheck.py
--- old/openSUSE-release-tools-20190512.4ef0c623/staging-installcheck.py
2019-05-12 20:34:20.000000000 +0200
+++ new/openSUSE-release-tools-20190513.f2460434/staging-installcheck.py
2019-05-13 16:17:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
from __future__ import print_function
@@ -15,6 +15,7 @@
import osc.core
import argparse
import logging
+from urllib.error import HTTPError
from osclib.cache_manager import CacheManager
from osc import conf
@@ -41,12 +42,6 @@
from osclib.util import sha1_short
from osclib.stagingapi import StagingAPI
-try:
- from urllib.error import HTTPError
-except ImportError:
- # python 2.x
- from urllib2 import HTTPError
-
import ReviewBot
CACHEDIR = CacheManager.directory('repository-meta')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190512.4ef0c623/suppkg_rebuild.py
new/openSUSE-release-tools-20190513.f2460434/suppkg_rebuild.py
--- old/openSUSE-release-tools-20190512.4ef0c623/suppkg_rebuild.py
2019-05-12 20:34:20.000000000 +0200
+++ new/openSUSE-release-tools-20190513.f2460434/suppkg_rebuild.py
2019-05-13 16:17:12.000000000 +0200
@@ -18,6 +18,7 @@
import osc.core
from osc import oscerr
+from osc.util.helper import decode_list
from osclib.conf import Config
from osclib.stagingapi import StagingAPI
@@ -36,7 +37,7 @@
self.api = StagingAPI(self.apiurl, self.project)
def get_support_package_list(self, project, repository):
- f = osc.core.get_buildconfig(self.apiurl, project,
repository).splitlines()
+ f = decode_list(osc.core.get_buildconfig(self.apiurl, project,
repository).splitlines())
pkg_list = []
for line in f:
if re.match('Preinstall', line) or re.match('VM[Ii]nstall', line)
or re.match('Support', line):
@@ -154,10 +155,10 @@
osc.core.rebuild(self.apiurl, stgname, None, None, None)
stg.find('rebuild').text = 'unneeded'
- logging.info('Updating support pkg list...')
rebuild_data_updated = ET.tostring(root)
logging.debug(rebuild_data_updated)
if rebuild_data_updated != rebuild_data:
+ logging.info('Updating support pkg list...')
self.api.pseudometa_file_save(
'support_pkg_rebuild', rebuild_data_updated, 'support package
rebuild')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190512.4ef0c623/tests/fixtures/repository/openSUSE:Factory.xml
new/openSUSE-release-tools-20190513.f2460434/tests/fixtures/repository/openSUSE:Factory.xml
---
old/openSUSE-release-tools-20190512.4ef0c623/tests/fixtures/repository/openSUSE:Factory.xml
1970-01-01 01:00:00.000000000 +0100
+++
new/openSUSE-release-tools-20190513.f2460434/tests/fixtures/repository/openSUSE:Factory.xml
2019-05-13 16:17:12.000000000 +0200
@@ -0,0 +1,18 @@
+<project name="openSUSE:Factory">
+ <title/>
+ <description/>
+ <repository name="standard" rebuild="local">
+ <arch>x86_64</arch>
+ <arch>i586</arch>
+ </repository>
+ <repository name="snapshot">
+ <arch>x86_64</arch>
+ <arch>i586</arch>
+ </repository>
+ <repository name="ports">
+ <arch>ppc64</arch>
+ <arch>ppc</arch>
+ <arch>armv6l</arch>
+ <arch>aarch64</arch>
+ </repository>
+</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190512.4ef0c623/tests/fixtures/repository/openSUSE:Factory:Staging.xml
new/openSUSE-release-tools-20190513.f2460434/tests/fixtures/repository/openSUSE:Factory:Staging.xml
---
old/openSUSE-release-tools-20190512.4ef0c623/tests/fixtures/repository/openSUSE:Factory:Staging.xml
1970-01-01 01:00:00.000000000 +0100
+++
new/openSUSE-release-tools-20190513.f2460434/tests/fixtures/repository/openSUSE:Factory:Staging.xml
2019-05-13 16:17:12.000000000 +0200
@@ -0,0 +1,7 @@
+<project name="openSUSE:Factory:Staging">
+ <title>openSUSE Factory Staging</title>
+ <description>This is just a namespace for various staging
projects</description>
+ <repository name="standard">
+ <path project="openSUSE:Factory" repository="ports"/>
+ </repository>
+</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190512.4ef0c623/tests/fixtures/repository/openSUSE:Factory:Staging:H.xml
new/openSUSE-release-tools-20190513.f2460434/tests/fixtures/repository/openSUSE:Factory:Staging:H.xml
---
old/openSUSE-release-tools-20190512.4ef0c623/tests/fixtures/repository/openSUSE:Factory:Staging:H.xml
1970-01-01 01:00:00.000000000 +0100
+++
new/openSUSE-release-tools-20190513.f2460434/tests/fixtures/repository/openSUSE:Factory:Staging:H.xml
2019-05-13 16:17:12.000000000 +0200
@@ -0,0 +1,18 @@
+<project name="openSUSE:Factory:Staging:H">
+ <title/>
+ <description/>
+ <repository name="standard" rebuild="direct" linkedbuild="all">
+ <path project="openSUSE:Factory:Staging:H" repository="bootstrap_copy"/>
+ <arch>i586</arch>
+ <arch>x86_64</arch>
+ </repository>
+ <repository name="images" linkedbuild="all">
+ <path project="openSUSE:Factory:Staging:H" repository="standard"/>
+ <arch>x86_64</arch>
+ </repository>
+ <repository name="bootstrap_copy">
+ <path project="openSUSE:Factory:Staging" repository="standard"/>
+ <arch>i586</arch>
+ <arch>x86_64</arch>
+ </repository>
+</project>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20190512.4ef0c623/tests/repository_tests.py
new/openSUSE-release-tools-20190513.f2460434/tests/repository_tests.py
--- old/openSUSE-release-tools-20190512.4ef0c623/tests/repository_tests.py
2019-05-12 20:34:20.000000000 +0200
+++ new/openSUSE-release-tools-20190513.f2460434/tests/repository_tests.py
2019-05-13 16:17:12.000000000 +0200
@@ -62,3 +62,13 @@
['SUSE:SLE-12-SP1:GA', 'standard'],
['SUSE:SLE-12:Update', 'snapshot-SP5'],
['SUSE:SLE-12:GA', 'standard']], repos)
+
+ def test_factory_staging(self):
+ self.add_project('openSUSE:Factory')
+ self.add_project('openSUSE:Factory:Staging')
+ self.add_project('openSUSE:Factory:Staging:H')
+ repos = repository_path_expand(self.wf.api.apiurl,
'openSUSE:Factory:Staging:H', 'standard')
+ self.assertEqual([['openSUSE:Factory:Staging:H', 'standard'],
+ ['openSUSE:Factory:Staging:H', 'bootstrap_copy'],
+ ['openSUSE:Factory:Staging', 'standard'],
+ ['openSUSE:Factory', 'ports']], repos)
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.bqfqcH/_old 2019-05-14 13:43:40.092678229 +0200
+++ /var/tmp/diff_new_pack.bqfqcH/_new 2019-05-14 13:43:40.092678229 +0200
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20190512.4ef0c623
-mtime: 1557686060
-commit: 4ef0c6230dee65338fd62b0fe38e2b6a4bcd5ac9
+version: 20190513.f2460434
+mtime: 1557757032
+commit: f246043497550385af0e6cb7eb7ec17b63a349c8
