drop uses of fedora-coreos.stream

Since moving over to building via podman tools the `com.coreos.stream`
label is set on any built container images [1]. We've moved zincati
over to support the new `com.coreos.stream` label [2]. Let's drop
adding the `fedora-coreos.stream` label and annotation to our images,
and also change any consumers to use `com.coreos.stream`.

[1] https://github.com/coreos/fedora-coreos-config/blob/ac5ba0b5026a74f94515fe1a8454f3c975b39743/Containerfile#L53
[2] coreos/zincati@a142c98

Author: dustymabe

mantle/cmd/kola/kola.go

@@ -567,9 +567,9 @@ func syncFindParentImageOptions() error {
 	case "fcos":
 		var stream string
 		if kola.CosaBuild.Meta.CosaImportedOciImage {
-			s, ok := kola.CosaBuild.Meta.OciLabels["fedora-coreos.stream"]
+			s, ok := kola.CosaBuild.Meta.OciLabels["com.coreos.stream"]
 			if !ok {
-				return errors.New("label 'fedora-coreos.stream' not found in build metadata")
+				return errors.New("label 'com.coreos.stream' not found in build metadata")
 			}
 			stream = string(s)
 		} else {

src/cmd-build-with-buildah

@@ -175,15 +175,6 @@ build_with_buildah() {
             --label org.opencontainers.image.source="${source}" \
             --label org.opencontainers.image.revision="${commit}"
 
-    # XXX: Temporary hack until we have https://github.com/coreos/rpm-ostree/pull/5454
-    # which would allow us to fold this back into the build process.
-    # shellcheck source=/dev/null disable=SC2153
-    stream=$(eval "$(grep 'STREAM=' "src/config/${argsfile}")"; echo "${STREAM}")
-    if [ -n "${stream}" ]; then
-        set -- "$@" --label fedora-coreos.stream="$stream" \
-                    --annotation fedora-coreos.stream="$stream"
-    fi
-
     if [ -d "src/yumrepos" ] && [ -e "src/yumrepos/${variant:-}.repo" ]; then
         set -- "$@" --secret id=yumrepos,src="$(realpath "src/yumrepos/$variant.repo")" \
                     --secret id=contentsets,src="$(realpath src/yumrepos/content_sets.yaml)" \

src/cmd-generate-release-meta

@@ -122,9 +122,9 @@ def append_build(out, input_):
     if args.stream_name:
         streamnamesrc = {'branch': args.stream_name}
     else:
-        fcos_stream = input_.get('coreos-assembler.oci-imported-labels', {}).get('fedora-coreos.stream')
-        if fcos_stream:
-            streamnamesrc = {'branch': fcos_stream}
+        coreos_stream = input_.get('coreos-assembler.oci-imported-labels', {}).get('com.coreos.stream')
+        if coreos_stream:
+            streamnamesrc = {'branch': coreos_stream}
         else:
             streamnamesrc = input_.get('coreos-assembler.container-config-git')
 

src/cmd-import

@@ -144,9 +144,9 @@ def generate_lockfile_and_commitmeta(tmpd, ostree_commit, build_meta):
         'synthetic': True,
     }
 
-    stream = build_meta.get('coreos-assembler.oci-imported-labels', {}).get('fedora-coreos.stream', '')
+    stream = build_meta.get('coreos-assembler.oci-imported-labels', {}).get('com.coreos.stream', '')
     if stream != '':
-        commitmeta['fedora-coreos.stream'] = stream
+        commitmeta['com.coreos.stream'] = stream
 
     with open(tmp_commitmeta, 'w') as f:
         json.dump(commitmeta, f, indent=2)

src/cmd-sign

@@ -267,7 +267,7 @@ def robosign_oci(args, s3, build, gpgkey):
         if 'ref' in build:
             _, stream = build['ref'].rsplit('/', 1)
         else:  # let fail if this is somehow missing
-            stream = build["coreos-assembler.oci-imported-labels"]["fedora-coreos.stream"]
+            stream = build["coreos-assembler.oci-imported-labels"]["com.coreos.stream"]
 
         # Upload them to S3. We upload to `staging/$stream` first, and then will
         # move them to their final location once they're verified.