Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2020-05-12 22:33:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Tue May 12 22:33:18 2020 rev:288 rq:802857 version:20200505.cd067a94
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2020-04-02 17:43:54.489424438 +0200
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.2738/openSUSE-release-tools.changes
2020-05-12 22:33:29.500014569 +0200
@@ -1,0 +2,44 @@
+Tue May 05 07:53:31 UTC 2020 - opensuse-releaset...@opensuse.org
+
+- Update to version 20200505.cd067a94:
+ * gocd: add 15.2 MicroOS ttm
+
+-------------------------------------------------------------------
+Tue May 05 07:21:12 UTC 2020 - opensuse-releaset...@opensuse.org
+
+- Update to version 20200505.1e6677e6:
+ * Update some ttm documentation
+
+-------------------------------------------------------------------
+Sat May 02 11:03:55 UTC 2020 - opensuse-releaset...@opensuse.org
+
+- Update to version 20200502.027727cc:
+ * Check for 'weakremovers.inc' in in group_dir before attempting to move it
+
+-------------------------------------------------------------------
+Sat May 02 09:20:17 UTC 2020 - opensuse-releaset...@opensuse.org
+
+- Update to version 20200502.4cba11ba:
+ * Fix httpretty using tests
+
+-------------------------------------------------------------------
+Thu Apr 30 12:23:06 UTC 2020 - opensuse-releaset...@opensuse.org
+
+- Update to version 20200430.fca4401c:
+ * dist: drop bogus python-enum34 dependency
+
+-------------------------------------------------------------------
+Thu Apr 30 12:20:14 UTC 2020 - opensuse-releaset...@opensuse.org
+
+- Update to version 20200430.56213c5d:
+ * Update docker to run tumbleweed container
+ * miniobs: Fix database setup for rails 6
+
+-------------------------------------------------------------------
+Thu Apr 30 10:21:50 UTC 2020 - opensuse-releaset...@opensuse.org
+
+- Update to version 20200430.a354092d:
+ * stagingapi: do not add multibuild flavor package to the ring package list
+ * stagingapi: allow multibuild package spreads across ring
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20200325.77a14833.obscpio
New:
----
openSUSE-release-tools-20200505.cd067a94.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.WvrY1R/_old 2020-05-12 22:33:31.256018234 +0200
+++ /var/tmp/diff_new_pack.WvrY1R/_new 2020-05-12 22:33:31.260018242 +0200
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20200325.77a14833
+Version: 20200505.cd067a94
Release: 0
Summary: Tools to aid in staging and release work for openSUSE/SUSE
License: GPL-2.0-or-later AND MIT
@@ -58,10 +58,6 @@
Requires: python3-python-dateutil
Requires: python3-pyxdg
Requires: python3-requests
-# ttm/manager.py
-%if %{without python3}
-Requires: python-enum34
-%endif
# bs_mirrorfull
Requires: perl-Net-SSLeay
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.WvrY1R/_old 2020-05-12 22:33:31.300018325 +0200
+++ /var/tmp/diff_new_pack.WvrY1R/_new 2020-05-12 22:33:31.304018334 +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">f28b520a92faa2d896dd253a8bd7319e6d634cee</param>
+ <param
name="changesrevision">fa7f243c54bd29b72fe8e20c39513e379b834af6</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20200325.77a14833.obscpio ->
openSUSE-release-tools-20200505.cd067a94.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openSUSE-release-tools-20200325.77a14833/.travis.yml
new/openSUSE-release-tools-20200505.cd067a94/.travis.yml
--- old/openSUSE-release-tools-20200325.77a14833/.travis.yml 2020-03-25
17:26:22.000000000 +0100
+++ new/openSUSE-release-tools-20200505.cd067a94/.travis.yml 2020-05-05
09:52:15.000000000 +0200
@@ -1,12 +1,24 @@
language: bash
+sudo: required
services:
- docker
script:
+ - sed -i -e "s,../..:,$PWD:," dist/ci/docker-compose.yml
- docker-compose -f dist/ci/docker-compose.yml run flaker
- for var in TRAVIS_BRANCH TRAVIS_JOB_ID TRAVIS_PULL_REQUEST; do echo
"$var=${!var}"; done > travis.settings
- docker-compose -f dist/ci/docker-compose.yml run test
+before_install:
+ - >
+ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+ # Ensure that Travis uses the latest version of Docker.
+ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key
add -
+ sudo add-apt-repository "deb [arch=amd64]
https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+ sudo apt-get update
+ sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
+ fi
+
notifications:
email:
recipients:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20200325.77a14833/dist/ci/miniobs/BSConfig.pm.patch
new/openSUSE-release-tools-20200505.cd067a94/dist/ci/miniobs/BSConfig.pm.patch
---
old/openSUSE-release-tools-20200325.77a14833/dist/ci/miniobs/BSConfig.pm.patch
2020-03-25 17:26:22.000000000 +0100
+++
new/openSUSE-release-tools-20200505.cd067a94/dist/ci/miniobs/BSConfig.pm.patch
2020-05-05 09:52:15.000000000 +0200
@@ -1,11 +1,17 @@
---- /usr/lib/obs/server/BSConfig.pm.back 2019-04-30 06:21:39.000000000
+0000
-+++ /usr/lib/obs/server/BSConfig.pm 2019-04-30 06:32:04.000000000 +0000
-@@ -34,3 +34,3 @@
+--- /usr/lib/obs/server/BSConfig.pm.orig 2020-04-29 19:34:39.000000000
+0000
++++ /usr/lib/obs/server/BSConfig.pm 2020-04-30 10:05:14.000000000 +0000
+@@ -32,7 +32,7 @@
+ my $frontend = undef; # FQDN of the WebUI/API server if it's not $hostname
+
# If defined, restrict access to the backend servers (bs_repserver,
bs_srcserver, bs_service)
-our $ipaccess = {
+our $removed_ipaccess = {
'^::1$' => 'rw', # only the localhost can write to the backend
-@@ -48,5 +48,5 @@
+ '^127\..*' => 'rw', # only the localhost can write to the backend
+ "^$ip\$" => 'rw', # Permit IP of FQDN
+@@ -49,9 +49,9 @@
+ #our $ssl_certfile = "/path/to/tls.pem";
+
# Change also the SLP reg files in /etc/slp.reg.d/ when you touch hostname or
port
-our $srcserver = "http://$hostname:5352";;
-our $reposerver = "http://$hostname:5252";;
@@ -14,8 +20,13 @@
+our $reposerver = "http://repserver:5252";;
+our $serviceserver = "http://serviceserver:5152";;
our $clouduploadserver = "http://$hostname:5452";;
-@@ -226,3 +226,3 @@
+
+ # you can use different ports for worker connections
+@@ -250,7 +250,7 @@
+ #our $modifyrepo = '/usr/bin/modifyrepo_c';
+
# enable service dispatcher
-our $servicedispatch = 1;
+our $servicedispatch = 0;
# max of 4 parallel running services (default)
+ # our $servicedispatch_maxchild = 4;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20200325.77a14833/dist/ci/miniobs/Dockerfile
new/openSUSE-release-tools-20200505.cd067a94/dist/ci/miniobs/Dockerfile
--- old/openSUSE-release-tools-20200325.77a14833/dist/ci/miniobs/Dockerfile
2020-03-25 17:26:22.000000000 +0100
+++ new/openSUSE-release-tools-20200505.cd067a94/dist/ci/miniobs/Dockerfile
2020-05-05 09:52:15.000000000 +0200
@@ -10,22 +10,12 @@
COPY database.yml.local /srv/www/obs/api/config/database.yml
-RUN /usr/lib/mysql/mysql-systemd-helper install ;\
- sed -e 's,127.0.0.1,0.0.0.0,' -i /etc/my.cnf ;\
- sed -e 's,server-id,skip-grant-tables,' -i /etc/my.cnf ;\
- /usr/lib/mysql/mysql-systemd-helper start & \
- /usr/lib/mysql/mysql-systemd-helper wait ;\
- /usr/bin/mysql -u root -e "SELECT @@version; CREATE USER 'root'@'%'
IDENTIFIED BY 'opensuse'; GRANT ALL ON *.* TO 'root'@'%' WITH GRANT OPTION;" ;\
- chroot --userspec=wwwrun / /bin/bash -c "cd /srv/www/obs/api &&
DISABLE_DATABASE_ENVIRONMENT_CHECK=1 RAILS_ENV=production bundle exec rails
db:create db:setup" ;\
- mysqladmin shutdown
+COPY prepare.sh /
+RUN bash -xe /prepare.sh
COPY config.yml /srv/www/obs/api/config/options.yml
COPY database.yml /srv/www/obs/api/config/database.yml
-RUN sed -i -e 's,\(config.public_file_server.enabled\).*,\1 = true,;
s,\(config.log_level\).*,\1 = :debug,' \
- /srv/www/obs/api/config/environments/production.rb
-RUN rm -f /srv/www/obs/api/tmp/pids/server.pid
-
COPY BSConfig.pm.patch /tmp
RUN patch /usr/lib/obs/server/BSConfig.pm /tmp/BSConfig.pm.patch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20200325.77a14833/dist/ci/miniobs/prepare.sh
new/openSUSE-release-tools-20200505.cd067a94/dist/ci/miniobs/prepare.sh
--- old/openSUSE-release-tools-20200325.77a14833/dist/ci/miniobs/prepare.sh
1970-01-01 01:00:00.000000000 +0100
+++ new/openSUSE-release-tools-20200505.cd067a94/dist/ci/miniobs/prepare.sh
2020-05-05 09:52:15.000000000 +0200
@@ -0,0 +1,17 @@
+#! /bin/sh
+
+/usr/lib/mysql/mysql-systemd-helper install
+sed -e 's,127.0.0.1,0.0.0.0,' -i /etc/my.cnf
+sed -e 's,server-id,skip-grant-tables,' -i /etc/my.cnf
+
+/usr/lib/mysql/mysql-systemd-helper start &
+/usr/lib/mysql/mysql-systemd-helper wait
+
+#/usr/bin/mysqladmin -u root password 'opensuse'
+
+chroot --userspec=wwwrun / /bin/bash -c "cd /srv/www/obs/api &&
DISABLE_DATABASE_ENVIRONMENT_CHECK=1 SAFETY_ASSURED=1 RAILS_ENV=production
bundle exec rake db:create db:setup"
+mysqladmin shutdown
+
+sed -i -e 's,\(config.public_file_server.enabled\).*,\1 = true,;
s,\(config.log_level\).*,\1 = :debug,'
/srv/www/obs/api/config/environments/production.rb
+rm -f /srv/www/obs/api/tmp/pids/server.pid
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20200325.77a14833/dist/package/openSUSE-release-tools.spec
new/openSUSE-release-tools-20200505.cd067a94/dist/package/openSUSE-release-tools.spec
---
old/openSUSE-release-tools-20200325.77a14833/dist/package/openSUSE-release-tools.spec
2020-03-25 17:26:22.000000000 +0100
+++
new/openSUSE-release-tools-20200505.cd067a94/dist/package/openSUSE-release-tools.spec
2020-05-05 09:52:15.000000000 +0200
@@ -58,10 +58,6 @@
Requires: python3-python-dateutil
Requires: python3-pyxdg
Requires: python3-requests
-# ttm/manager.py
-%if %{without python3}
-Requires: python-enum34
-%endif
# bs_mirrorfull
Requires: perl-Net-SSLeay
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20200325.77a14833/docs/totest.asciidoc
new/openSUSE-release-tools-20200505.cd067a94/docs/totest.asciidoc
--- old/openSUSE-release-tools-20200325.77a14833/docs/totest.asciidoc
2020-03-25 17:26:22.000000000 +0100
+++ new/openSUSE-release-tools-20200505.cd067a94/docs/totest.asciidoc
2020-05-05 09:52:15.000000000 +0200
@@ -26,27 +26,85 @@
from the current Factory.
-Installation
+Setup
------------
-[id="install"]
+[id="cli"]
-Clone this repository:
+Create a :ToTest subproject of the project you like to have ttm running. The
+user account of the ttm needs to have access, eg.
-------------------------------------------------------------------------------
-git clone https://github.com/openSUSE/openSUSE-release-tools.git
+$ osc meta prj MyProject:ToTest
+[...]
+<person userid="totest-manager" role="maintainer"/>
+[...]
-------------------------------------------------------------------------------
-Link the plugin and the library in +~/.osc-plugins+ or +/var/lib/osc-plugins+.
+If images or products are meant to be released make sure to set the image type:
-------------------------------------------------------------------------------
-cd openSUSE-release-tools
-ln -sr ./osc-totest.py ./osclib ~/.osc-plugins
+$ osc meta prjconf MyProject:ToTest
+%if "%_repository" == "images"
+%Type: kiwi
+%Repotype: staticlinks
+%Patterntype: none
+%Prefer: openSUSE-release
+%endif
-------------------------------------------------------------------------------
+In the main project meta, add release targets for the repos that you want to
+have released into :ToTest
-Command line
-------------
-[id="cli"]
+-------------------------------------------------------------------------------
+$ osc meta prj MyProject
+[...]
+<repository name="images">
+ <releasetarget project="MyProject:ToTest" repository="images"
trigger="manual"/>
+[...]
+-------------------------------------------------------------------------------
+
+Configure the attribute for ttm so it knows what to release:
+
+-------------------------------------------------------------------------------
+$ cat <<EOF > myattribute
+jobs_num: 2
+openqa_group: My Product 66.6
+openqa_server: https://openqa.opensuse.org
+product_repo: images
+product_arch: x86_64
+products:
+ ftp:
+ - 000product:MyProduct-ftp-ftp-x86_64
+ main:
+ - 000product:MyProduct-dvd5-dvd-x86_64
+ images:
+ - MyProduct-Live:
+ - x86_64
+take_source_from_product: true
+need_same_build_number: true
+set_snapshot_number: true
+test_subproject: ToTest
+EOF
+$ osc meta attribute MyProject -c -a OSRT:ToTestManagerConfig -F myattribute
+-------------------------------------------------------------------------------
+
+Create a 00Meta package in the main project for ttm to store some metadata:
-This plugin does not have any parameters, and needs to be executed with
-the proper permissions in OBS.
+-------------------------------------------------------------------------------
+$ osc meta pkg -e MyProject/00Meta
+[...]
+<person userid="totest-manager" role="maintainer"/>
+[...]
+-------------------------------------------------------------------------------
+
+Force release initially
+
+-------------------------------------------------------------------------------
+./totest-manager.py release --force MyProject
+-------------------------------------------------------------------------------
+
+After that run
+
+-------------------------------------------------------------------------------
+./totest-manager.py run MyProject
+-------------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20200325.77a14833/gocd/totestmanager.gocd.yaml
new/openSUSE-release-tools-20200505.cd067a94/gocd/totestmanager.gocd.yaml
--- old/openSUSE-release-tools-20200325.77a14833/gocd/totestmanager.gocd.yaml
2020-03-25 17:26:22.000000000 +0100
+++ new/openSUSE-release-tools-20200505.cd067a94/gocd/totestmanager.gocd.yaml
2020-05-05 09:52:15.000000000 +0200
@@ -105,6 +105,27 @@
- script: |-
install -D /home/go/config/openqa-client.conf
/home/go/.config/openqa/client.conf
scripts/totest-manager.py -A https://api.opensuse.org --debug run
openSUSE:Factory:zSystems
+ TTM.Leap_15.1_ARM_Images:
+ group: openSUSE.Checkers
+ lock_behavior: unlockWhenFinished
+ environment_variables:
+ OSC_CONFIG: /home/go/config/oscrc-totest-manager
+ materials:
+ script:
+ git: https://github.com/openSUSE/openSUSE-release-tools.git
+ destination: scripts
+ timer:
+ spec: 0 */15 * ? * *
+ only_on_changes: false
+ stages:
+ - Run:
+ approval: manual
+ resources:
+ - staging-bot
+ tasks:
+ - script: |-
+ install -D /home/go/config/openqa-client.conf
/home/go/.config/openqa/client.conf
+ scripts/totest-manager.py -A https://api.opensuse.org --debug run
openSUSE:Leap:15.1:ARM:Images
TTM.Leap_15.1_Images:
group: openSUSE.Checkers
lock_behavior: unlockWhenFinished
@@ -126,7 +147,7 @@
- script: |-
install -D /home/go/config/openqa-client.conf
/home/go/.config/openqa/client.conf
scripts/totest-manager.py -A https://api.opensuse.org --debug run
openSUSE:Leap:15.1:Images
- TTM.Leap_15.2_Images:
+ TTM.Leap_15.2:
group: openSUSE.Checkers
lock_behavior: unlockWhenFinished
environment_variables:
@@ -146,8 +167,8 @@
tasks:
- script: |-
install -D /home/go/config/openqa-client.conf
/home/go/.config/openqa/client.conf
- scripts/totest-manager.py -A https://api.opensuse.org --debug run
openSUSE:Leap:15.2:Images
- TTM.Leap_15.1_ARM_Images:
+ scripts/totest-manager.py -A https://api.opensuse.org --debug run
openSUSE:Leap:15.2
+ TTM.Leap_15.2_ARM:
group: openSUSE.Checkers
lock_behavior: unlockWhenFinished
environment_variables:
@@ -167,7 +188,7 @@
tasks:
- script: |-
install -D /home/go/config/openqa-client.conf
/home/go/.config/openqa/client.conf
- scripts/totest-manager.py -A https://api.opensuse.org --debug run
openSUSE:Leap:15.1:ARM:Images
+ scripts/totest-manager.py -A https://api.opensuse.org --debug run
openSUSE:Leap:15.2:ARM
TTM.Leap_15.2_ARM_Images:
group: openSUSE.Checkers
lock_behavior: unlockWhenFinished
@@ -189,7 +210,7 @@
- script: |-
install -D /home/go/config/openqa-client.conf
/home/go/.config/openqa/client.conf
scripts/totest-manager.py -A https://api.opensuse.org --debug run
openSUSE:Leap:15.2:ARM:Images
- TTM.Leap_15.2:
+ TTM.Leap_15.2_Images:
group: openSUSE.Checkers
lock_behavior: unlockWhenFinished
environment_variables:
@@ -209,8 +230,8 @@
tasks:
- script: |-
install -D /home/go/config/openqa-client.conf
/home/go/.config/openqa/client.conf
- scripts/totest-manager.py -A https://api.opensuse.org --debug run
openSUSE:Leap:15.2
- TTM.Leap_15.2_ARM:
+ scripts/totest-manager.py -A https://api.opensuse.org --debug run
openSUSE:Leap:15.2:Images
+ TTM.Leap_15.2_MicroOS:
group: openSUSE.Checkers
lock_behavior: unlockWhenFinished
environment_variables:
@@ -230,7 +251,7 @@
tasks:
- script: |-
install -D /home/go/config/openqa-client.conf
/home/go/.config/openqa/client.conf
- scripts/totest-manager.py -A https://api.opensuse.org --debug run
openSUSE:Leap:15.2:ARM
+ scripts/totest-manager.py -A https://api.opensuse.org --debug run
openSUSE:Leap:15.2:MicroOS
TTM.Leap_15.2_PowerPC:
group: openSUSE.Checkers
lock_behavior: unlockWhenFinished
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20200325.77a14833/gocd/totestmanager.gocd.yaml.erb
new/openSUSE-release-tools-20200505.cd067a94/gocd/totestmanager.gocd.yaml.erb
---
old/openSUSE-release-tools-20200325.77a14833/gocd/totestmanager.gocd.yaml.erb
2020-03-25 17:26:22.000000000 +0100
+++
new/openSUSE-release-tools-20200505.cd067a94/gocd/totestmanager.gocd.yaml.erb
2020-05-05 09:52:15.000000000 +0200
@@ -1,8 +1,20 @@
format_version: 3
pipelines:
-<% for project in %w(openSUSE:Factory openSUSE:Factory:ARM
openSUSE:Factory:PowerPC openSUSE:Factory:WSL
- openSUSE:Factory:zSystems openSUSE:Leap:15.1:Images
openSUSE:Leap:15.2:Images
- openSUSE:Leap:15.1:ARM:Images
openSUSE:Leap:15.2:ARM:Images openSUSE:Leap:15.2 openSUSE:Leap:15.2:ARM
openSUSE:Leap:15.2:PowerPC) -%>
+<% for project in %w(
+ openSUSE:Factory
+ openSUSE:Factory:ARM
+ openSUSE:Factory:PowerPC
+ openSUSE:Factory:WSL
+ openSUSE:Factory:zSystems
+ openSUSE:Leap:15.1:ARM:Images
+ openSUSE:Leap:15.1:Images
+ openSUSE:Leap:15.2
+ openSUSE:Leap:15.2:ARM
+ openSUSE:Leap:15.2:ARM:Images
+ openSUSE:Leap:15.2:Images
+ openSUSE:Leap:15.2:MicroOS
+ openSUSE:Leap:15.2:PowerPC
+ ) -%>
TTM.<%= project.gsub('openSUSE:', '').gsub(':', '_') %>:
group: openSUSE.Checkers
lock_behavior: unlockWhenFinished
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20200325.77a14833/osclib/stagingapi.py
new/openSUSE-release-tools-20200505.cd067a94/osclib/stagingapi.py
--- old/openSUSE-release-tools-20200325.77a14833/osclib/stagingapi.py
2020-03-25 17:26:22.000000000 +0100
+++ new/openSUSE-release-tools-20200505.cd067a94/osclib/stagingapi.py
2020-05-05 09:52:15.000000000 +0200
@@ -213,9 +213,14 @@
for si in ET.parse(root).getroot().findall('sourceinfo'):
pkg = si.get('package')
- # XXX TODO - Test-DVD-x86_64 is hardcoded here
- if pkg in ret and not pkg.startswith('Test-DVD-'):
+ if ':' in pkg:
+ continue
+ if pkg in ret:
msg = '{} is defined in two projects ({} and {})'
+ filelist = self.get_filelist_for_package(pkgname=pkg,
project=prj, expand='1')
+ if '_multibuild' in filelist:
+ logging.debug(msg.format(pkg, ret[pkg], prj))
+ msg = ''
if pkg.startswith('000') or (checklinks and pkg in
except_pkgs and prj == except_pkgs[pkg]):
msg = ''
if len(msg):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20200325.77a14833/pkglistgen/tool.py
new/openSUSE-release-tools-20200505.cd067a94/pkglistgen/tool.py
--- old/openSUSE-release-tools-20200325.77a14833/pkglistgen/tool.py
2020-03-25 17:26:22.000000000 +0100
+++ new/openSUSE-release-tools-20200505.cd067a94/pkglistgen/tool.py
2020-05-05 09:52:15.000000000 +0200
@@ -683,7 +683,8 @@
# do not overwrite weakremovers.inc if it exists
# we will commit there afterwards if needed
- if not os.path.exists(os.path.join(release_dir, 'weakremovers.inc')):
+ if os.path.exists(os.path.join(group_dir, 'weakremovers.inc')) and \
+ not os.path.exists(os.path.join(release_dir, 'weakremovers.inc')):
file_utils.move_list([os.path.join(group_dir,
'weakremovers.inc')], release_dir)
file_utils.multibuild_from_glob(release_dir, '*.spec')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20200325.77a14833/tests/factory_source_tests.py
new/openSUSE-release-tools-20200505.cd067a94/tests/factory_source_tests.py
--- old/openSUSE-release-tools-20200325.77a14833/tests/factory_source_tests.py
2020-03-25 17:26:22.000000000 +0100
+++ new/openSUSE-release-tools-20200505.cd067a94/tests/factory_source_tests.py
2020-05-05 09:52:15.000000000 +0200
@@ -6,12 +6,7 @@
import re
from osclib.cache import Cache
-try:
- from urllib.parse import urlparse, parse_qs
-except ImportError:
- # python 2.x
- from urlparse import urlparse, parse_qs
-
+from urllib.parse import urlparse, parse_qs
from check_source_in_factory import FactorySourceChecker
APIURL = 'http://testhost.example.com'
@@ -30,13 +25,14 @@
Cache.last_updated[APIURL] = {'__oldest': '2016-12-18T11:49:37Z'}
httpretty.reset()
- httpretty.enable()
+ httpretty.enable(allow_net_connect=False)
oscrc = os.path.join(FIXTURES, 'oscrc')
osc.core.conf.get_config(override_conffile=oscrc,
override_no_keyring=True,
override_no_gnome_keyring=True)
#osc.conf.config['debug'] = 1
+ #osc.conf.config['http_debug'] = 1
logging.basicConfig()
self.logger = logging.getLogger(__file__)
@@ -80,6 +76,25 @@
<filename>timezone.spec</filename>
</sourceinfo>
""")
+
+ httpretty.register_uri(httpretty.GET,
+ APIURL + "/source/openSUSE:Factory/timezone/_meta",
+ body = """
+ <package name="timezone" project="openSUSE:Factory">
+ <title>timezone</title>
+ <description></description>
+ </package>
+ """)
+
+ httpretty.register_uri(httpretty.GET,
+ APIURL + "/source/Base:System/timezone/_meta",
+ body = """
+ <package name="timezone" project="Base:System">
+ <title>timezone</title>
+ <description></description>
+ </package>
+ """)
+
httpretty.register_uri(httpretty.GET,
APIURL + "/source/openSUSE:Factory/timezone?view=info",
match_querystring = True,
@@ -245,7 +260,7 @@
""")
httpretty.register_uri(httpretty.GET,
- APIURL + "/source/openSUSE:Factory/plan",
+ APIURL + "/source/openSUSE:Factory/plan/_meta",
status = 404,
body = """
<status code="unknown_package">
@@ -258,8 +273,7 @@
status = 404)
httpretty.register_uri(httpretty.GET,
- APIURL +
'/search/request?match=%28state%2F%40name%3D%27new%27+or+state%2F%40name%3D%27review%27%29+and+%28action%2Ftarget%2F%40project%3D%27openSUSE%3AFactory%27+or+action%2Fsource%2F%40project%3D%27openSUSE%3AFactory%27%29+and+%28action%2Ftarget%2F%40package%3D%27plan%27+or+action%2Fsource%2F%40package%3D%27plan%27%29+and+action%2F%40type%3D%27submit%27',
- match_querystring = True,
+ APIURL + '/search/request',
body = """
<collection matches="0">
</collection>
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.WvrY1R/_old 2020-05-12 22:33:31.944019669 +0200
+++ /var/tmp/diff_new_pack.WvrY1R/_new 2020-05-12 22:33:31.944019669 +0200
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20200325.77a14833
-mtime: 1585153582
-commit: 77a148335e9cda52262f642d8c9a27bc87b570e3
+version: 20200505.cd067a94
+mtime: 1588665135
+commit: cd067a946d1ed65a0f9a7b89e6c2efc2ee7d6ee4
