Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2018-08-22 14:19:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Wed Aug 22 14:19:35 2018 rev:122 rq:630676 version:20180820.d7d5724
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2018-08-20 16:19:53.144861856 +0200
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new/openSUSE-release-tools.changes
2018-08-22 14:20:03.950310868 +0200
@@ -1,0 +2,12 @@
+Tue Aug 21 02:08:36 UTC 2018 - [email protected]
+
+- Update to version 20180820.d7d5724:
+ * osc-staging: update "config" documentation to point to OSRT:Config.
+ * osclib/core: source_file_save(): always include host in message.
+ * osclib/stagingapi: rename dashboard_content_* methods to pseudometa_file_*.
+ * Replace relevant 'dashboard' package references with pseudometa lookup.
+ * osclib/stagingapi: drop {load,save}_file_content() methods.
+ * osclib/core: provide project_pseudometa_*() functions.
+ * osclib/core: provide source_file_save() adapted from StagingAPI.
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20180817.c11f78e.obscpio
New:
----
openSUSE-release-tools-20180820.d7d5724.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.6NFUSr/_old 2018-08-22 14:20:05.238313919 +0200
+++ /var/tmp/diff_new_pack.6NFUSr/_new 2018-08-22 14:20:05.242313929 +0200
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20180817.c11f78e
+Version: 20180820.d7d5724
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.6NFUSr/_old 2018-08-22 14:20:05.270313995 +0200
+++ /var/tmp/diff_new_pack.6NFUSr/_new 2018-08-22 14:20:05.270313995 +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">c11f78eb83656c583cdba86c0c7537e8a46919f8</param>
+ <param
name="changesrevision">1fe03c16f0b836db70d0bd4145161a1199952a60</param>
</service>
</servicedata>
++++++ openSUSE-release-tools-20180817.c11f78e.obscpio ->
openSUSE-release-tools-20180820.d7d5724.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180817.c11f78e/devel-project.py
new/openSUSE-release-tools-20180820.d7d5724/devel-project.py
--- old/openSUSE-release-tools-20180817.c11f78e/devel-project.py
2018-08-17 18:20:13.000000000 +0200
+++ new/openSUSE-release-tools-20180820.d7d5724/devel-project.py
2018-08-21 04:03:44.000000000 +0200
@@ -73,11 +73,11 @@
if args.write:
api = staging_api(args)
- api.dashboard_content_ensure('devel_projects', out,
'devel_projects write')
+ api.pseudometa_file_ensure('devel_projects', out, 'devel_projects
write')
def devel_projects_load(args):
api = staging_api(args)
- devel_projects = api.dashboard_content_load('devel_projects')
+ devel_projects = api.pseudometa_file_load('devel_projects')
if devel_projects:
return devel_projects.splitlines()
@@ -267,7 +267,7 @@
parser_list = subparsers.add_parser('list', help='List devel projects.')
parser_list.set_defaults(func=list)
- parser_list.add_argument('-w', '--write', action='store_true', help='write
to dashboard container package')
+ parser_list.add_argument('-w', '--write', action='store_true', help='write
to pseudometa package')
parser_maintainer = subparsers.add_parser('maintainer', help='Check for
relevant groups as maintainer.')
parser_maintainer.set_defaults(func=maintainer)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180817.c11f78e/fcc_submitter.py
new/openSUSE-release-tools-20180820.d7d5724/fcc_submitter.py
--- old/openSUSE-release-tools-20180817.c11f78e/fcc_submitter.py
2018-08-17 18:20:13.000000000 +0200
+++ new/openSUSE-release-tools-20180820.d7d5724/fcc_submitter.py
2018-08-21 04:03:44.000000000 +0200
@@ -31,6 +31,7 @@
import osc.conf
import osc.core
from osclib.core import devel_project_get
+from osclib.core import project_pseudometa_package
from osc import oscerr
from osclib.memoize import memoize
@@ -319,7 +320,8 @@
target_packages = self.get_source_packages(self.to_prj)
deleted_packages = self.get_deleted_packages(self.to_prj)
- skip_pkgs_list = self.load_skip_pkgs_list('openSUSE:Factory:Staging',
'dashboard').splitlines()
+ pseudometa_project, pseudometa_package =
project_pseudometa_package(self.apiurl, 'openSUSE:Factory')
+ skip_pkgs_list = self.load_skip_pkgs_list(pseudometa_project,
pseudometa_package).splitlines()
ms_packages = [] # collect multi specs packages
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openSUSE-release-tools-20180817.c11f78e/metrics.py
new/openSUSE-release-tools-20180820.d7d5724/metrics.py
--- old/openSUSE-release-tools-20180817.c11f78e/metrics.py 2018-08-17
18:20:13.000000000 +0200
+++ new/openSUSE-release-tools-20180820.d7d5724/metrics.py 2018-08-21
04:03:44.000000000 +0200
@@ -19,6 +19,7 @@
import osclib.conf
from osclib.cache import Cache
from osclib.conf import Config
+from osclib.core import project_pseudometa_package
from osclib.stagingapi import StagingAPI
SOURCE_DIR = os.path.dirname(os.path.realpath(__file__))
@@ -354,9 +355,10 @@
if not hasattr(revision_index, 'index'):
revision_index.index = {}
+ project, package = project_pseudometa_package(api.apiurl, api.project)
try:
root = ET.fromstringlist(
- get_commitlog(api.apiurl, api.cstaging, 'dashboard', None,
format='xml'))
+ get_commitlog(api.apiurl, project, package, None,
format='xml'))
except HTTPError as e:
return revision_index.index
@@ -380,7 +382,7 @@
if not revision:
return revision
- content = api.dashboard_content_load(filename, revision)
+ content = api.pseudometa_file_load(filename, revision)
if filename in ('ignored_requests'):
if content:
return yaml.safe_load(content)
@@ -530,6 +532,7 @@
client = InfluxDBClient(args.host, args.port, args.user, args.password,
args.project)
osc.conf.get_config(override_apiurl=args.apiurl)
+ apiurl = osc.conf.config['apiurl']
osc.conf.config['debug'] = args.debug
# Ensure database exists.
@@ -540,16 +543,16 @@
return
# Use separate cache since it is persistent.
+ _, package = project_pseudometa_package(apiurl, args.project)
Cache.CACHE_DIR = Cache.CACHE_DIR + '-metrics'
if args.wipe_cache:
Cache.delete_all()
if args.heavy_cache:
Cache.PATTERNS['/search/request'] = sys.maxint
- Cache.PATTERNS['/source/[^/]+/dashboard/_history'] = sys.maxint
- Cache.PATTERNS['/source/[^/]+/dashboard/[^/]+\?rev=.*'] = sys.maxint
+ Cache.PATTERNS['/source/[^/]+/{}/_history'.format(package)] =
sys.maxint
+ Cache.PATTERNS['/source/[^/]+/{}/[^/]+\?rev=.*'.format(package)] =
sys.maxint
Cache.init()
- apiurl = osc.conf.config['apiurl']
Config(apiurl, args.project)
api = StagingAPI(apiurl, args.project)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openSUSE-release-tools-20180817.c11f78e/obs_clone.py
new/openSUSE-release-tools-20180820.d7d5724/obs_clone.py
--- old/openSUSE-release-tools-20180817.c11f78e/obs_clone.py 2018-08-17
18:20:13.000000000 +0200
+++ new/openSUSE-release-tools-20180820.d7d5724/obs_clone.py 2018-08-21
04:03:44.000000000 +0200
@@ -9,6 +9,7 @@
from osc.core import http_PUT
from osc.core import makeurl
from osc.core import show_upstream_rev
+from osclib.core import project_pseudometa_package
from urllib2 import HTTPError
import argparse
import osc.conf
@@ -174,7 +175,8 @@
entity_clone(apiurl_source, apiurl_target, ['source', project +
':Rings:1-MinimalX', '_meta'],
clone=project_clone)
- entity_clone(apiurl_source, apiurl_target, ['source', project +
':Staging', 'dashboard', '_meta'],
+ pseudometa_project, pseudometa_package =
project_pseudometa_package(apiurl_source, project)
+ entity_clone(apiurl_source, apiurl_target, ['source',
pseudometa_project, pseudometa_package, '_meta'],
clone=package_clone, after=package_clone_after)
entity_clone(apiurl_source, apiurl_target, ['source', project,
'drush', '_meta'],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180817.c11f78e/osc-staging.py
new/openSUSE-release-tools-20180820.d7d5724/osc-staging.py
--- old/openSUSE-release-tools-20180817.c11f78e/osc-staging.py 2018-08-17
18:20:13.000000000 +0200
+++ new/openSUSE-release-tools-20180820.d7d5724/osc-staging.py 2018-08-21
04:03:44.000000000 +0200
@@ -137,7 +137,7 @@
@cmdln.option('--try-strategies', action='store_true', default=False,
help='apply strategies and keep any with desireable outcome')
@cmdln.option('--strategy', help='apply a specific strategy')
@cmdln.option('--no-color', action='store_true', help='strip colors from
output (or add staging.color = 0 to the .oscrc general section')
[email protected]('--save', action='store_true', help='save the result to the
dashboard container')
[email protected]('--save', action='store_true', help='save the result to the
pseudometa package')
@cmdln.option('--append', action='store_true', help='append to existing value')
@cmdln.option('--clear', action='store_true', help='clear value')
def do_staging(self, subcmd, opts, *args):
@@ -167,9 +167,9 @@
"config" will modify or view staging specific configuration
- Target project level configuration that applies to all stagings can be
- found in the $PROJECT:Staging/dashboard container in file "config".
Both
- configuration locations follow the .oscrc format (space separated
list).
+ Target project OSRT:Config attribute configuration applies to all
+ stagings. Both configuration locations follow the .oscrc format (space
+ separated list).
config
Print all staging configuration.
@@ -477,7 +477,7 @@
# Is it safe to accept? Meaning: /totest contains what it should
and is not dirty
version_totest = api.get_binary_version(api.project,
"openSUSE-release.rpm", repository="totest", arch="x86_64")
if version_totest:
- version_openqa = api.dashboard_content_load('version_totest')
+ version_openqa = api.pseudometa_file_load('version_totest')
totest_dirty = api.is_repo_dirty(api.project, 'totest')
print("version_openqa: %s / version_totest: %s / totest_dirty:
%s\n" % (version_openqa, version_totest, totest_dirty))
else:
@@ -491,7 +491,7 @@
version_openqa = version_totest
totest_dirty = False
else:
- version_openqa = api.dashboard_content_load('version_totest')
+ version_openqa = api.pseudometa_file_load('version_totest')
totest_dirty = api.is_repo_dirty(api.project, 'totest')
if version_openqa == version_totest and not totest_dirty:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180817.c11f78e/osclib/accept_command.py
new/openSUSE-release-tools-20180820.d7d5724/osclib/accept_command.py
--- old/openSUSE-release-tools-20180817.c11f78e/osclib/accept_command.py
2018-08-17 18:20:13.000000000 +0200
+++ new/openSUSE-release-tools-20180820.d7d5724/osclib/accept_command.py
2018-08-21 04:03:44.000000000 +0200
@@ -13,6 +13,8 @@
from osc.core import http_GET, http_PUT, http_DELETE, http_POST
from osc.core import delete_package, search, set_devel_project
from osclib.config_command import ConfigCommand
+from osclib.core import source_file_load
+from osclib.core import source_file_save
from datetime import date
@@ -73,7 +75,7 @@
return rqs
def reset_rebuild_data(self, project):
- data = self.api.dashboard_content_load('support_pkg_rebuild')
+ data = self.api.pseudometa_file_load('support_pkg_rebuild')
if data is None:
return
@@ -87,7 +89,7 @@
# supportpkg list
content = ET.tostring(root)
if content != data:
- self.api.dashboard_content_save('support_pkg_rebuild', content,
'accept command update')
+ self.api.pseudometa_file_save('support_pkg_rebuild', content,
'accept command update')
def virtually_accept_delete(self, request_id, package):
self.api.add_review(request_id, by_group=self.api.cdelreq_review,
msg='Request accepted. Cleanup in progress - DO NOT REVOKE!')
@@ -171,10 +173,10 @@
# intend to break the kiwi file
arch = package.split('-')[-1]
fakepkgname = 'I-am-breaks-kiwi-build'
- oldkiwifile = self.api.load_file_content(project, package,
'PRODUCT-'+arch+'.kiwi')
+ oldkiwifile = source_file_load(self.api.apiurl, project,
package, 'PRODUCT-'+arch+'.kiwi')
if oldkiwifile is not None:
newkiwifile = re.sub(r'<repopackage
name="openSUSE-release"/>', '<repopackage name="%s"/>' % fakepkgname,
oldkiwifile)
- self.api.save_file_content(project, package,
'PRODUCT-' + arch + '.kiwi', newkiwifile)
+ source_file_save(self.api.apiurl, project, package,
'PRODUCT-' + arch + '.kiwi', newkiwifile)
# do wipe binary now
query = { 'cmd': 'wipe' }
@@ -250,7 +252,7 @@
if len(filelist) > 1:
# There is more than one .spec file in the package; link package
containers as needed
- origmeta = self.api.load_file_content(project, pkgname, '_meta')
+ origmeta = source_file_load(self.api.apiurl, project, pkgname,
'_meta')
for specfile in filelist:
package = specfile[:-5] # stripping .spec off the filename
gives the packagename
if package == pkgname:
@@ -272,9 +274,9 @@
newmeta = re.sub(r'</package>',
r'<bcntsynctag>{}</bcntsynctag></package>'.format(pkgname),
newmeta)
- self.api.save_file_content(project, package, '_meta',
newmeta)
+ source_file_save(self.api.apiurl, project, package,
'_meta', newmeta)
link = "<link package=\"{}\" cicount=\"copy\"
/>".format(pkgname)
- self.api.save_file_content(project, package, '_link', link)
+ source_file_save(self.api.apiurl, project, package,
'_link', link)
return True
def update_factory_version(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180817.c11f78e/osclib/check_duplicate_binaries_command.py
new/openSUSE-release-tools-20180820.d7d5724/osclib/check_duplicate_binaries_command.py
---
old/openSUSE-release-tools-20180817.c11f78e/osclib/check_duplicate_binaries_command.py
2018-08-17 18:20:13.000000000 +0200
+++
new/openSUSE-release-tools-20180820.d7d5724/osclib/check_duplicate_binaries_command.py
2018-08-21 04:03:44.000000000 +0200
@@ -37,10 +37,6 @@
current = yaml.dump(duplicates, default_flow_style=False)
if save:
- args = ['{}:Staging'.format(self.api.project), 'dashboard',
'duplicate_binaries']
- previous = self.api.load_file_content(*args)
- if current != previous:
- args.append(current)
- self.api.save_file_content(*args)
+ self.api.pseudometa_file_ensure('duplicate_binaries', current)
else:
print(current)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180817.c11f78e/osclib/conf.py
new/openSUSE-release-tools-20180820.d7d5724/osclib/conf.py
--- old/openSUSE-release-tools-20180817.c11f78e/osclib/conf.py 2018-08-17
18:20:13.000000000 +0200
+++ new/openSUSE-release-tools-20180820.d7d5724/osclib/conf.py 2018-08-21
04:03:44.000000000 +0200
@@ -24,7 +24,6 @@
import re
from osc import conf
-from osclib.core import attribute_value_load
from osclib.memoize import memoize
@@ -51,6 +50,7 @@
'lock-ns': 'openSUSE',
'delreq-review': 'factory-maintainers',
'main-repo': 'standard',
+ 'pseudometa_package': 'openSUSE:%(project)s:Staging/dashboard',
'download-baseurl': 'http://download.opensuse.org/tumbleweed/',
# check_source.py
'check-source-single-action-require': 'True',
@@ -80,6 +80,7 @@
'leaper-override-group': 'leap-reviewers',
'delreq-review': None,
'main-repo': 'standard',
+ 'pseudometa_package': 'openSUSE:%(project)s:Staging/dashboard',
'download-baseurl':
'http://download.opensuse.org/distribution/leap/%(version)s/',
'download-baseurl-update':
'http://download.opensuse.org/update/leap/%(version)s/',
'check-source-add-review-team': 'False',
@@ -246,6 +247,7 @@
return defaults
def fetch_remote(self, apiurl):
+ from osclib.core import attribute_value_load
config = attribute_value_load(apiurl, self.project, 'Config')
if config:
cp = ConfigParser()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180817.c11f78e/osclib/core.py
new/openSUSE-release-tools-20180820.d7d5724/osclib/core.py
--- old/openSUSE-release-tools-20180817.c11f78e/osclib/core.py 2018-08-17
18:20:13.000000000 +0200
+++ new/openSUSE-release-tools-20180820.d7d5724/osclib/core.py 2018-08-21
04:03:44.000000000 +0200
@@ -2,6 +2,7 @@
from datetime import datetime
from dateutil.parser import parse as date_parse
import re
+import socket
from xml.etree import cElementTree as ET
from lxml import etree as ETL
@@ -15,11 +16,13 @@
from osc.core import get_dependson
from osc.core import http_GET
from osc.core import http_POST
+from osc.core import http_PUT
from osc.core import makeurl
from osc.core import owner
from osc.core import Request
from osc.core import show_package_meta
from osc.core import show_project_meta
+from osclib.conf import Config
from osclib.memoize import memoize
BINARY_REGEX =
r'(?:.*::)?(?P<filename>(?P<name>.*)-(?P<version>[^-]+)-(?P<release>[^-]+)\.(?P<arch>[^-\.]+))'
@@ -268,6 +271,35 @@
except HTTPError:
return None
+def source_file_save(apiurl, project, package, filename, content,
comment=None):
+ if not comment:
+ comment = 'update by OSRT tools'
+ comment += ' (host {})'.format(socket.gethostname())
+
+ url = makeurl(apiurl, ['source', project, package, filename], {'comment':
comment})
+ http_PUT(url, data=content)
+
+def project_pseudometa_package(apiurl, project):
+ package = Config.get(apiurl, project).get('pseudometa_package', '00Meta')
+ if '/' in package:
+ project, package = package.split('/', 2)
+
+ return project, package
+
+def project_pseudometa_file_load(apiurl, project, filename, revision=None):
+ project, package = project_pseudometa_package(apiurl, project)
+ return source_file_load(apiurl, project, package, filename, revision)
+
+def project_pseudometa_file_save(apiurl, project, filename, content,
comment=None):
+ project, package = project_pseudometa_package(apiurl, project)
+ source_file_save(apiurl, project, package, filename, content, comment)
+
+def project_pseudometa_file_ensure(apiurl, project, filename, content,
comment=None):
+ project_pseudometa, package = project_pseudometa_package(apiurl, project)
+
+ if content != project_pseudometa_file_load(apiurl, project_pseudometa,
filename):
+ project_pseudometa_file_save(apiurl, project, filename, content,
comment)
+
# Should be an API call that says give me "real" packages that does not include
# multibuild entries nor linked packages.
def package_list_without_links(apiurl, project):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180817.c11f78e/osclib/freeze_command.py
new/openSUSE-release-tools-20180820.d7d5724/osclib/freeze_command.py
--- old/openSUSE-release-tools-20180817.c11f78e/osclib/freeze_command.py
2018-08-17 18:20:13.000000000 +0200
+++ new/openSUSE-release-tools-20180820.d7d5724/osclib/freeze_command.py
2018-08-21 04:03:44.000000000 +0200
@@ -15,6 +15,8 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
from osclib.config_command import ConfigCommand
+from osclib.core import source_file_load
+from osclib.core import source_file_save
import time
import re
from xml.etree import cElementTree as ET
@@ -170,12 +172,12 @@
if not self.api.item_exists(project, product):
return None
- kiwifile = self.api.load_file_content(project, product,
'PRODUCT-'+arch+'.kiwi')
+ kiwifile = source_file_load(self.api.apiurl, project, product,
'PRODUCT-'+arch+'.kiwi')
tmpkiwifile = re.sub(r'<productinfo name="VERSION">.*</productinfo>',
'<productinfo name="VERSION">%s</productinfo>' % version, kiwifile)
newkiwifile = re.sub(r'<productvar name="VERSION">.*</productvar>',
'<productvar name="VERSION">%s</productvar>' % version, tmpkiwifile)
- self.api.save_file_content(project, product, 'PRODUCT-' + arch +
'.kiwi', newkiwifile)
+ source_file_save(self.api.apiurl, project, product, 'PRODUCT-' + arch
+ '.kiwi', newkiwifile)
def prj_meta_for_bootstrap_copy(self, prj):
root = ET.Element('project', {'name': prj})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180817.c11f78e/osclib/stagingapi.py
new/openSUSE-release-tools-20180820.d7d5724/osclib/stagingapi.py
--- old/openSUSE-release-tools-20180817.c11f78e/osclib/stagingapi.py
2018-08-17 18:20:13.000000000 +0200
+++ new/openSUSE-release-tools-20180820.d7d5724/osclib/stagingapi.py
2018-08-21 04:03:44.000000000 +0200
@@ -57,6 +57,9 @@
from osclib.cache import Cache
from osclib.core import devel_project_get
from osclib.core import project_list_prefix
+from osclib.core import project_pseudometa_file_load
+from osclib.core import project_pseudometa_file_save
+from osclib.core import project_pseudometa_file_ensure
from osclib.core import source_file_load
from osclib.comments import CommentAPI
from osclib.ignore_command import IgnoreCommand
@@ -626,14 +629,14 @@
@memoize(session=True)
def get_ignored_requests(self):
- ignore = self.dashboard_content_load('ignored_requests')
+ ignore = self.pseudometa_file_load('ignored_requests')
if ignore is None or not ignore:
return {}
return yaml.safe_load(ignore)
def set_ignored_requests(self, ignore_requests):
ignore = yaml.dump(ignore_requests, default_flow_style=False)
- self.dashboard_content_ensure('ignored_requests', ignore)
+ self.pseudometa_file_ensure('ignored_requests', ignore)
@memoize(session=True, add_invalidate=True)
def get_open_requests(self, query_extra=None):
@@ -1241,8 +1244,8 @@
# If adi project, check for baselibs.conf in all specs to catch both
# dynamically generated and static baselibs.conf.
baselibs = False if self.is_adi_project(project) else None
- if baselibs is False and 'baselibs.conf' in str(self.load_file_content(
- src_prj, src_pkg, '{}.spec'.format(src_pkg), src_rev)):
+ if baselibs is False and 'baselibs.conf' in str(source_file_load(
+ self.apiurl, src_prj, src_pkg, '{}.spec'.format(src_pkg),
src_rev)):
baselibs = True
for sub_prj, sub_pkg in self.get_sub_packages(tar_pkg, project):
@@ -1258,8 +1261,8 @@
url = self.makeurl(['source', sub_prj, sub_pkg, '_link'])
http_PUT(url, data=ET.tostring(root))
- if baselibs is False and 'baselibs.conf' in
str(self.load_file_content(
- src_prj, src_pkg, '{}.spec'.format(sub_pkg), src_rev)):
+ if baselibs is False and 'baselibs.conf' in str(source_file_load(
+ self.apiurl, src_prj, src_pkg, '{}.spec'.format(sub_pkg),
src_rev)):
baselibs = True
if baselibs:
@@ -1464,7 +1467,7 @@
version = None
- specfile = self.load_file_content(project, package,
'{}.spec'.format(package))
+ specfile = source_file_load(self.apiurl, project, package,
'{}.spec'.format(package))
if specfile:
try:
version = re.findall('^Version:(.*)', specfile,
re.MULTILINE)[0].strip()
@@ -1484,36 +1487,14 @@
return None
raise
- def load_file_content(self, project, package, filename, revision=None):
- """
- Load the content of a file and return the content as data. If the
package is a link, it will be expanded
- :param project: The project to query
- :param package: The package to quert
- :param filename: The filename to query
- :param revision: The revision to query
- """
- return source_file_load(self.apiurl, project, package, filename,
revision)
-
- def save_file_content(self, project, package, filename, content,
comment='script updated'):
- """
- Save content to a project/package/file
- :param project: The project containing the package
- :param package: the package to update
- :param filename: the filename to save the data to
- :param content: the content to write to the file
- """
- url = self.makeurl(['source', project, package, filename], {'comment':
comment})
- http_PUT(url, data=content)
-
- def dashboard_content_load(self, filename, revision=None):
- return self.load_file_content(self.cstaging, 'dashboard', filename,
revision)
+ def pseudometa_file_load(self, filename, revision=None):
+ return project_pseudometa_file_load(self.apiurl, self.project,
filename, revision)
- def dashboard_content_save(self, filename, content, comment='script
updated'):
- return self.save_file_content(self.cstaging, 'dashboard', filename,
content, comment)
+ def pseudometa_file_save(self, filename, content, comment=None):
+ project_pseudometa_file_save(self.apiurl, self.project, filename,
content, comment)
- def dashboard_content_ensure(self, filename, content, comment='script
updated'):
- if content != self.dashboard_content_load(filename):
- self.dashboard_content_save(filename, content, comment)
+ def pseudometa_file_ensure(self, filename, content, comment=None):
+ project_pseudometa_file_ensure(self.apiurl, self.project, filename,
content, comment)
def attribute_value_load(self, name):
return attribute_value_load(self.apiurl, self.project, name)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180817.c11f78e/repo_checker.py
new/openSUSE-release-tools-20180820.d7d5724/repo_checker.py
--- old/openSUSE-release-tools-20180817.c11f78e/repo_checker.py 2018-08-17
18:20:13.000000000 +0200
+++ new/openSUSE-release-tools-20180820.d7d5724/repo_checker.py 2018-08-21
04:03:44.000000000 +0200
@@ -23,6 +23,7 @@
from osclib.core import devel_project_fallback
from osclib.core import fileinfo_ext_all
from osclib.core import package_binary_list
+from osclib.core import project_pseudometa_package
from osclib.core import request_staged
from osclib.core import target_archs
from osclib.cycle import CycleDetector
@@ -64,9 +65,9 @@
build = ET.fromstringlist(show_results_meta(
self.apiurl, project, multibuild=True,
repository=['standard'])).get('state')
- dashboard_content = api.dashboard_content_load('repo_checker')
- if not self.force and dashboard_content:
- build_previous = dashboard_content.splitlines()[0]
+ pseudometa_content = api.pseudometa_file_load('repo_checker')
+ if not self.force and pseudometa_content:
+ build_previous = pseudometa_content.splitlines()[0]
if build == build_previous:
self.logger.info('{} build unchanged'.format(project))
return
@@ -91,7 +92,7 @@
text = '\n'.join(comment).strip()
if not self.dryrun:
- api.dashboard_content_ensure('repo_checker', text + '\n',
'project_only run')
+ api.pseudometa_file_ensure('repo_checker', text + '\n',
'project_only run')
else:
print(text)
@@ -349,7 +350,7 @@
binaries = set()
api = self.staging_api(project)
- content = api.dashboard_content_load('repo_checker')
+ content = api.pseudometa_file_load('repo_checker')
if not content:
self.logger.warn('no project_only run from which to extract
existing problems')
return binaries
@@ -414,7 +415,9 @@
if stderr:
parts.append('<pre>\n' + stderr + '\n' + '</pre>\n')
- header = '### [install check & file
conflicts](/package/view_file/{}:Staging/dashboard/repo_checker)\n\n'.format(project)
+ pseudometa_project, pseudometa_package =
project_pseudometa_package(self.apiurl, project)
+ path = ['package', 'view_file', pseudometa_project,
pseudometa_package, 'repo_checker']
+ header = '### [install check & file
conflicts](/{})\n\n'.format('/'.join(path))
return CheckResult(False, header + ('\n' + ('-' * 80) +
'\n\n').join(parts))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180817.c11f78e/suppkg_rebuild.py
new/openSUSE-release-tools-20180820.d7d5724/suppkg_rebuild.py
--- old/openSUSE-release-tools-20180817.c11f78e/suppkg_rebuild.py
2018-08-17 18:20:13.000000000 +0200
+++ new/openSUSE-release-tools-20180820.d7d5724/suppkg_rebuild.py
2018-08-21 04:03:44.000000000 +0200
@@ -112,7 +112,7 @@
def crawl(self):
"""Main method"""
- rebuild_data = self.api.dashboard_content_load('support_pkg_rebuild')
+ rebuild_data = self.api.pseudometa_file_load('support_pkg_rebuild')
if rebuild_data is None:
print "There is no support_pkg_rebuild file!"
return
@@ -173,7 +173,7 @@
rebuild_data_updated = ET.tostring(root)
logging.debug(rebuild_data_updated)
if rebuild_data_updated != rebuild_data:
- self.api.dashboard_content_save(
+ self.api.pseudometa_file_save(
'support_pkg_rebuild', rebuild_data_updated, 'support package
rebuild')
def main(args):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180817.c11f78e/systemd/osrt-staging-bot-devel-list.service
new/openSUSE-release-tools-20180820.d7d5724/systemd/osrt-staging-bot-devel-list.service
---
old/openSUSE-release-tools-20180817.c11f78e/systemd/osrt-staging-bot-devel-list.service
2018-08-17 18:20:13.000000000 +0200
+++
new/openSUSE-release-tools-20180820.d7d5724/systemd/osrt-staging-bot-devel-list.service
2018-08-21 04:03:44.000000000 +0200
@@ -1,5 +1,5 @@
[Unit]
-Description=openSUSE Release Tools: staging-bot devel list (stored in
dashboard)
+Description=openSUSE Release Tools: staging-bot devel list (stored in
pseudometa package)
[Service]
User=osrt-staging-bot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180817.c11f78e/systemd/osrt-staging-bot-devel-list.timer
new/openSUSE-release-tools-20180820.d7d5724/systemd/osrt-staging-bot-devel-list.timer
---
old/openSUSE-release-tools-20180817.c11f78e/systemd/osrt-staging-bot-devel-list.timer
2018-08-17 18:20:13.000000000 +0200
+++
new/openSUSE-release-tools-20180820.d7d5724/systemd/osrt-staging-bot-devel-list.timer
2018-08-21 04:03:44.000000000 +0200
@@ -1,5 +1,5 @@
[Unit]
-Description=openSUSE Release Tools: staging-bot devel list (stored in
dashboard)
+Description=openSUSE Release Tools: staging-bot devel list (stored in
pseudometa package)
[Timer]
OnBootSec=120
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20180817.c11f78e/totest-manager.py
new/openSUSE-release-tools-20180820.d7d5724/totest-manager.py
--- old/openSUSE-release-tools-20180817.c11f78e/totest-manager.py
2018-08-17 18:20:13.000000000 +0200
+++ new/openSUSE-release-tools-20180820.d7d5724/totest-manager.py
2018-08-21 04:03:44.000000000 +0200
@@ -154,7 +154,7 @@
raise NotFoundException("can't find %s version" % self.project)
def current_qa_version(self):
- return self.api.dashboard_content_load('version_totest')
+ return self.api.pseudometa_file_load('version_totest')
def find_openqa_results(self, snapshot):
"""Return the openqa jobs of a given snapshot and filter out the
@@ -614,7 +614,7 @@
def write_version_to_dashboard(self, target, version):
if not (self.dryrun or self.norelease):
- self.api.dashboard_content_ensure('version_%s' % target, version,
comment='Update version')
+ self.api.pseudometa_file_ensure('version_%s' % target, version,
comment='Update version')
class ToTestBaseNew(ToTestBase):
@@ -896,7 +896,7 @@
return 'openSUSE Leap 15.0 Images'
def current_qa_version(self):
- return self.api.dashboard_content_load('version_totest_images')
+ return self.api.pseudometa_file_load('version_totest_images')
def write_version_to_dashboard(self, target, version):
super(ToTest150Images,
self).write_version_to_dashboard('{}_images'.format(target), version)
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.6NFUSr/_old 2018-08-22 14:20:05.862315397 +0200
+++ /var/tmp/diff_new_pack.6NFUSr/_new 2018-08-22 14:20:05.862315397 +0200
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20180817.c11f78e
-mtime: 1534522813
-commit: c11f78eb83656c583cdba86c0c7537e8a46919f8
+version: 20180820.d7d5724
+mtime: 1534817024
+commit: d7d5724daefff290bbef79f37481a40ff6a1d57d
