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-08-13 13:22:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/container-build-checks (Old)
and /work/SRC/openSUSE:Factory/.container-build-checks.new.7232 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "container-build-checks"
Tue Aug 13 13:22:23 2024 rev:11 rq:1193402 version:1723452932.412e7f6
Changes:
--------
---
/work/SRC/openSUSE:Factory/container-build-checks/container-build-checks.changes
2024-07-25 11:50:29.753307003 +0200
+++
/work/SRC/openSUSE:Factory/.container-build-checks.new.7232/container-build-checks.changes
2024-08-13 13:22:34.640579761 +0200
@@ -1,0 +2,7 @@
+Mon Aug 12 11:33:57 UTC 2024 - Fabian Vogt <[email protected]>
+
+- Update to version 1723452932.412e7f6:
+ * add test for missing substitutions
+ * Reject labels that are missing a substitution
+
+-------------------------------------------------------------------
Old:
----
container-build-checks-1721653643.19092fe.obscpio
New:
----
container-build-checks-1723452932.412e7f6.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ container-build-checks.spec ++++++
--- /var/tmp/diff_new_pack.iizWuV/_old 2024-08-13 13:22:35.568618428 +0200
+++ /var/tmp/diff_new_pack.iizWuV/_new 2024-08-13 13:22:35.568618428 +0200
@@ -17,7 +17,7 @@
Name: container-build-checks
-Version: 1721653643.19092fe
+Version: 1723452932.412e7f6
Release: 0
Summary: Scripts to validate built container images
License: GPL-2.0-or-later
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.iizWuV/_old 2024-08-13 13:22:35.620620595 +0200
+++ /var/tmp/diff_new_pack.iizWuV/_new 2024-08-13 13:22:35.624620761 +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">19092fede7268017cf1da000bfed8893ef07aab5</param></service></servicedata>
+ <param
name="changesrevision">412e7f60c08221a549b0f00dfcc4bee7694193ab</param></service></servicedata>
(No newline at EOF)
++++++ container-build-checks-1721653643.19092fe.obscpio ->
container-build-checks-1723452932.412e7f6.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/container-build-checks-1721653643.19092fe/container-build-checks.py
new/container-build-checks-1723452932.412e7f6/container-build-checks.py
--- old/container-build-checks-1721653643.19092fe/container-build-checks.py
2024-07-22 15:07:23.000000000 +0200
+++ new/container-build-checks-1723452932.412e7f6/container-build-checks.py
2024-08-12 10:55:32.000000000 +0200
@@ -71,6 +71,9 @@
# Split a reference (e.g. registry.opensuse.org/foo/bar:tag01) into (registry,
repo, tag)
REFERENCE_RE = re.compile("([^/]+)/([^:]+):([^:]+)")
+# Search for substitution patterns like %FOO% in label values
+LABEL_SUB_RE = re.compile("%([A-Za-z0-9_]+)%")
+
def verify_reference(image, result, value):
reference_match = REFERENCE_RE.fullmatch(value)
@@ -151,6 +154,11 @@
if "org.openbuildservice.disturl" not in labels:
result.error("org.openbuildservice.disturl not set correctly, bug in
OBS?")
+ # Reject labels like "something-%foo%" or "%foo%-something"
+ for (label_name, label_value) in labels.items():
+ if LABEL_SUB_RE.search(label_value):
+ result.error(f"Label {label_name} = {label_value} appears to be
missing substitution?")
+
# Get the image specific label prefix by looking at the .reference
labelprefix = None
if "org.opensuse.reference" in labels:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/container-build-checks-1721653643.19092fe/tests/label-checks/Dockerfile
new/container-build-checks-1723452932.412e7f6/tests/label-checks/Dockerfile
--- old/container-build-checks-1721653643.19092fe/tests/label-checks/Dockerfile
1970-01-01 01:00:00.000000000 +0100
+++ new/container-build-checks-1723452932.412e7f6/tests/label-checks/Dockerfile
2024-08-12 10:55:32.000000000 +0200
@@ -0,0 +1,18 @@
+FROM scratch
+LABEL
org.openbuildservice.disturl="obs://build.opensuse.org/openSUSE:Factory/images/e1b24f5d6cbf69cb7f8208acb618a4fe-opensuse-tumbleweed-image:docker"
+LABEL org.opencontainers.image.created="2021-05-20T00:23:03.624005870Z"
+LABEL org.opencontainers.image.description="Image that is 100% based on
openSUSE Tumbleweed."
+LABEL org.opencontainers.image.title="openSUSE Tumbleweed Base Container"
+LABEL org.opencontainers.image.url="https://www.opensuse.org/";
+LABEL org.opencontainers.image.vendor="openSUSE Project"
+LABEL org.opencontainers.image.version="20210519.%RELEASETYPO%"
+LABEL org.opensuse.base.created="2021-05-20T00:23:03.624005870Z"
+LABEL org.opensuse.base.description="Image that is 100% based on openSUSE
Tumbleweed."
+LABEL
org.opensuse.base.disturl="obs://build.opensuse.org/openSUSE:Factory/images/e1b24f5d6cbf69cb7f8208acb618a4fe-opensuse-tumbleweed-image:docker"
+LABEL
org.opensuse.base.reference="registry.opensuse.org/opensuse/tumbleweed:20210519.14.19"
+LABEL org.opensuse.base.title="openSUSE Tumbleweed Base Container"
+LABEL org.opensuse.base.url="https://www.opensuse.org/";
+LABEL org.opensuse.base.vendor="openSUSE Project"
+LABEL org.opensuse.base.version="20210519.%RELEASETYPO%"
+LABEL
org.opensuse.reference="registry.opensuse.org/opensuse/tumbleweed:20210519.14.19"
+COPY some-file /some-file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/container-build-checks-1721653643.19092fe/tests/label-checks/checks.out
new/container-build-checks-1723452932.412e7f6/tests/label-checks/checks.out
--- old/container-build-checks-1721653643.19092fe/tests/label-checks/checks.out
1970-01-01 01:00:00.000000000 +0100
+++ new/container-build-checks-1723452932.412e7f6/tests/label-checks/checks.out
2024-08-12 10:55:32.000000000 +0200
@@ -0,0 +1,12 @@
+Looking at label-checks.containerinfo
+Release: 14.19
+Tag: opensuse/tumbleweed:latest
+Tag: opensuse/tumbleweed:20210519
+Tag: opensuse/tumbleweed:20210519.14.19
+Error: Label org.opencontainers.image.version = 20210519.%RELEASETYPO% appears
to be missing substitution?
+Error: Label org.opensuse.base.version = 20210519.%RELEASETYPO% appears to be
missing substitution?
+Detected image specific label prefix: org.opensuse.base
+
+container-build-checks done. Hints: 0 Warnings: 0 Errors: 2
+Fatal errors found.
+Exited with 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/container-build-checks-1721653643.19092fe/tests/label-checks/label-checks.containerinfo
new/container-build-checks-1723452932.412e7f6/tests/label-checks/label-checks.containerinfo
---
old/container-build-checks-1721653643.19092fe/tests/label-checks/label-checks.containerinfo
1970-01-01 01:00:00.000000000 +0100
+++
new/container-build-checks-1723452932.412e7f6/tests/label-checks/label-checks.containerinfo
2024-08-12 10:55:32.000000000 +0200
@@ -0,0 +1,30 @@
+{
+ "buildtime" : 1621470206,
+ "disturl" :
"obs://build.opensuse.org/openSUSE:Factory/images/e1b24f5d6cbf69cb7f8208acb618a4fe-opensuse-tumbleweed-image:docker",
+ "file" : "label-checks.tar",
+ "goarch" : "amd64",
+ "goos" : "linux",
+ "imageid" :
"11ea66ecb7888f020cd84d080ad417a7d4f02f74361cd1c2a4b4c70ffb0e9d78",
+ "name" : "opensuse-tumbleweed-image",
+ "release" : "14.19",
+ "repos" : [
+ {
+ "url" : "obsrepositories:/"
+ }
+ ],
+ "tags" : [
+ "opensuse/tumbleweed:latest",
+ "opensuse/tumbleweed:20210519",
+ "opensuse/tumbleweed:20210519.14.19"
+ ],
+ "tar_blobids" : [
+
"sha256:11ea66ecb7888f020cd84d080ad417a7d4f02f74361cd1c2a4b4c70ffb0e9d78",
+ "sha256:89a8c2a08e572bfd8ef8eb05648638443f0d50e4c9e9913f01adbeb2e89ec9cd"
+ ],
+ "tar_manifest" :
"[{\"Config\":\"sha256:11ea66ecb7888f020cd84d080ad417a7d4f02f74361cd1c2a4b4c70ffb0e9d78\",\"RepoTags\":[\"opensuse/tumbleweed:latest\",\"opensuse/tumbleweed:20210519\",\"opensuse/tumbleweed:20210519.14.19\"],\"Layers\":[\"sha256:89a8c2a08e572bfd8ef8eb05648638443f0d50e4c9e9913f01adbeb2e89ec9cd\"]}]",
+ "tar_md5sum" : "eb472571d516e44c1c05dc73a47f61e7",
+ "tar_mtime" : 1621470212,
+ "tar_sha256sum" :
"7e8b9aaad5222b8680f17ffcf4c7f514783d86e3193b7f925c066a14113080de",
+ "tar_size" : 36567552,
+ "version" : "1.0.4"
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/container-build-checks-1721653643.19092fe/tests/label-checks/some-file
new/container-build-checks-1723452932.412e7f6/tests/label-checks/some-file
--- old/container-build-checks-1721653643.19092fe/tests/label-checks/some-file
1970-01-01 01:00:00.000000000 +0100
+++ new/container-build-checks-1723452932.412e7f6/tests/label-checks/some-file
2024-08-12 10:55:32.000000000 +0200
@@ -0,0 +1 @@
+Hi!
++++++ container-build-checks.obsinfo ++++++
--- /var/tmp/diff_new_pack.iizWuV/_old 2024-08-13 13:22:35.720624761 +0200
+++ /var/tmp/diff_new_pack.iizWuV/_new 2024-08-13 13:22:35.724624928 +0200
@@ -1,5 +1,5 @@
name: container-build-checks
-version: 1721653643.19092fe
-mtime: 1721653643
-commit: 19092fede7268017cf1da000bfed8893ef07aab5
+version: 1723452932.412e7f6
+mtime: 1723452932
+commit: 412e7f60c08221a549b0f00dfcc4bee7694193ab
