Hello community,
here is the log from the commit of package openSUSE-release-tools for
openSUSE:Factory checked in at 2018-11-27 10:45:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.19453 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools"
Tue Nov 27 10:45:15 2018 rev:150 rq:652071 version:20181127.edba5dc
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes
2018-11-22 13:26:28.725940245 +0100
+++
/work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.19453/openSUSE-release-tools.changes
2018-11-27 10:46:39.227935174 +0100
@@ -1,0 +2,57 @@
+Tue Nov 27 05:34:07 UTC 2018 - [email protected]
+
+- Update to version 20181127.edba5dc:
+ * Revert extracted kiwi again
+
+-------------------------------------------------------------------
+Mon Nov 26 22:34:31 UTC 2018 - [email protected]
+
+- Update to version 20181126.590fd22:
+ * dist/k8s/app.yaml: disable check-source and repo-checker components.
+ * dist/kubernetes: utilize new image home in openSUSE:Tools:Images.
+ * dist/package: include worker kiwi to allow extraction via _service.
+ * dist/kiwi/worker: include obs-operator subpackage.
+ * obs_operator: use unbuffered output to work properly in systemd.
+ * dist/kubernetes: provide OBS Operator component.
+
+-------------------------------------------------------------------
+Mon Nov 26 22:11:03 UTC 2018 - Jimmy Berry <[email protected]>
+
+- Extract osrt-worker-obs.kiwi via _service and reference in spec.
+
+-------------------------------------------------------------------
+Mon Nov 26 11:13:57 UTC 2018 - [email protected]
+
+- Update to version 20181126.4331271:
+ * ttm: add minimal staging config for pseudometa package
+ * Add workaround for failing JeOS comparison on ARM
+
+-------------------------------------------------------------------
+Mon Nov 26 09:38:01 UTC 2018 - [email protected]
+
+- Update to version 20181126.f333b2d:
+ * Readability cleanups
+ * Follow flake8 import order
+ * Iterate over product arch list
+
+-------------------------------------------------------------------
+Sat Nov 24 08:41:01 UTC 2018 - [email protected]
+
+- Update to version 20181124.c1a7698:
+ * Adjust JeOS for 15.1 images
+
+-------------------------------------------------------------------
+Fri Nov 23 07:24:59 UTC 2018 - [email protected]
+
+- Update to version 20181123.b280e8a:
+ * fcc_submitter: update version to 15.1
+
+-------------------------------------------------------------------
+Thu Nov 22 11:17:41 UTC 2018 - [email protected]
+
+- Update to version 20181122.aaef149:
+ * leaper: just pass if only origin change left to decide
+ * leaper: fix comment about package not in Factory
+ * leaper: silence output of checking older dists
+
+-------------------------------------------------------------------
Old:
----
openSUSE-release-tools-20181121.5a43f6f.obscpio
New:
----
openSUSE-release-tools-20181127.edba5dc.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-release-tools.spec ++++++
--- /var/tmp/diff_new_pack.lEn8R0/_old 2018-11-27 10:46:39.943934439 +0100
+++ /var/tmp/diff_new_pack.lEn8R0/_new 2018-11-27 10:46:39.943934439 +0100
@@ -20,7 +20,7 @@
%define source_dir openSUSE-release-tools
%define announcer_filename factory-package-news
Name: openSUSE-release-tools
-Version: 20181121.5a43f6f
+Version: 20181127.edba5dc
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.lEn8R0/_old 2018-11-27 10:46:39.995934386 +0100
+++ /var/tmp/diff_new_pack.lEn8R0/_new 2018-11-27 10:46:39.995934386 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param>
- <param
name="changesrevision">97e0dec9fb5573406c60ec872474867cddc9dbea</param>
+ <param
name="changesrevision">0f53b9124300da244facc367ba9a0857b5546dec</param>
</service>
-</servicedata>
+</servicedata>
\ No newline at end of file
++++++ openSUSE-release-tools-20181121.5a43f6f.obscpio ->
openSUSE-release-tools-20181127.edba5dc.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20181121.5a43f6f/dist/kiwi/osrt-worker-obs.kiwi
new/openSUSE-release-tools-20181127.edba5dc/dist/kiwi/osrt-worker-obs.kiwi
--- old/openSUSE-release-tools-20181121.5a43f6f/dist/kiwi/osrt-worker-obs.kiwi
2018-11-21 12:25:25.000000000 +0100
+++ new/openSUSE-release-tools-20181127.edba5dc/dist/kiwi/osrt-worker-obs.kiwi
2018-11-27 06:32:44.000000000 +0100
@@ -21,6 +21,7 @@
<packages type="image">
<package name="openSUSE-release-tools-check-source"/>
<package name="openSUSE-release-tools-leaper"/>
+ <package name="openSUSE-release-tools-obs-operator"/>
<package name="openSUSE-release-tools-pkglistgen"/>
<package name="openSUSE-release-tools-repo-checker"/>
<package name="openSUSE-release-tools-staging-bot"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20181121.5a43f6f/dist/kubernetes/app.yaml
new/openSUSE-release-tools-20181127.edba5dc/dist/kubernetes/app.yaml
--- old/openSUSE-release-tools-20181121.5a43f6f/dist/kubernetes/app.yaml
2018-11-21 12:25:25.000000000 +0100
+++ new/openSUSE-release-tools-20181127.edba5dc/dist/kubernetes/app.yaml
2018-11-27 06:32:44.000000000 +0100
@@ -7,8 +7,9 @@
k8sVersion: v1.8.0
path: heroes
targets:
- - check-source
- - repo-checker
+ #- check-source
+ - obs-operator
+ #- repo-checker
kind: ksonnet.io/app
name: openSUSE-release-tools
version: 0.0.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20181121.5a43f6f/dist/kubernetes/components/obs-operator/params.libsonnet
new/openSUSE-release-tools-20181127.edba5dc/dist/kubernetes/components/obs-operator/params.libsonnet
---
old/openSUSE-release-tools-20181121.5a43f6f/dist/kubernetes/components/obs-operator/params.libsonnet
1970-01-01 01:00:00.000000000 +0100
+++
new/openSUSE-release-tools-20181127.edba5dc/dist/kubernetes/components/obs-operator/params.libsonnet
2018-11-27 06:32:44.000000000 +0100
@@ -0,0 +1,14 @@
+{
+ global: {
+ cpu: "100m",
+ memory: "128Mi",
+ image: null,
+ prefix: "obs-operator",
+ },
+ components: {
+ service: {
+ externalIPs: null,
+ externalPort: null,
+ },
+ },
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20181121.5a43f6f/dist/kubernetes/components/obs-operator/service.jsonnet
new/openSUSE-release-tools-20181127.edba5dc/dist/kubernetes/components/obs-operator/service.jsonnet
---
old/openSUSE-release-tools-20181121.5a43f6f/dist/kubernetes/components/obs-operator/service.jsonnet
1970-01-01 01:00:00.000000000 +0100
+++
new/openSUSE-release-tools-20181127.edba5dc/dist/kubernetes/components/obs-operator/service.jsonnet
2018-11-27 06:32:44.000000000 +0100
@@ -0,0 +1,13 @@
+local params = std.extVar("__ksonnet/params").components.service;
+local service = import '../service.libsonnet';
+
+[
+ service.parts.deployment.base(
+ params.prefix, "deployment",
+ params.cpu, params.memory, params.image,
+ "osrt-obs_operator --debug"),
+
+ service.parts.service.base(
+ params.prefix, "service", 8080, params.externalIPs, params.externalPort,
+ ),
+]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20181121.5a43f6f/dist/kubernetes/components/service.libsonnet
new/openSUSE-release-tools-20181127.edba5dc/dist/kubernetes/components/service.libsonnet
---
old/openSUSE-release-tools-20181121.5a43f6f/dist/kubernetes/components/service.libsonnet
1970-01-01 01:00:00.000000000 +0100
+++
new/openSUSE-release-tools-20181127.edba5dc/dist/kubernetes/components/service.libsonnet
2018-11-27 06:32:44.000000000 +0100
@@ -0,0 +1,84 @@
+{
+ parts:: {
+ deployment:: {
+ base(prefix, name, cpu, memory, image, command):: {
+ apiVersion: "apps/v1",
+ kind: "Deployment",
+ metadata: {
+ name: prefix + "-" + name,
+ labels: {
+ app: prefix,
+ },
+ },
+ spec: {
+ replicas: 1,
+ selector: {
+ matchLabels: {
+ app: prefix,
+ },
+ },
+ template: {
+ metadata: {
+ labels: {
+ app: prefix,
+ },
+ },
+ spec: {
+ containers: [{
+ name: "service",
+ image: image,
+ args: [
+ "/bin/bash", "-c",
+ "cp /secret/.oscrc /root && osc staging --version && " +
command
+ ],
+ volumeMounts: [
+ {
+ name: "oscrc",
+ mountPath: "/secret",
+ readOnly: true,
+ },
+ ],
+ resources: {
+ requests: {
+ cpu: cpu,
+ memory: memory,
+ }
+ }
+ }],
+ volumes: [
+ {
+ name: "oscrc",
+ secret: {
+ secretName: prefix + "-oscrc",
+ }
+ },
+ ],
+ }
+ }
+ }
+ }
+ },
+
+ service:: {
+ base(prefix, name, internalPort, externalIPs, externalPort):: {
+ apiVersion: "v1",
+ kind: "Service",
+ metadata: {
+ name: prefix + "-" + name,
+ },
+ spec: {
+ type: "NodePort",
+ selector: {
+ app: prefix,
+ },
+ ports: [{
+ protocol: "TCP",
+ port: internalPort,
+ nodePort: externalPort,
+ }],
+ externalIPs: externalIPs,
+ }
+ }
+ },
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20181121.5a43f6f/dist/kubernetes/environments/heroes/globals.libsonnet
new/openSUSE-release-tools-20181127.edba5dc/dist/kubernetes/environments/heroes/globals.libsonnet
---
old/openSUSE-release-tools-20181121.5a43f6f/dist/kubernetes/environments/heroes/globals.libsonnet
2018-11-21 12:25:25.000000000 +0100
+++
new/openSUSE-release-tools-20181127.edba5dc/dist/kubernetes/environments/heroes/globals.libsonnet
2018-11-27 06:32:44.000000000 +0100
@@ -1,4 +1,4 @@
-local image =
"registry.opensuse.org/home/jberry/container/container/osrt/worker-obs";
+local image =
"registry.opensuse.org/opensuse/tools/images/images/osrt/worker-obs";
local image_version = "latest";
local image_full = image + ':' + image_version;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20181121.5a43f6f/dist/kubernetes/environments/heroes/params.libsonnet
new/openSUSE-release-tools-20181127.edba5dc/dist/kubernetes/environments/heroes/params.libsonnet
---
old/openSUSE-release-tools-20181121.5a43f6f/dist/kubernetes/environments/heroes/params.libsonnet
2018-11-21 12:25:25.000000000 +0100
+++
new/openSUSE-release-tools-20181127.edba5dc/dist/kubernetes/environments/heroes/params.libsonnet
2018-11-27 06:32:44.000000000 +0100
@@ -2,6 +2,14 @@
local globals = import "globals.libsonnet";
local envParams = params + {
components+: {
+ "obs-operator.service"+: {
+ externalIPs: [
+ "192.168.47.44",
+ "192.168.47.45",
+ "192.168.47.46",
+ ],
+ externalPort: 31452,
+ },
"repo-checker.project_only"+: {
projects: [
"openSUSE:Factory",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20181121.5a43f6f/fcc_submitter.py
new/openSUSE-release-tools-20181127.edba5dc/fcc_submitter.py
--- old/openSUSE-release-tools-20181121.5a43f6f/fcc_submitter.py
2018-11-21 12:25:25.000000000 +0100
+++ new/openSUSE-release-tools-20181127.edba5dc/fcc_submitter.py
2018-11-27 06:32:44.000000000 +0100
@@ -22,8 +22,8 @@
from osc import oscerr
from osclib.memoize import memoize
-OPENSUSE = 'openSUSE:Leap:15.0'
-OPENSUSE_PREVERSION = 'openSUSE:Leap:42.3'
+OPENSUSE = 'openSUSE:Leap:15.1'
+OPENSUSE_PREVERSION = 'openSUSE:Leap:15.0'
FCC = '{}:Staging:FactoryCandidates'.format(OPENSUSE)
makeurl = osc.core.makeurl
@@ -133,7 +133,10 @@
self.apiurl = osc.conf.config['apiurl']
self.debug = osc.conf.config['debug']
self.sle_base_prjs = [
+ 'SUSE:SLE-15-SP1:GA',
'SUSE:SLE-15:GA',
+ 'SUSE:SLE-12-SP4:Update',
+ 'SUSE:SLE-12-SP4:GA',
'SUSE:SLE-12-SP3:Update',
'SUSE:SLE-12-SP3:GA',
'SUSE:SLE-12-SP2:Update',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openSUSE-release-tools-20181121.5a43f6f/leaper.py
new/openSUSE-release-tools-20181127.edba5dc/leaper.py
--- old/openSUSE-release-tools-20181121.5a43f6f/leaper.py 2018-11-21
12:25:25.000000000 +0100
+++ new/openSUSE-release-tools-20181127.edba5dc/leaper.py 2018-11-27
06:32:44.000000000 +0100
@@ -163,7 +163,7 @@
elif in_factory is None:
self.pending_factory_submission = True
else:
- if self.is_package_in_project(prj, package):
+ if not self.is_package_in_project(prj, package):
self.logger.info('the package is not in Factory, nor
submitted there')
else:
self.logger.info('different sources in
{}'.format(self.rdiff_link(src_project, src_package, src_rev, prj, package)))
@@ -189,11 +189,9 @@
for prj in other_projects_to_check:
if self.is_package_in_project(prj, package):
- self.logger.info('checking {}'.format(prj))
+ self.logger.debug('checking {}'.format(prj))
if self._check_factory(package, src_srcinfo, prj) is
True:
self.logger.info('found source match in
{}'.format(prj))
- else:
- self.logger.info('different sources in
{}'.format(self.rdiff_link(src_project, src_package, src_rev, prj, package)))
devel_project, devel_package = devel_project_get(self.apiurl,
'openSUSE.org:openSUSE:Factory', package)
if devel_project is not None:
@@ -218,6 +216,11 @@
else:
# only log origin state if it's taken into consideration
for the review result
self.logger.info("Submitted from a different origin than
expected ('%s')", origin)
+ self.needs_release_manager = True
+ # no result so far and also no factory submission to wait
+ # for. So just pass to avoid requring too much overrides
+ if not self.pending_factory_submission:
+ review_result = True
if not review_result and self.override_allow:
# Rather than decline, leave review open in-case of change and
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20181121.5a43f6f/obs_operator.py
new/openSUSE-release-tools-20181127.edba5dc/obs_operator.py
--- old/openSUSE-release-tools-20181121.5a43f6f/obs_operator.py 2018-11-21
12:25:25.000000000 +0100
+++ new/openSUSE-release-tools-20181127.edba5dc/obs_operator.py 2018-11-27
06:32:44.000000000 +0100
@@ -1,4 +1,6 @@
-#!/usr/bin/python3
+#!/usr/bin/python3 -u
+# Without the -u option for unbuffered output nothing shows up in journal or
+# kubernetes logs.
import argparse
from http.cookies import SimpleCookie
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20181121.5a43f6f/osclib/conf.py
new/openSUSE-release-tools-20181127.edba5dc/osclib/conf.py
--- old/openSUSE-release-tools-20181121.5a43f6f/osclib/conf.py 2018-11-21
12:25:25.000000000 +0100
+++ new/openSUSE-release-tools-20181127.edba5dc/osclib/conf.py 2018-11-27
06:32:44.000000000 +0100
@@ -11,7 +11,7 @@
from osclib.memoize import memoize
-# Sane defatuls for openSUSE and SUSE. The string interpolation rule
+# Sane defaults for openSUSE and SUSE. The string interpolation rule
# is as this:
#
# * %(project)s to replace the name of the project.
@@ -50,6 +50,16 @@
'mail-noreply': '[email protected]',
'mail-release-list': '[email protected]',
},
+ r'openSUSE:(?P<project>Factory):ARM$': {
+ 'product': 'openSUSE.product',
+ 'openqa': 'https://openqa.opensuse.org',
+ 'main-repo': 'standard',
+ 'pseudometa_package': 'openSUSE:%(project)s:ARM:Staging/dashboard',
+ 'download-baseurl':
'http://download.opensuse.org/ports/aarch64/tumbleweed/',
+ 'mail-list': '[email protected]',
+ 'mail-maintainer': 'Dirk Mueller <[email protected]>',
+ 'mail-noreply': '[email protected]',
+ },
r'openSUSE:(?P<project>Leap:(?P<version>[\d.]+))(?::NonFree)?$': {
'staging': 'openSUSE:%(project)s:Staging',
'staging-group': 'factory-staging',
@@ -99,6 +109,16 @@
'mail-noreply': '[email protected]',
'mail-release-list': '[email protected]',
},
+ r'openSUSE:(?P<project>Leap:(?P<version>[\d.]+)):ARM$': {
+ 'product': 'openSUSE.product',
+ 'openqa': 'https://openqa.opensuse.org',
+ 'main-repo': 'ports',
+ 'pseudometa_package': 'openSUSE:%(project)s:ARM:Staging/dashboard',
+ 'download-baseurl':
'http://download.opensuse.org/ports/aarch64/distribution/leap/%(version)s/',
+ 'mail-list': '[email protected]',
+ 'mail-maintainer': 'Dirk Mueller <[email protected]>',
+ 'mail-noreply': '[email protected]',
+ },
r'openSUSE:(?P<project>Leap:(?P<version>[\d.]+)(?::NonFree)?:Update)$': {
'main-repo': 'standard',
'leaper-override-group': 'leap-reviewers',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20181121.5a43f6f/osclib/core.py
new/openSUSE-release-tools-20181127.edba5dc/osclib/core.py
--- old/openSUSE-release-tools-20181121.5a43f6f/osclib/core.py 2018-11-21
12:25:25.000000000 +0100
+++ new/openSUSE-release-tools-20181127.edba5dc/osclib/core.py 2018-11-27
06:32:44.000000000 +0100
@@ -278,7 +278,10 @@
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)
+ source_file = source_file_load(apiurl, project, package, filename,
revision)
+ if source_file is not None:
+ source_file = source_file.rstrip()
+ return source_file
def project_pseudometa_file_save(apiurl, project, filename, content,
comment=None):
project, package = project_pseudometa_package(apiurl, project)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20181121.5a43f6f/tests/config_tests.py
new/openSUSE-release-tools-20181127.edba5dc/tests/config_tests.py
--- old/openSUSE-release-tools-20181121.5a43f6f/tests/config_tests.py
2018-11-21 12:25:25.000000000 +0100
+++ new/openSUSE-release-tools-20181127.edba5dc/tests/config_tests.py
2018-11-27 06:32:44.000000000 +0100
@@ -49,8 +49,10 @@
# A list of projects that should match each of the DEFAULT patterns.
projects = (
'openSUSE:Factory',
- 'openSUSE:Leap:15.0',
- 'openSUSE:Leap:15.0:Update',
+ 'openSUSE:Factory:ARM',
+ 'openSUSE:Leap:15.1',
+ 'openSUSE:Leap:15.1:ARM',
+ 'openSUSE:Leap:15.1:Update',
'openSUSE:Backports:SLE-15',
'openSUSE:Backports:SLE-15:Update',
'SUSE:SLE-15:GA',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-release-tools-20181121.5a43f6f/totest-manager.py
new/openSUSE-release-tools-20181127.edba5dc/totest-manager.py
--- old/openSUSE-release-tools-20181121.5a43f6f/totest-manager.py
2018-11-21 12:25:25.000000000 +0100
+++ new/openSUSE-release-tools-20181127.edba5dc/totest-manager.py
2018-11-27 06:32:44.000000000 +0100
@@ -11,33 +11,35 @@
from __future__ import print_function
-import cmdln
import datetime
import json
+import logging
import os
import re
-import sys
-
-try:
- from urllib.error import HTTPError
-except ImportError:
- # python 2.x
- from urllib2 import HTTPError
-
-import logging
import signal
+import sys
import time
-import yaml
-import pika
-
from xml.etree import cElementTree as ET
+
+import cmdln
+
from openqa_client.client import OpenQA_Client
import osc
+from osc.core import makeurl
from osclib.conf import Config
from osclib.stagingapi import StagingAPI
-from osc.core import makeurl
+
+import pika
+
+import yaml
+
+try:
+ from urllib.error import HTTPError
+except ImportError:
+ # python 2.x
+ from urllib2 import HTTPError
logger = logging.getLogger()
@@ -422,17 +424,16 @@
url = self.api.makeurl(['build', project, '_result'], query)
f = self.api.retried_GET(url)
root = ET.parse(f).getroot()
- succeeded = root.findall('result/status[@code="succeeded"]')
# [@code!='succeeded'] is not supported by ET
failed = [status for status in root.findall("result/status") if
status.get('code') != 'succeeded']
- if len(failed) > 0:
+ if any(failed):
logger.info(
'%s %s %s %s -> %s' % (project, package, repository, arch,
failed[0].get('code')))
return False
- if len(succeeded) == 0:
- logger.info('No results for %s %s %s %s' % (project, package,
repository, arch))
+ if not len(root.findall('result/status[@code="succeeded"]')):
+ logger.info('No "succeeded" for %s %s %s %s' % (project, package,
repository, arch))
return False
maxsize = self.maxsize_for_package(package)
@@ -740,7 +741,7 @@
for p in self.livecd_products + self.image_products:
for arch in p.archs:
builds.add(self.iso_build_version(self.project, p.package,
- arch=p.arch))
+ arch=arch))
ret = (len(builds) == 1)
if ret is False:
@@ -837,6 +838,9 @@
livecd_products = [ImageProduct('JeOS', ['armv7l'])]
+ # JeOS doesn't follow build numbers of main isos
+ need_same_build_number = False
+
def __init__(self, *args, **kwargs):
ToTestFactory.__init__(self, *args, **kwargs)
@@ -984,6 +988,18 @@
return 13
class ToTest151Images(ToTest150Images):
+ image_products = [
+ ImageProduct('livecd-leap-gnome', ['x86_64']),
+ ImageProduct('livecd-leap-kde', ['x86_64']),
+ ImageProduct('livecd-leap-x11', ['x86_64']),
+ ImageProduct('opensuse-leap-image:lxc', ['x86_64']),
+ ImageProduct('openSUSE-Leap-15.1-JeOS:MS-HyperV', ['x86_64']),
+ ImageProduct('openSUSE-Leap-15.1-JeOS:OpenStack-Cloud', ['x86_64']),
+ ImageProduct('openSUSE-Leap-15.1-JeOS:VMware', ['x86_64']),
+ ImageProduct('openSUSE-Leap-15.1-JeOS:XEN', ['x86_64']),
+ ImageProduct('openSUSE-Leap-15.1-JeOS:kvm-and-xen', ['x86_64']),
+ ]
+
container_products = [ImageProduct('opensuse-leap-image:docker',
['x86_64'])]
def openqa_group(self):
++++++ openSUSE-release-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.lEn8R0/_old 2018-11-27 10:46:40.699933662 +0100
+++ /var/tmp/diff_new_pack.lEn8R0/_new 2018-11-27 10:46:40.703933658 +0100
@@ -1,5 +1,5 @@
name: openSUSE-release-tools
-version: 20181121.5a43f6f
-mtime: 1542799525
-commit: 5a43f6fa5e3ab71c7d29b09c1ea0e5d4f5bf8446
+version: 20181127.edba5dc
+mtime: 1543296764
+commit: edba5dcc4cb4e18c82b202c90563cc1621fe0064
