Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package container-build-checks for openSUSE:Factory checked in at 2024-07-24 15:33:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/container-build-checks (Old) and /work/SRC/openSUSE:Factory/.container-build-checks.new.1869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "container-build-checks" Wed Jul 24 15:33:12 2024 rev:10 rq:1189199 version:1721653643.19092fe Changes: -------- --- /work/SRC/openSUSE:Factory/container-build-checks/container-build-checks.changes 2023-04-29 17:27:55.626488544 +0200 +++ /work/SRC/openSUSE:Factory/.container-build-checks.new.1869/container-build-checks.changes 2024-07-25 11:47:40.090568398 +0200 @@ -1,0 +2,15 @@ +Mon Jul 22 13:43:57 UTC 2024 - Dirk Müller <dmueller@suse.com> + +- update SUSE.conf: allow dp.rancher.apps.io + +------------------------------------------------------------------- +Mon Jul 22 13:08:23 UTC 2024 - Fabian Vogt <fvogt@suse.com> + +- Switch _service to mode="manual" +- Update to version 1721653643.19092fe: + * Use generic name for the python setup step + * Allow specifying more than one registry + * Use Pathlib for resolving containerinfo + * Switch to test Python 3.11 + +------------------------------------------------------------------- Old: ---- container-build-checks-1682595397.5ce6d2f.obscpio New: ---- container-build-checks-1721653643.19092fe.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ container-build-checks.spec ++++++ --- /var/tmp/diff_new_pack.8vqhtu/_old 2024-07-25 11:47:40.818597142 +0200 +++ /var/tmp/diff_new_pack.8vqhtu/_new 2024-07-25 11:47:40.822597300 +0200 @@ -1,7 +1,7 @@ # # spec file for package container-build-checks # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: container-build-checks -Version: 1682595397.5ce6d2f +Version: 1721653643.19092fe Release: 0 Summary: Scripts to validate built container images License: GPL-2.0-or-later ++++++ SUSE.conf ++++++ --- /var/tmp/diff_new_pack.8vqhtu/_old 2024-07-25 11:47:41.018605039 +0200 +++ /var/tmp/diff_new_pack.8vqhtu/_new 2024-07-25 11:47:41.042605987 +0200 @@ -1,4 +1,5 @@ [General] Vendor=com.suse Registry=registry.suse.com +Registry+=dp.apps.rancher.io ++++++ _service ++++++ --- /var/tmp/diff_new_pack.8vqhtu/_old 2024-07-25 11:47:41.070607092 +0200 +++ /var/tmp/diff_new_pack.8vqhtu/_new 2024-07-25 11:47:41.074607250 +0200 @@ -1,10 +1,10 @@ <services> - <service mode="disabled" name="obs_scm"> + <service mode="manual" name="obs_scm"> <param name="url">https://github.com/openSUSE/container-build-checks.git</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> </service> - <service mode="disabled" name="set_version" /> + <service mode="manual" name="set_version" /> <service mode="buildtime" name="tar" /> <service mode="buildtime" name="recompress"> <param name="file">*.tar</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.8vqhtu/_old 2024-07-25 11:47:41.098608198 +0200 +++ /var/tmp/diff_new_pack.8vqhtu/_new 2024-07-25 11:47:41.102608356 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/container-build-checks.git</param> - <param name="changesrevision">5ce6d2ffdcc3a95bc79b69d8d021c0b0bce41ad7</param></service></servicedata> + <param name="changesrevision">19092fede7268017cf1da000bfed8893ef07aab5</param></service></servicedata> (No newline at EOF) ++++++ container-build-checks-1682595397.5ce6d2f.obscpio -> container-build-checks-1721653643.19092fe.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/container-build-checks-1682595397.5ce6d2f/.github/workflows/test.yml new/container-build-checks-1721653643.19092fe/.github/workflows/test.yml --- old/container-build-checks-1682595397.5ce6d2f/.github/workflows/test.yml 2023-04-27 13:36:37.000000000 +0200 +++ new/container-build-checks-1721653643.19092fe/.github/workflows/test.yml 2024-07-22 15:07:23.000000000 +0200 @@ -14,11 +14,11 @@ python: "3.6" - os: ubuntu-latest # Version in openSUSE Tumbleweed - python: "3.10" + python: "3.11" runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - - name: Set up Python 3.10 + - name: Set up Python uses: actions/setup-python@v4 with: python-version: ${{ matrix.python }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/container-build-checks-1682595397.5ce6d2f/container-build-checks.py new/container-build-checks-1721653643.19092fe/container-build-checks.py --- old/container-build-checks-1682595397.5ce6d2f/container-build-checks.py 2023-04-27 13:36:37.000000000 +0200 +++ new/container-build-checks-1721653643.19092fe/container-build-checks.py 2024-07-22 15:07:23.000000000 +0200 @@ -1,7 +1,8 @@ #!/usr/bin/python3 -# SPDX-FileCopyrightText: 2021 SUSE LLC +# SPDX-FileCopyrightText: 2021,2024 SUSE LLC # SPDX-License-Identifier: GPL-2.0-or-later +from pathlib import Path import configparser import fnmatch import glob @@ -78,8 +79,11 @@ return (registry, repo, tag) = reference_match.groups() - if config["General"]["Registry"] and registry != config["General"]["Registry"]: - result.warn(f"The org.opensuse.reference label ({value}) does not refer to {config['General']['Registry']}") + allowed_registries: list[str] = config["General"].getlist("Registry") + if len(allowed_registries) and registry not in allowed_registries: + result.warn( + f"The org.opensuse.reference label ({value}) does not use an " + f"allowed registry: {','.join(allowed_registries)}") if f"{repo}:{tag}" not in image.containerinfo["tags"]: tags = ", ".join(image.containerinfo["tags"]) @@ -286,8 +290,7 @@ ci_dict = json.load(cifile) # Open the tarball and look inside - dir = os.path.dirname(os.path.realpath(containerinfo)) - with tarfile.open(f"{dir}/{ci_dict['file']}") as tar: + with tarfile.open(Path(containerinfo).resolve().parent / ci_dict['file']) as tar: image = Image(ci_dict, tar) check_image(image, result) print() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/container-build-checks-1682595397.5ce6d2f/tests/broken-base/checks.out new/container-build-checks-1721653643.19092fe/tests/broken-base/checks.out --- old/container-build-checks-1682595397.5ce6d2f/tests/broken-base/checks.out 2023-04-27 13:36:37.000000000 +0200 +++ new/container-build-checks-1721653643.19092fe/tests/broken-base/checks.out 2024-07-22 15:07:23.000000000 +0200 @@ -9,7 +9,7 @@ Warning: Could not determine image specific label prefix, some checks will be skipped. Error: org.openbuildservice.disturl not set correctly, bug in OBS? Warning: Label org.opencontainers.image.vendor is not set by the image or any of its bases -Warning: The org.opensuse.reference label (notregistry.opensuse.org/opensuse/nottumbleweed:latest) does not refer to registry.opensuse.org +Warning: The org.opensuse.reference label (notregistry.opensuse.org/opensuse/nottumbleweed:latest) does not use an allowed registry: registry.example.com,registry.opensuse.org Warning: The org.opensuse.reference label (notregistry.opensuse.org/opensuse/nottumbleweed:latest) does not refer to an existing tag (opensuse/tumbleweed:latest, opensuse/tumbleweed:20210519) container-build-checks done. Hints: 0 Warnings: 7 Errors: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/container-build-checks-1682595397.5ce6d2f/tests/checks.conf new/container-build-checks-1721653643.19092fe/tests/checks.conf --- old/container-build-checks-1682595397.5ce6d2f/tests/checks.conf 2023-04-27 13:36:37.000000000 +0200 +++ new/container-build-checks-1721653643.19092fe/tests/checks.conf 2024-07-22 15:07:23.000000000 +0200 @@ -1,6 +1,7 @@ [General] Vendor=org.opensuse Registry=registry.opensuse.org +Registry+=registry.example.com [Tags] Allowed+=opensuse/* ++++++ container-build-checks.obsinfo ++++++ --- /var/tmp/diff_new_pack.8vqhtu/_old 2024-07-25 11:47:41.222613094 +0200 +++ /var/tmp/diff_new_pack.8vqhtu/_new 2024-07-25 11:47:41.230613410 +0200 @@ -1,5 +1,5 @@ name: container-build-checks -version: 1682595397.5ce6d2f -mtime: 1682595397 -commit: 5ce6d2ffdcc3a95bc79b69d8d021c0b0bce41ad7 +version: 1721653643.19092fe +mtime: 1721653643 +commit: 19092fede7268017cf1da000bfed8893ef07aab5