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 2022-04-22 21:53:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/container-build-checks (Old)
 and      /work/SRC/openSUSE:Factory/.container-build-checks.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "container-build-checks"

Fri Apr 22 21:53:32 2022 rev:6 rq:971200 version:1650464301.a198cf9

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/container-build-checks/container-build-checks.changes
    2022-03-11 11:41:05.494595867 +0100
+++ 
/work/SRC/openSUSE:Factory/.container-build-checks.new.1538/container-build-checks.changes
  2022-04-22 21:54:07.766797463 +0200
@@ -1,0 +2,6 @@
+Wed Apr 20 14:26:26 UTC 2022 - Fabian Vogt <fv...@suse.com>
+
+- Update to version 1650464301.a198cf9:
+  * Detect and treat local builds specially
+
+-------------------------------------------------------------------

Old:
----
  container-build-checks-1643874076.3d0e13c.obscpio

New:
----
  container-build-checks-1650464301.a198cf9.obscpio

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ container-build-checks.spec ++++++
--- /var/tmp/diff_new_pack.XvZL9Z/_old  2022-04-22 21:54:08.386798170 +0200
+++ /var/tmp/diff_new_pack.XvZL9Z/_new  2022-04-22 21:54:08.390798174 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           container-build-checks
-Version:        1643874076.3d0e13c
+Version:        1650464301.a198cf9
 Release:        0
 Summary:        Scripts to validate built container images
 License:        GPL-2.0-or-later

++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.XvZL9Z/_old  2022-04-22 21:54:08.462798256 +0200
+++ /var/tmp/diff_new_pack.XvZL9Z/_new  2022-04-22 21:54:08.466798260 +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">d2e73b845d38cb905ca994efe2600859d65ae58c</param></service></servicedata>
+              <param 
name="changesrevision">1ff773c9bbb681a3dedb3a8b1514e538cafd6e9a</param></service></servicedata>
 (No newline at EOF)
 

++++++ container-build-checks-1643874076.3d0e13c.obscpio -> 
container-build-checks-1650464301.a198cf9.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/container-build-checks-1643874076.3d0e13c/Makefile 
new/container-build-checks-1650464301.a198cf9/Makefile
--- old/container-build-checks-1643874076.3d0e13c/Makefile      2022-02-03 
08:41:16.000000000 +0100
+++ new/container-build-checks-1650464301.a198cf9/Makefile      2022-04-20 
16:18:21.000000000 +0200
@@ -12,6 +12,7 @@
 
 # Some test containers depend on other test containers. Make sure those are 
built first.
 tests/proper-derived/built: tests/proper-base/built
+tests/local-proper-derived/built: tests/proper-base/built
 
 # Build the Dockerfile and create the tarball
 tests/%/built: tests/%/Dockerfile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/container-build-checks-1643874076.3d0e13c/container-build-checks.py 
new/container-build-checks-1650464301.a198cf9/container-build-checks.py
--- old/container-build-checks-1643874076.3d0e13c/container-build-checks.py     
2022-02-03 08:41:16.000000000 +0100
+++ new/container-build-checks-1650464301.a198cf9/container-build-checks.py     
2022-04-20 16:18:21.000000000 +0200
@@ -22,6 +22,7 @@
             raise Exception("Manifest doesn't have exactly one entry")
 
         self.config = 
json.load(self.tarfile.extractfile(self.manifest[0]["Config"]))
+        self.is_local_build = "release" not in containerinfo and "disturl" not 
in containerinfo
 
 
 class LabelInfo:
@@ -46,8 +47,11 @@
 
 
 def verify_disturl(image, result, value):
-    if "disturl" not in image.containerinfo:
-        print("No disturl in containerinfo, local build?")
+    if "disturl" not in image.containerinfo and image.is_local_build:
+        result.hint("No disturl in containerinfo, local build?")
+        return
+    elif "disturl" not in image.containerinfo:
+        result.error("No disturl in containerinfo, but apparently not a local 
build.")
         return
 
     if value != image.containerinfo["disturl"]:
@@ -189,6 +193,10 @@
 
 def check_image(image, result):
     """Perform checks on the given image"""
+    if image.is_local_build:
+        result.hint("No release and disturl found in containerinfo, probably a 
local osc build. "
+                    "Further analysis might be misleading.")
+
     # No manually defined repos which could escape the defined paths in e.g. 
openSUSE:Factory
     if "repos" in image.containerinfo and image.containerinfo["repos"] != 
[{"url": "obsrepositories:/"}]:
         urls = ", ".join([repo["url"] for repo in 
image.containerinfo["repos"]])
@@ -197,8 +205,8 @@
     # Make sure tags are namespaced and one of them contains the release
     if "release" in image.containerinfo:
         print(f"Release: {image.containerinfo['release']}")
-    else:
-        print("No release information found. Is this a local osc build? 
Further analysis might be misleading")
+    elif not image.is_local_build:
+        result.error("No release in containerinfo, but apparently not a local 
build.")
 
     releasetagfound = False
 
@@ -217,7 +225,7 @@
         if "release" in image.containerinfo and image.containerinfo["release"] 
in tag:
             releasetagfound = True
 
-    if not releasetagfound:
+    if not releasetagfound and not image.is_local_build:
         result.warn("None of the tags are unique to a specific build of the 
image.\n" +
                     "Make sure that at least one tag contains the release.")
 
Binary files 
old/container-build-checks-1643874076.3d0e13c/tests/broken-base/broken-base.tar 
and 
new/container-build-checks-1650464301.a198cf9/tests/broken-base/broken-base.tar 
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/container-build-checks-1643874076.3d0e13c/tests/broken-base/checks.new 
new/container-build-checks-1650464301.a198cf9/tests/broken-base/checks.new
--- old/container-build-checks-1643874076.3d0e13c/tests/broken-base/checks.new  
2022-02-03 08:41:16.000000000 +0100
+++ new/container-build-checks-1650464301.a198cf9/tests/broken-base/checks.new  
1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-Looking at broken-base.containerinfo
-Warning: Using manually defined repositories (obsrepositories:/, 
obs://devel:evil/) in the image. Only obsrepositories:/ is allowed.
-Release: 14.19
-Tag: opensuse/tumbleweed:latest
-Tag: opensuse/tumbleweed:20210519
-Warning: None of the tags are unique to a specific build of the image.
-Make sure that at least one tag contains the release.
-Warning: Could not find prefixed copy of the org.opensuse.reference label
-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 refer to an 
existing tag (opensuse/tumbleweed:latest, opensuse/tumbleweed:20210519)
-
-container-build-checks done. Hints: 0 Warnings: 7 Errors: 1
-Warnings found, but those are only fatal in certain projects.
-Fatal errors found.
-Exited with 1
Binary files 
old/container-build-checks-1643874076.3d0e13c/tests/broken-derived/broken-derived.tar
 and 
new/container-build-checks-1650464301.a198cf9/tests/broken-derived/broken-derived.tar
 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/container-build-checks-1643874076.3d0e13c/tests/broken-derived/checks.new 
new/container-build-checks-1650464301.a198cf9/tests/broken-derived/checks.new
--- 
old/container-build-checks-1643874076.3d0e13c/tests/broken-derived/checks.new   
    2022-02-03 08:41:16.000000000 +0100
+++ 
new/container-build-checks-1650464301.a198cf9/tests/broken-derived/checks.new   
    1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-Looking at broken-derived.containerinfo
-Warning: Using manually defined repositories (not obsrepositories:/) in the 
image. Only obsrepositories:/ is allowed.
-Release: 7.21
-Tag: naughty:latest
-Warning: Tag naughty:latest is not allowed. Allowed patterns: kubic/*, 
opensuse/*.
-Warning: Tag naughty:latest is not allowed (blocked by naughty*).
-Tag: notallowed/either:latest
-Warning: Tag notallowed/either:latest is not allowed. Allowed patterns: 
kubic/*, opensuse/*.
-Tag: opensuse/example:5.7
-Tag: opensuse/example:5.7.7.21
-Detected image specific label prefix: com.opensuse.example
-Warning: Label prefix doesn't start with org.opensuse
-Warning: Labels org.openbuildservice.disturl and com.opensuse.example.disturl 
not specified by this image
-Warning: Labels org.opencontainers.image.title and com.opensuse.example.title 
not specified by this image
-Warning: Label com.opensuse.example.description not identical to 
org.opencontainers.image.description
-Warning: Labels org.opencontainers.image.version and 
com.opensuse.example.version not specified by this image
-Warning: The org.opensuse.reference label 
(registry.opensuse.org/opensuse/example:5.7) does not refer to a tag 
identifying a specific build
-
-container-build-checks done. Hints: 0 Warnings: 10 Errors: 0
-Warnings found, but those are only fatal in certain projects.
-Exited with 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/container-build-checks-1643874076.3d0e13c/tests/empty/checks.new 
new/container-build-checks-1650464301.a198cf9/tests/empty/checks.new
--- old/container-build-checks-1643874076.3d0e13c/tests/empty/checks.new        
2022-02-03 08:41:16.000000000 +0100
+++ new/container-build-checks-1650464301.a198cf9/tests/empty/checks.new        
1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-Looking at empty.containerinfo
-Release: 42.0
-Warning: None of the tags are unique to a specific build of the image.
-Make sure that at least one tag contains the release.
-Error: org.openbuildservice.disturl not set correctly, bug in OBS?
-Warning: Could not determine image specific label prefix, some checks will be 
skipped.
-Warning: Label org.openbuildservice.disturl is not set by the image or any of 
its bases
-Warning: Label org.opencontainers.image.title is not set by the image or any 
of its bases
-Warning: Label org.opencontainers.image.description is not set by the image or 
any of its bases
-Warning: Label org.opencontainers.image.version is not set by the image or any 
of its bases
-Warning: Label org.opencontainers.image.created is not set by the image or any 
of its bases
-Warning: Label org.opencontainers.image.vendor is not set by the image or any 
of its bases
-Warning: Label org.opencontainers.image.url is not set by the image or any of 
its bases
-Warning: Label org.opensuse.reference is not set by the image or any of its 
bases
-
-container-build-checks done. Hints: 0 Warnings: 10 Errors: 1
-Warnings found, but those are only fatal in certain projects.
-Fatal errors found.
-Exited with 1
Binary files 
old/container-build-checks-1643874076.3d0e13c/tests/empty/empty.tar and 
new/container-build-checks-1650464301.a198cf9/tests/empty/empty.tar differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/container-build-checks-1643874076.3d0e13c/tests/local-proper-derived/Dockerfile
 
new/container-build-checks-1650464301.a198cf9/tests/local-proper-derived/Dockerfile
--- 
old/container-build-checks-1643874076.3d0e13c/tests/local-proper-derived/Dockerfile
 1970-01-01 01:00:00.000000000 +0100
+++ 
new/container-build-checks-1650464301.a198cf9/tests/local-proper-derived/Dockerfile
 2022-04-20 16:18:21.000000000 +0200
@@ -0,0 +1,15 @@
+FROM c-b-c-tests/proper-base
+LABEL io.buildah.version="1.20.1"
+LABEL 
org.openbuildservice.disturl="obs://build.opensuse.org/home:favogt:container-checks/containerfile/e6f02b3d61214e205f11d1c2075b14cc-dockerfile-application-container"
+LABEL org.opencontainers.image.created="2021-05-21T14:28:22.338350130Z"
+LABEL org.opencontainers.image.description="This contains nano 5.7"
+LABEL org.opencontainers.image.title="Example container"
+LABEL org.opencontainers.image.version="5.7"
+LABEL org.opensuse.example.created="2021-05-21T14:28:22.338350130Z"
+LABEL org.opensuse.example.description="This contains nano 5.7"
+LABEL 
org.opensuse.example.disturl="obs://build.opensuse.org/home:favogt:container-checks/containerfile/e6f02b3d61214e205f11d1c2075b14cc-dockerfile-application-container"
+LABEL 
org.opensuse.example.reference="registry.opensuse.org/opensuse/example:5.7.7.21"
+LABEL org.opensuse.example.title="Example container"
+LABEL org.opensuse.example.version="5.7"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/example:5.7.7.21"
+COPY some-file /some-file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/container-build-checks-1643874076.3d0e13c/tests/local-proper-derived/checks.out
 
new/container-build-checks-1650464301.a198cf9/tests/local-proper-derived/checks.out
--- 
old/container-build-checks-1643874076.3d0e13c/tests/local-proper-derived/checks.out
 1970-01-01 01:00:00.000000000 +0100
+++ 
new/container-build-checks-1650464301.a198cf9/tests/local-proper-derived/checks.out
 2022-04-20 16:18:21.000000000 +0200
@@ -0,0 +1,11 @@
+Looking at local-proper-derived.containerinfo
+Hint: No release and disturl found in containerinfo, probably a local osc 
build. Further analysis might be misleading.
+Tag: opensuse/example:latest
+Tag: opensuse/example:5.7
+Tag: opensuse/example:5.7.7.21
+Tag: kubic/testtag:latest
+Detected image specific label prefix: org.opensuse.example
+Hint: No disturl in containerinfo, local build?
+
+container-build-checks done. Hints: 2 Warnings: 0 Errors: 0
+Exited with 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/container-build-checks-1643874076.3d0e13c/tests/local-proper-derived/local-proper-derived.containerinfo
 
new/container-build-checks-1650464301.a198cf9/tests/local-proper-derived/local-proper-derived.containerinfo
--- 
old/container-build-checks-1643874076.3d0e13c/tests/local-proper-derived/local-proper-derived.containerinfo
 1970-01-01 01:00:00.000000000 +0100
+++ 
new/container-build-checks-1650464301.a198cf9/tests/local-proper-derived/local-proper-derived.containerinfo
 2022-04-20 16:18:21.000000000 +0200
@@ -0,0 +1,29 @@
+{
+   "buildtime" : 1621607310,
+   "file" : "local-proper-derived.tar",
+   "goarch" : "amd64",
+   "goos" : "linux",
+   "imageid" : 
"df309d498c093685243d9d945f368076d88bb6bd181640fae752bf800c3cef09",
+   "repos" : [
+      {
+         "url" : "obsrepositories:/"
+      }
+   ],
+   "tags" : [
+      "opensuse/example:latest",
+      "opensuse/example:5.7",
+      "opensuse/example:5.7.7.21",
+      "kubic/testtag:latest"
+   ],
+   "tar_blobids" : [
+      
"sha256:43e763c1a9ac8eaa809d77c4ad0c543d78a826ba9d811eae19624c31e799fd1c",
+      
"sha256:a0ea0ce79dfa175149b9f715342e13a9472ee6bfaeccfd4ecc6827f2494aef18",
+      "sha256:df309d498c093685243d9d945f368076d88bb6bd181640fae752bf800c3cef09"
+   ],
+   "tar_manifest" : 
"[{\"Config\":\"sha256:df309d498c093685243d9d945f368076d88bb6bd181640fae752bf800c3cef09\",\"RepoTags\":[\"opensuse/example:latest\",\"opensuse/example:5.7\",\"opensuse/example:5.7.7.21\"],\"Layers\":[\"sha256:a0ea0ce79dfa175149b9f715342e13a9472ee6bfaeccfd4ecc6827f2494aef18\",\"sha256:43e763c1a9ac8eaa809d77c4ad0c543d78a826ba9d811eae19624c31e799fd1c\"]}]",
+   "tar_md5sum" : "72c8bfea4f24b5954cea7b788093e25c",
+   "tar_mtime" : 1621607315,
+   "tar_sha256sum" : 
"ee6344740bd7c23a9e4b9f2b5ff031b95566a0a7613ff082ed3a856a5559e297",
+   "tar_size" : 40647680,
+   "version" : "5.7"
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/container-build-checks-1643874076.3d0e13c/tests/local-proper-derived/some-file
 
new/container-build-checks-1650464301.a198cf9/tests/local-proper-derived/some-file
--- 
old/container-build-checks-1643874076.3d0e13c/tests/local-proper-derived/some-file
  1970-01-01 01:00:00.000000000 +0100
+++ 
new/container-build-checks-1650464301.a198cf9/tests/local-proper-derived/some-file
  2022-04-20 16:18:21.000000000 +0200
@@ -0,0 +1 @@
+Hi!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/container-build-checks-1643874076.3d0e13c/tests/proper-base/checks.new 
new/container-build-checks-1650464301.a198cf9/tests/proper-base/checks.new
--- old/container-build-checks-1643874076.3d0e13c/tests/proper-base/checks.new  
2022-02-03 08:41:16.000000000 +0100
+++ new/container-build-checks-1650464301.a198cf9/tests/proper-base/checks.new  
1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-Looking at proper-base.containerinfo
-Release: 14.19
-Tag: opensuse/tumbleweed:latest
-Tag: opensuse/tumbleweed:20210519
-Tag: opensuse/tumbleweed:20210519.14.19
-Detected image specific label prefix: org.opensuse.base
-
-container-build-checks done. Hints: 0 Warnings: 0 Errors: 0
-Exited with 0
Binary files 
old/container-build-checks-1643874076.3d0e13c/tests/proper-base/proper-base.tar 
and 
new/container-build-checks-1650464301.a198cf9/tests/proper-base/proper-base.tar 
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/container-build-checks-1643874076.3d0e13c/tests/proper-derived/checks.new 
new/container-build-checks-1650464301.a198cf9/tests/proper-derived/checks.new
--- 
old/container-build-checks-1643874076.3d0e13c/tests/proper-derived/checks.new   
    2022-02-03 08:41:16.000000000 +0100
+++ 
new/container-build-checks-1650464301.a198cf9/tests/proper-derived/checks.new   
    1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-Looking at proper-derived.containerinfo
-Release: 7.21
-Tag: opensuse/example:latest
-Tag: opensuse/example:5.7
-Tag: opensuse/example:5.7.7.21
-Tag: kubic/testtag:latest
-Detected image specific label prefix: org.opensuse.example
-
-container-build-checks done. Hints: 0 Warnings: 0 Errors: 0
-Exited with 0
Binary files 
old/container-build-checks-1643874076.3d0e13c/tests/proper-derived/proper-derived.tar
 and 
new/container-build-checks-1650464301.a198cf9/tests/proper-derived/proper-derived.tar
 differ

++++++ container-build-checks.obsinfo ++++++
--- /var/tmp/diff_new_pack.XvZL9Z/_old  2022-04-22 21:54:08.570798379 +0200
+++ /var/tmp/diff_new_pack.XvZL9Z/_new  2022-04-22 21:54:08.570798379 +0200
@@ -1,5 +1,5 @@
 name: container-build-checks
-version: 1643874076.3d0e13c
-mtime: 1643874076
-commit: 3d0e13cb804a26a3d053a819ac241165863ee9f5
+version: 1650464301.a198cf9
+mtime: 1650464301
+commit: a198cf9474860b6746f131dc2c5d7f04225ba202
 

Reply via email to