diff --git a/cmd/gen-manifests/main.go b/cmd/gen-manifests/main.go index 2df3dae00..814ad8c3d 100644 --- a/cmd/gen-manifests/main.go +++ b/cmd/gen-manifests/main.go @@ -53,6 +53,7 @@ type ostreeOptions struct { Ref string `json:"ref"` URL string `json:"url"` Parent string `json:"parent"` + RHSM bool `json:"rhsm"` } type crBlueprint struct { @@ -120,6 +121,7 @@ func makeManifestJob(name string, imgType distro.ImageType, cr composeRequest, d URL: cr.OSTree.URL, ImageRef: cr.OSTree.Ref, FetchChecksum: cr.OSTree.Parent, + RHSM: cr.OSTree.RHSM, } } diff --git a/internal/distro/distro_test_common/distro_test_common.go b/internal/distro/distro_test_common/distro_test_common.go index 41a816afc..042edca61 100644 --- a/internal/distro/distro_test_common/distro_test_common.go +++ b/internal/distro/distro_test_common/distro_test_common.go @@ -95,6 +95,7 @@ func TestDistro_Manifest(t *testing.T, pipelinePath string, prefix string, regis ImageRef: tt.ComposeRequest.OSTree.Ref, FetchChecksum: tt.ComposeRequest.OSTree.Parent, URL: tt.ComposeRequest.OSTree.URL, + RHSM: tt.ComposeRequest.OSTree.RHSM, } } } diff --git a/tools/test-case-generators/format-request-map.json b/tools/test-case-generators/format-request-map.json index 22cbd435a..385a3cc24 100644 --- a/tools/test-case-generators/format-request-map.json +++ b/tools/test-case-generators/format-request-map.json @@ -538,7 +538,8 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "rhsm": true }, "blueprint": {} },