diff --git a/test/data/manifests/centos_8-aarch64-edge_installer-boot.json b/test/data/manifests/centos_8-aarch64-edge_installer-boot.json index c108b11e8..a0bc82990 100644 --- a/test/data/manifests/centos_8-aarch64-edge_installer-boot.json +++ b/test/data/manifests/centos_8-aarch64-edge_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -9014,7 +9014,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -11499,7 +11499,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -22207,5 +22207,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/centos_8-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/centos_8-aarch64-edge_installer_with_users-boot.json index 660845d3d..f8b940757 100644 --- a/test/data/manifests/centos_8-aarch64-edge_installer_with_users-boot.json +++ b/test/data/manifests/centos_8-aarch64-edge_installer_with_users-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -9044,7 +9044,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -11551,7 +11551,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -22256,5 +22256,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/centos_8-aarch64-edge_raw_image-boot.json b/test/data/manifests/centos_8-aarch64-edge_raw_image-boot.json index bd216fc1c..5244d0565 100644 --- a/test/data/manifests/centos_8-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/centos_8-aarch64-edge_raw_image-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -2059,7 +2059,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3320,7 +3320,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -5813,5 +5813,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json index 3ee3c66a6..e762d08fb 100644 --- a/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -2411,7 +2411,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -7212,7 +7212,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -13647,5 +13647,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/centos_8-x86_64-edge_installer-boot.json b/test/data/manifests/centos_8-x86_64-edge_installer-boot.json index ef2f2d4ab..f54d20a68 100644 --- a/test/data/manifests/centos_8-x86_64-edge_installer-boot.json +++ b/test/data/manifests/centos_8-x86_64-edge_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -9216,7 +9216,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -11754,7 +11754,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -22682,5 +22682,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/centos_8-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/centos_8-x86_64-edge_installer_with_users-boot.json index 227da29cd..1b35d68ce 100644 --- a/test/data/manifests/centos_8-x86_64-edge_installer_with_users-boot.json +++ b/test/data/manifests/centos_8-x86_64-edge_installer_with_users-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -9246,7 +9246,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -11806,7 +11806,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -22731,5 +22731,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/centos_8-x86_64-edge_raw_image-boot.json b/test/data/manifests/centos_8-x86_64-edge_raw_image-boot.json index 8dba789ad..dca883499 100644 --- a/test/data/manifests/centos_8-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/centos_8-x86_64-edge_raw_image-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -2171,7 +2171,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3501,7 +3501,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -6134,5 +6134,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json index 4248ef4c5..b0f7406de 100644 --- a/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -2459,7 +2459,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -7403,7 +7403,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -13988,5 +13988,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/centos_9-aarch64-edge_ami-boot.json b/test/data/manifests/centos_9-aarch64-edge_ami-boot.json index bb912a80f..eaf27fa18 100644 --- a/test/data/manifests/centos_9-aarch64-edge_ami-boot.json +++ b/test/data/manifests/centos_9-aarch64-edge_ami-boot.json @@ -2123,7 +2123,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3466,7 +3466,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -6039,5 +6039,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/centos_9-aarch64-edge_installer-boot.json b/test/data/manifests/centos_9-aarch64-edge_installer-boot.json index 8278897b3..7de166958 100644 --- a/test/data/manifests/centos_9-aarch64-edge_installer-boot.json +++ b/test/data/manifests/centos_9-aarch64-edge_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -9604,7 +9604,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -12287,7 +12287,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -23725,5 +23725,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json index 82c89023d..f9807f67a 100644 --- a/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json +++ b/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -9634,7 +9634,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -12339,7 +12339,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -23774,5 +23774,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/centos_9-aarch64-edge_raw_image-boot.json b/test/data/manifests/centos_9-aarch64-edge_raw_image-boot.json index d011665dd..81a14b1de 100644 --- a/test/data/manifests/centos_9-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/centos_9-aarch64-edge_raw_image-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -2123,7 +2123,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3489,7 +3489,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -6062,5 +6062,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json index 978f1367a..dc936f80c 100644 --- a/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -2507,7 +2507,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -7415,7 +7415,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -13980,5 +13980,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/centos_9-x86_64-edge_ami-boot.json b/test/data/manifests/centos_9-x86_64-edge_ami-boot.json index 9d453fb60..ec3702c74 100644 --- a/test/data/manifests/centos_9-x86_64-edge_ami-boot.json +++ b/test/data/manifests/centos_9-x86_64-edge_ami-boot.json @@ -2250,7 +2250,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3665,7 +3665,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -6388,5 +6388,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/centos_9-x86_64-edge_installer-boot.json b/test/data/manifests/centos_9-x86_64-edge_installer-boot.json index 2bf7ded90..aaa9528f2 100644 --- a/test/data/manifests/centos_9-x86_64-edge_installer-boot.json +++ b/test/data/manifests/centos_9-x86_64-edge_installer-boot.json @@ -27,7 +27,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -9790,7 +9790,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -12517,7 +12517,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -24145,5 +24145,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/centos_9-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/centos_9-x86_64-edge_installer_with_users-boot.json index c6430584d..be4bd01ac 100644 --- a/test/data/manifests/centos_9-x86_64-edge_installer_with_users-boot.json +++ b/test/data/manifests/centos_9-x86_64-edge_installer_with_users-boot.json @@ -27,7 +27,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -9820,7 +9820,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -12569,7 +12569,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -24194,5 +24194,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/centos_9-x86_64-edge_raw_image-boot.json b/test/data/manifests/centos_9-x86_64-edge_raw_image-boot.json index 27bda4de6..81647cce2 100644 --- a/test/data/manifests/centos_9-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/centos_9-x86_64-edge_raw_image-boot.json @@ -27,7 +27,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -2250,7 +2250,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3688,7 +3688,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -6411,5 +6411,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json index 94dfd858a..181a79b79 100644 --- a/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json @@ -27,7 +27,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -2562,7 +2562,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -7603,7 +7603,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -14308,5 +14308,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_37-aarch64-iot_installer-boot.json b/test/data/manifests/fedora_37-aarch64-iot_installer-boot.json index d77ea27a9..817bd43cf 100644 --- a/test/data/manifests/fedora_37-aarch64-iot_installer-boot.json +++ b/test/data/manifests/fedora_37-aarch64-iot_installer-boot.json @@ -33,7 +33,7 @@ "ostree": { "ref": "test/iot", "url": "http://iot.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -10708,7 +10708,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "ref": "test/iot" } } @@ -13811,7 +13811,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "remote": { "url": "http://iot.example.com/repo" } @@ -26616,5 +26616,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/iot", + "URL": "http://iot.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_37-aarch64-iot_installer_with_users-boot.json b/test/data/manifests/fedora_37-aarch64-iot_installer_with_users-boot.json index 5718c6958..364fd3ece 100644 --- a/test/data/manifests/fedora_37-aarch64-iot_installer_with_users-boot.json +++ b/test/data/manifests/fedora_37-aarch64-iot_installer_with_users-boot.json @@ -33,7 +33,7 @@ "ostree": { "ref": "test/iot", "url": "http://iot.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -10737,7 +10737,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "ref": "test/iot" } } @@ -13862,7 +13862,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "remote": { "url": "http://iot.example.com/repo" } @@ -26667,5 +26667,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/iot", + "URL": "http://iot.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_37-aarch64-iot_raw_image-boot.json b/test/data/manifests/fedora_37-aarch64-iot_raw_image-boot.json index 06e54d294..5c35cc135 100644 --- a/test/data/manifests/fedora_37-aarch64-iot_raw_image-boot.json +++ b/test/data/manifests/fedora_37-aarch64-iot_raw_image-boot.json @@ -1889,7 +1889,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "ref": "test/fedora/iot" } } @@ -2307,130 +2307,130 @@ "type": "org.osbuild.ostree.checkout", "origin": "org.osbuild.source", "references": [ - "" + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6" ] } }, "options": { "paths": [ { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-2-b.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-2-b.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-3-b-plus.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-3-b-plus.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-3-b.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-3-b.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-cm3.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-cm3.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2-w.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2-w.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-4-b.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-4-b.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-400.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-400.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-cm4.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-cm4.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-cm4s.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-cm4s.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bootcode.bin", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bootcode.bin", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/config.txt", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/config.txt", "to": "mount://root/boot/efi/config.txt" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4cd.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4cd.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4db.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4db.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4x.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4x.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup_cd.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup_cd.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup_db.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup_db.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup_x.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup_x.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/overlays", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/overlays", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/share/uboot/rpi_arm64/u-boot.bin", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/share/uboot/rpi_arm64/u-boot.bin", "to": "mount://root/boot/efi/rpi-u-boot.bin" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4cd.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4cd.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4db.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4db.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4x.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4x.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start_cd.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start_cd.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start_db.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start_db.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start_x.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start_x.elf", "to": "mount://root/boot/efi/" } ] @@ -3190,7 +3190,7 @@ }, "org.osbuild.ostree": { "items": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "remote": { "url": "http://fedora.example.com/repo" } @@ -5453,5 +5453,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/fedora/iot", + "URL": "http://fedora.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_37-aarch64-iot_raw_image_customizations-boot.json b/test/data/manifests/fedora_37-aarch64-iot_raw_image_customizations-boot.json index 385d76b71..4d1eb5b23 100644 --- a/test/data/manifests/fedora_37-aarch64-iot_raw_image_customizations-boot.json +++ b/test/data/manifests/fedora_37-aarch64-iot_raw_image_customizations-boot.json @@ -1964,7 +1964,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "ref": "test/fedora/iot" } } @@ -2671,130 +2671,130 @@ "type": "org.osbuild.ostree.checkout", "origin": "org.osbuild.source", "references": [ - "" + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6" ] } }, "options": { "paths": [ { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-2-b.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-2-b.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-3-b-plus.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-3-b-plus.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-3-b.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-3-b.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-cm3.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-cm3.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2-w.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2-w.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-4-b.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-4-b.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-400.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-400.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-cm4.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-cm4.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-cm4s.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-cm4s.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bootcode.bin", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bootcode.bin", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/config.txt", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/config.txt", "to": "mount://root/boot/efi/config.txt" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4cd.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4cd.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4db.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4db.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4x.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4x.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup_cd.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup_cd.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup_db.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup_db.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup_x.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup_x.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/overlays", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/overlays", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/share/uboot/rpi_arm64/u-boot.bin", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/share/uboot/rpi_arm64/u-boot.bin", "to": "mount://root/boot/efi/rpi-u-boot.bin" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4cd.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4cd.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4db.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4db.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4x.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4x.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start_cd.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start_cd.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start_db.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start_db.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start_x.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start_x.elf", "to": "mount://root/boot/efi/" } ] @@ -3574,7 +3574,7 @@ }, "org.osbuild.ostree": { "items": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "remote": { "url": "http://fedora.example.com/repo" } @@ -5837,5 +5837,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/fedora/iot", + "URL": "http://fedora.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_37-x86_64-iot_installer-boot.json b/test/data/manifests/fedora_37-x86_64-iot_installer-boot.json index 4d11a955e..7c04d7301 100644 --- a/test/data/manifests/fedora_37-x86_64-iot_installer-boot.json +++ b/test/data/manifests/fedora_37-x86_64-iot_installer-boot.json @@ -33,7 +33,7 @@ "ostree": { "ref": "test/iot", "url": "http://iot.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -10934,7 +10934,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "ref": "test/iot" } } @@ -14099,7 +14099,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "remote": { "url": "http://iot.example.com/repo" } @@ -27154,5 +27154,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/iot", + "URL": "http://iot.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_37-x86_64-iot_installer_with_users-boot.json b/test/data/manifests/fedora_37-x86_64-iot_installer_with_users-boot.json index 8e3d3027a..50448ada1 100644 --- a/test/data/manifests/fedora_37-x86_64-iot_installer_with_users-boot.json +++ b/test/data/manifests/fedora_37-x86_64-iot_installer_with_users-boot.json @@ -33,7 +33,7 @@ "ostree": { "ref": "test/iot", "url": "http://iot.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -10963,7 +10963,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "ref": "test/iot" } } @@ -14150,7 +14150,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "remote": { "url": "http://iot.example.com/repo" } @@ -27205,5 +27205,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/iot", + "URL": "http://iot.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_37-x86_64-iot_raw_image-boot.json b/test/data/manifests/fedora_37-x86_64-iot_raw_image-boot.json index 672487c56..0c8a45b0b 100644 --- a/test/data/manifests/fedora_37-x86_64-iot_raw_image-boot.json +++ b/test/data/manifests/fedora_37-x86_64-iot_raw_image-boot.json @@ -1897,7 +1897,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "ref": "test/fedora/iot" } } @@ -3021,7 +3021,7 @@ }, "org.osbuild.ostree": { "items": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "remote": { "url": "http://fedora.example.com/repo" } @@ -5294,5 +5294,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/fedora/iot", + "URL": "http://fedora.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_37-x86_64-iot_raw_image_customizations-boot.json b/test/data/manifests/fedora_37-x86_64-iot_raw_image_customizations-boot.json index 05382a57d..a01db3e9e 100644 --- a/test/data/manifests/fedora_37-x86_64-iot_raw_image_customizations-boot.json +++ b/test/data/manifests/fedora_37-x86_64-iot_raw_image_customizations-boot.json @@ -1972,7 +1972,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "ref": "test/fedora/iot" } } @@ -3405,7 +3405,7 @@ }, "org.osbuild.ostree": { "items": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "remote": { "url": "http://fedora.example.com/repo" } @@ -5678,5 +5678,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/fedora/iot", + "URL": "http://fedora.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_38-aarch64-iot_installer-boot.json b/test/data/manifests/fedora_38-aarch64-iot_installer-boot.json index 133084386..af567e149 100644 --- a/test/data/manifests/fedora_38-aarch64-iot_installer-boot.json +++ b/test/data/manifests/fedora_38-aarch64-iot_installer-boot.json @@ -33,7 +33,7 @@ "ostree": { "ref": "test/iot", "url": "http://iot.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -10676,7 +10676,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "ref": "test/iot" } } @@ -13734,7 +13734,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "remote": { "url": "http://iot.example.com/repo" } @@ -26499,5 +26499,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/iot", + "URL": "http://iot.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_38-aarch64-iot_installer_with_users-boot.json b/test/data/manifests/fedora_38-aarch64-iot_installer_with_users-boot.json index 516ade9ce..64d8b72f8 100644 --- a/test/data/manifests/fedora_38-aarch64-iot_installer_with_users-boot.json +++ b/test/data/manifests/fedora_38-aarch64-iot_installer_with_users-boot.json @@ -33,7 +33,7 @@ "ostree": { "ref": "test/iot", "url": "http://iot.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -10705,7 +10705,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "ref": "test/iot" } } @@ -13785,7 +13785,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "remote": { "url": "http://iot.example.com/repo" } @@ -26550,5 +26550,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/iot", + "URL": "http://iot.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_38-aarch64-iot_raw_image-boot.json b/test/data/manifests/fedora_38-aarch64-iot_raw_image-boot.json index 0af92f499..35fbc19fe 100644 --- a/test/data/manifests/fedora_38-aarch64-iot_raw_image-boot.json +++ b/test/data/manifests/fedora_38-aarch64-iot_raw_image-boot.json @@ -1881,7 +1881,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "ref": "test/fedora/iot" } } @@ -2299,130 +2299,130 @@ "type": "org.osbuild.ostree.checkout", "origin": "org.osbuild.source", "references": [ - "" + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6" ] } }, "options": { "paths": [ { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-2-b.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-2-b.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-3-b-plus.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-3-b-plus.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-3-b.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-3-b.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-cm3.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-cm3.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2-w.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2-w.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-4-b.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-4-b.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-400.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-400.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-cm4.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-cm4.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-cm4s.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-cm4s.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bootcode.bin", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bootcode.bin", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/config.txt", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/config.txt", "to": "mount://root/boot/efi/config.txt" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4cd.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4cd.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4db.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4db.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4x.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4x.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup_cd.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup_cd.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup_db.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup_db.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup_x.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup_x.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/overlays", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/overlays", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/share/uboot/rpi_arm64/u-boot.bin", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/share/uboot/rpi_arm64/u-boot.bin", "to": "mount://root/boot/efi/rpi-u-boot.bin" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4cd.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4cd.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4db.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4db.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4x.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4x.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start_cd.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start_cd.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start_db.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start_db.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start_x.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start_x.elf", "to": "mount://root/boot/efi/" } ] @@ -3179,7 +3179,7 @@ }, "org.osbuild.ostree": { "items": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "remote": { "url": "http://fedora.example.com/repo" } @@ -5432,5 +5432,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/fedora/iot", + "URL": "http://fedora.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_38-aarch64-iot_raw_image_customizations-boot.json b/test/data/manifests/fedora_38-aarch64-iot_raw_image_customizations-boot.json index 4050f7c02..8f35a2f44 100644 --- a/test/data/manifests/fedora_38-aarch64-iot_raw_image_customizations-boot.json +++ b/test/data/manifests/fedora_38-aarch64-iot_raw_image_customizations-boot.json @@ -1956,7 +1956,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "ref": "test/fedora/iot" } } @@ -2663,130 +2663,130 @@ "type": "org.osbuild.ostree.checkout", "origin": "org.osbuild.source", "references": [ - "" + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6" ] } }, "options": { "paths": [ { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-2-b.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-2-b.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-3-b-plus.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-3-b-plus.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-3-b.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-3-b.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-cm3.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-cm3.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2-w.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2-w.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-4-b.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-4-b.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-400.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-400.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-cm4.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-cm4.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-cm4s.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-cm4s.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bootcode.bin", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bootcode.bin", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/config.txt", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/config.txt", "to": "mount://root/boot/efi/config.txt" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4cd.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4cd.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4db.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4db.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4x.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4x.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup_cd.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup_cd.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup_db.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup_db.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup_x.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup_x.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/overlays", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/overlays", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/share/uboot/rpi_arm64/u-boot.bin", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/share/uboot/rpi_arm64/u-boot.bin", "to": "mount://root/boot/efi/rpi-u-boot.bin" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4cd.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4cd.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4db.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4db.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4x.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4x.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start_cd.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start_cd.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start_db.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start_db.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start_x.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start_x.elf", "to": "mount://root/boot/efi/" } ] @@ -3563,7 +3563,7 @@ }, "org.osbuild.ostree": { "items": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "remote": { "url": "http://fedora.example.com/repo" } @@ -5816,5 +5816,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/fedora/iot", + "URL": "http://fedora.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_38-x86_64-iot_installer-boot.json b/test/data/manifests/fedora_38-x86_64-iot_installer-boot.json index 5e3545230..4692f6ec2 100644 --- a/test/data/manifests/fedora_38-x86_64-iot_installer-boot.json +++ b/test/data/manifests/fedora_38-x86_64-iot_installer-boot.json @@ -33,7 +33,7 @@ "ostree": { "ref": "test/iot", "url": "http://iot.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -10886,7 +10886,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "ref": "test/iot" } } @@ -14003,7 +14003,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "remote": { "url": "http://iot.example.com/repo" } @@ -26998,5 +26998,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/iot", + "URL": "http://iot.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_38-x86_64-iot_installer_with_users-boot.json b/test/data/manifests/fedora_38-x86_64-iot_installer_with_users-boot.json index 7cd2a2a0b..4219e0ead 100644 --- a/test/data/manifests/fedora_38-x86_64-iot_installer_with_users-boot.json +++ b/test/data/manifests/fedora_38-x86_64-iot_installer_with_users-boot.json @@ -33,7 +33,7 @@ "ostree": { "ref": "test/iot", "url": "http://iot.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -10915,7 +10915,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "ref": "test/iot" } } @@ -14054,7 +14054,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "remote": { "url": "http://iot.example.com/repo" } @@ -27049,5 +27049,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/iot", + "URL": "http://iot.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_38-x86_64-iot_raw_image-boot.json b/test/data/manifests/fedora_38-x86_64-iot_raw_image-boot.json index a1ee1ad18..3287a7f79 100644 --- a/test/data/manifests/fedora_38-x86_64-iot_raw_image-boot.json +++ b/test/data/manifests/fedora_38-x86_64-iot_raw_image-boot.json @@ -1881,7 +1881,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "ref": "test/fedora/iot" } } @@ -2999,7 +2999,7 @@ }, "org.osbuild.ostree": { "items": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "remote": { "url": "http://fedora.example.com/repo" } @@ -5252,5 +5252,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/fedora/iot", + "URL": "http://fedora.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_38-x86_64-iot_raw_image_customizations-boot.json b/test/data/manifests/fedora_38-x86_64-iot_raw_image_customizations-boot.json index f2f0ddea9..b5f3b3d9e 100644 --- a/test/data/manifests/fedora_38-x86_64-iot_raw_image_customizations-boot.json +++ b/test/data/manifests/fedora_38-x86_64-iot_raw_image_customizations-boot.json @@ -1956,7 +1956,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "ref": "test/fedora/iot" } } @@ -3383,7 +3383,7 @@ }, "org.osbuild.ostree": { "items": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "remote": { "url": "http://fedora.example.com/repo" } @@ -5636,5 +5636,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/fedora/iot", + "URL": "http://fedora.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_39-aarch64-iot_installer-boot.json b/test/data/manifests/fedora_39-aarch64-iot_installer-boot.json index 12ea628ae..a5cd39af9 100644 --- a/test/data/manifests/fedora_39-aarch64-iot_installer-boot.json +++ b/test/data/manifests/fedora_39-aarch64-iot_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/iot", "url": "http://iot.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -10660,7 +10660,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "ref": "test/iot" } } @@ -13715,7 +13715,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "remote": { "url": "http://iot.example.com/repo" } @@ -26480,5 +26480,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/iot", + "URL": "http://iot.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_39-aarch64-iot_installer_with_users-boot.json b/test/data/manifests/fedora_39-aarch64-iot_installer_with_users-boot.json index 2edde369c..c89b55455 100644 --- a/test/data/manifests/fedora_39-aarch64-iot_installer_with_users-boot.json +++ b/test/data/manifests/fedora_39-aarch64-iot_installer_with_users-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/iot", "url": "http://iot.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -10689,7 +10689,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "ref": "test/iot" } } @@ -13766,7 +13766,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "remote": { "url": "http://iot.example.com/repo" } @@ -26531,5 +26531,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/iot", + "URL": "http://iot.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_39-aarch64-iot_raw_image-boot.json b/test/data/manifests/fedora_39-aarch64-iot_raw_image-boot.json index d59303e08..f427f2448 100644 --- a/test/data/manifests/fedora_39-aarch64-iot_raw_image-boot.json +++ b/test/data/manifests/fedora_39-aarch64-iot_raw_image-boot.json @@ -1875,7 +1875,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "ref": "test/fedora/iot" } } @@ -2293,130 +2293,130 @@ "type": "org.osbuild.ostree.checkout", "origin": "org.osbuild.source", "references": [ - "" + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6" ] } }, "options": { "paths": [ { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-2-b.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-2-b.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-3-b-plus.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-3-b-plus.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-3-b.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-3-b.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-cm3.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-cm3.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2-w.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2-w.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-4-b.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-4-b.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-400.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-400.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-cm4.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-cm4.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-cm4s.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-cm4s.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bootcode.bin", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bootcode.bin", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/config.txt", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/config.txt", "to": "mount://root/boot/efi/config.txt" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4cd.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4cd.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4db.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4db.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4x.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4x.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup_cd.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup_cd.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup_db.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup_db.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup_x.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup_x.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/overlays", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/overlays", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/share/uboot/rpi_arm64/u-boot.bin", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/share/uboot/rpi_arm64/u-boot.bin", "to": "mount://root/boot/efi/rpi-u-boot.bin" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4cd.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4cd.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4db.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4db.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4x.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4x.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start_cd.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start_cd.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start_db.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start_db.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start_x.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start_x.elf", "to": "mount://root/boot/efi/" } ] @@ -3176,7 +3176,7 @@ }, "org.osbuild.ostree": { "items": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "remote": { "url": "http://fedora.example.com/repo" } @@ -5439,5 +5439,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/fedora/iot", + "URL": "http://fedora.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_39-aarch64-iot_raw_image_customizations-boot.json b/test/data/manifests/fedora_39-aarch64-iot_raw_image_customizations-boot.json index f1b0bbf8e..bf4ad7bfc 100644 --- a/test/data/manifests/fedora_39-aarch64-iot_raw_image_customizations-boot.json +++ b/test/data/manifests/fedora_39-aarch64-iot_raw_image_customizations-boot.json @@ -1950,7 +1950,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "ref": "test/fedora/iot" } } @@ -2657,130 +2657,130 @@ "type": "org.osbuild.ostree.checkout", "origin": "org.osbuild.source", "references": [ - "" + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6" ] } }, "options": { "paths": [ { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-2-b.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-2-b.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-3-b-plus.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-3-b-plus.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-3-b.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-3-b.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-cm3.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-cm3.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2-w.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2-w.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2710-rpi-zero-2.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-4-b.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-4-b.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-400.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-400.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-cm4.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-cm4.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bcm2711-rpi-cm4s.dtb", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bcm2711-rpi-cm4s.dtb", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/bootcode.bin", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/bootcode.bin", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/config.txt", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/config.txt", "to": "mount://root/boot/efi/config.txt" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4cd.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4cd.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4db.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4db.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup4x.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup4x.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup_cd.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup_cd.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup_db.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup_db.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/fixup_x.dat", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/fixup_x.dat", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/overlays", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/overlays", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/share/uboot/rpi_arm64/u-boot.bin", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/share/uboot/rpi_arm64/u-boot.bin", "to": "mount://root/boot/efi/rpi-u-boot.bin" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4cd.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4cd.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4db.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4db.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start4x.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start4x.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start_cd.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start_cd.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start_db.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start_db.elf", "to": "mount://root/boot/efi/" }, { - "from": "input://ostree-tree//usr/lib/ostree-boot/efi/start_x.elf", + "from": "input://ostree-tree/88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6/usr/lib/ostree-boot/efi/start_x.elf", "to": "mount://root/boot/efi/" } ] @@ -3560,7 +3560,7 @@ }, "org.osbuild.ostree": { "items": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "remote": { "url": "http://fedora.example.com/repo" } @@ -5823,5 +5823,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/fedora/iot", + "URL": "http://fedora.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_39-x86_64-iot_installer-boot.json b/test/data/manifests/fedora_39-x86_64-iot_installer-boot.json index ff0789c04..b6b588d92 100644 --- a/test/data/manifests/fedora_39-x86_64-iot_installer-boot.json +++ b/test/data/manifests/fedora_39-x86_64-iot_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/iot", "url": "http://iot.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -10870,7 +10870,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "ref": "test/iot" } } @@ -13984,7 +13984,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "remote": { "url": "http://iot.example.com/repo" } @@ -26979,5 +26979,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/iot", + "URL": "http://iot.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_39-x86_64-iot_installer_with_users-boot.json b/test/data/manifests/fedora_39-x86_64-iot_installer_with_users-boot.json index c9fa2823e..a3a0a573e 100644 --- a/test/data/manifests/fedora_39-x86_64-iot_installer_with_users-boot.json +++ b/test/data/manifests/fedora_39-x86_64-iot_installer_with_users-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/iot", "url": "http://iot.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -10899,7 +10899,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "ref": "test/iot" } } @@ -14035,7 +14035,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f": { "remote": { "url": "http://iot.example.com/repo" } @@ -27030,5 +27030,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/iot", + "URL": "http://iot.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "466e747c4d158f3443d3f92407e9f93a6ec8a2cbf0565ab716850f027b90a76f" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_39-x86_64-iot_raw_image-boot.json b/test/data/manifests/fedora_39-x86_64-iot_raw_image-boot.json index 12d917be4..1308cb9d3 100644 --- a/test/data/manifests/fedora_39-x86_64-iot_raw_image-boot.json +++ b/test/data/manifests/fedora_39-x86_64-iot_raw_image-boot.json @@ -1875,7 +1875,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "ref": "test/fedora/iot" } } @@ -2996,7 +2996,7 @@ }, "org.osbuild.ostree": { "items": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "remote": { "url": "http://fedora.example.com/repo" } @@ -5259,5 +5259,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/fedora/iot", + "URL": "http://fedora.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/fedora_39-x86_64-iot_raw_image_customizations-boot.json b/test/data/manifests/fedora_39-x86_64-iot_raw_image_customizations-boot.json index c75c969ad..142f9dab1 100644 --- a/test/data/manifests/fedora_39-x86_64-iot_raw_image_customizations-boot.json +++ b/test/data/manifests/fedora_39-x86_64-iot_raw_image_customizations-boot.json @@ -1950,7 +1950,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "ref": "test/fedora/iot" } } @@ -3380,7 +3380,7 @@ }, "org.osbuild.ostree": { "items": { - "": { + "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6": { "remote": { "url": "http://fedora.example.com/repo" } @@ -5643,5 +5643,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/fedora/iot", + "URL": "http://fedora.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "88a9428978d79e31177c543da1d32a338ec6fd95522f5e50e12f39a4dfd2eae6" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_8-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_8-aarch64-edge_installer-boot.json index 59763017e..751ebb4a3 100644 --- a/test/data/manifests/rhel_8-aarch64-edge_installer-boot.json +++ b/test/data/manifests/rhel_8-aarch64-edge_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -3775,7 +3775,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6368,7 +6368,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -16331,5 +16331,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_8-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_8-aarch64-edge_installer_with_users-boot.json index 66fd39338..4ff4b4fa6 100644 --- a/test/data/manifests/rhel_8-aarch64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_8-aarch64-edge_installer_with_users-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -3805,7 +3805,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6420,7 +6420,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -16380,5 +16380,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_8-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_8-aarch64-edge_raw_image-boot.json index 3f64173e0..5218e9cb8 100644 --- a/test/data/manifests/rhel_8-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_8-aarch64-edge_raw_image-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -814,7 +814,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -2072,7 +2072,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -4308,5 +4308,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_8-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_8-aarch64-edge_simplified_installer-boot.json index a3498e406..ab86efc59 100644 --- a/test/data/manifests/rhel_8-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_8-aarch64-edge_simplified_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -951,7 +951,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3994,7 +3994,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -9769,5 +9769,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_8-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_8-x86_64-edge_installer-boot.json index c049e3cc6..042312d17 100644 --- a/test/data/manifests/rhel_8-x86_64-edge_installer-boot.json +++ b/test/data/manifests/rhel_8-x86_64-edge_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -3879,7 +3879,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6537,7 +6537,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -16734,5 +16734,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_8-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_8-x86_64-edge_installer_with_users-boot.json index 035644926..42c12ca83 100644 --- a/test/data/manifests/rhel_8-x86_64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_8-x86_64-edge_installer_with_users-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -3909,7 +3909,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6589,7 +6589,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -16783,5 +16783,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_8-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_8-x86_64-edge_raw_image-boot.json index 3d9a33349..330afc1e7 100644 --- a/test/data/manifests/rhel_8-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_8-x86_64-edge_raw_image-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -856,7 +856,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -2183,7 +2183,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -4545,5 +4545,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_8-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_8-x86_64-edge_simplified_installer-boot.json index e26788d3c..95d3dc2f3 100644 --- a/test/data/manifests/rhel_8-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_8-x86_64-edge_simplified_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -969,7 +969,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -4110,7 +4110,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -10020,5 +10020,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_84-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_84-aarch64-edge_installer-boot.json index 25e6e634e..666a4cb3a 100644 --- a/test/data/manifests/rhel_84-aarch64-edge_installer-boot.json +++ b/test/data/manifests/rhel_84-aarch64-edge_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -3754,7 +3754,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6293,7 +6293,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -16193,5 +16193,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_84-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_84-aarch64-edge_installer_with_users-boot.json index 138a35749..148ad5122 100644 --- a/test/data/manifests/rhel_84-aarch64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_84-aarch64-edge_installer_with_users-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -3784,7 +3784,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6345,7 +6345,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -16242,5 +16242,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_84-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_84-x86_64-edge_installer-boot.json index 5d04abb47..d0b7528c8 100644 --- a/test/data/manifests/rhel_84-x86_64-edge_installer-boot.json +++ b/test/data/manifests/rhel_84-x86_64-edge_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -3852,7 +3852,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6450,7 +6450,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -16566,5 +16566,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_84-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_84-x86_64-edge_installer_with_users-boot.json index 8877312ca..647ad2847 100644 --- a/test/data/manifests/rhel_84-x86_64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_84-x86_64-edge_installer_with_users-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -3882,7 +3882,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6502,7 +6502,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -16615,5 +16615,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_85-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_85-aarch64-edge_installer-boot.json index 0529603ae..51bc86110 100644 --- a/test/data/manifests/rhel_85-aarch64-edge_installer-boot.json +++ b/test/data/manifests/rhel_85-aarch64-edge_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -3718,7 +3718,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6248,7 +6248,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -16040,5 +16040,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_85-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_85-aarch64-edge_installer_with_users-boot.json index 38ecf10eb..075cf9a95 100644 --- a/test/data/manifests/rhel_85-aarch64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_85-aarch64-edge_installer_with_users-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -3718,7 +3718,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6248,7 +6248,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -16037,5 +16037,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_85-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_85-x86_64-edge_installer-boot.json index 21446b0bc..6a685e93b 100644 --- a/test/data/manifests/rhel_85-x86_64-edge_installer-boot.json +++ b/test/data/manifests/rhel_85-x86_64-edge_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -3816,7 +3816,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6405,7 +6405,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -16413,5 +16413,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_85-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_85-x86_64-edge_installer_with_users-boot.json index 0ee8292d2..6d8dd17da 100644 --- a/test/data/manifests/rhel_85-x86_64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_85-x86_64-edge_installer_with_users-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -3816,7 +3816,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6405,7 +6405,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -16410,5 +16410,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_86-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_86-aarch64-edge_installer-boot.json index 357debaca..eb5936193 100644 --- a/test/data/manifests/rhel_86-aarch64-edge_installer-boot.json +++ b/test/data/manifests/rhel_86-aarch64-edge_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -3712,7 +3712,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6239,7 +6239,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -16013,5 +16013,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_86-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_86-aarch64-edge_installer_with_users-boot.json index 17714f53a..7ea87d480 100644 --- a/test/data/manifests/rhel_86-aarch64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_86-aarch64-edge_installer_with_users-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -3742,7 +3742,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6291,7 +6291,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -16062,5 +16062,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_86-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_86-aarch64-edge_raw_image-boot.json index d2cdb2565..e6e4ef156 100644 --- a/test/data/manifests/rhel_86-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_86-aarch64-edge_raw_image-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -814,7 +814,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -2072,7 +2072,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -4308,5 +4308,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json index 3dc2060d3..54e6ac1d1 100644 --- a/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -954,7 +954,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3997,7 +3997,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -9781,5 +9781,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_86-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_86-x86_64-edge_installer-boot.json index c40ff6091..fdce8eaf8 100644 --- a/test/data/manifests/rhel_86-x86_64-edge_installer-boot.json +++ b/test/data/manifests/rhel_86-x86_64-edge_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -3810,7 +3810,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6396,7 +6396,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -16386,5 +16386,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_86-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_86-x86_64-edge_installer_with_users-boot.json index 508887a8a..7d6af9561 100644 --- a/test/data/manifests/rhel_86-x86_64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_86-x86_64-edge_installer_with_users-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -3840,7 +3840,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6448,7 +6448,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -16435,5 +16435,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_86-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_86-x86_64-edge_raw_image-boot.json index 4c9dc065b..65efaded8 100644 --- a/test/data/manifests/rhel_86-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_86-x86_64-edge_raw_image-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -856,7 +856,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -2183,7 +2183,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -4545,5 +4545,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json index 5fa235133..d81309d9b 100644 --- a/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -972,7 +972,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -4113,7 +4113,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -10032,5 +10032,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_87-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_87-aarch64-edge_installer-boot.json index 9e2ee704c..7bbd3496e 100644 --- a/test/data/manifests/rhel_87-aarch64-edge_installer-boot.json +++ b/test/data/manifests/rhel_87-aarch64-edge_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -3775,7 +3775,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6368,7 +6368,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -16331,5 +16331,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_87-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_87-aarch64-edge_installer_with_users-boot.json index fabb79474..6b6bb25c7 100644 --- a/test/data/manifests/rhel_87-aarch64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_87-aarch64-edge_installer_with_users-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -3805,7 +3805,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6420,7 +6420,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -16380,5 +16380,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_87-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_87-aarch64-edge_raw_image-boot.json index 67f5f59e8..2246725af 100644 --- a/test/data/manifests/rhel_87-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_87-aarch64-edge_raw_image-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -814,7 +814,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -2072,7 +2072,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -4308,5 +4308,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_87-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_87-aarch64-edge_simplified_installer-boot.json index 026ee9441..2f4aa8a4a 100644 --- a/test/data/manifests/rhel_87-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_87-aarch64-edge_simplified_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -951,7 +951,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3994,7 +3994,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -9769,5 +9769,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_87-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_87-x86_64-edge_installer-boot.json index a659010f2..42ccf3701 100644 --- a/test/data/manifests/rhel_87-x86_64-edge_installer-boot.json +++ b/test/data/manifests/rhel_87-x86_64-edge_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -3879,7 +3879,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6537,7 +6537,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -16734,5 +16734,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_87-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_87-x86_64-edge_installer_with_users-boot.json index c1ccdbd74..4f068ff2e 100644 --- a/test/data/manifests/rhel_87-x86_64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_87-x86_64-edge_installer_with_users-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -3909,7 +3909,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6589,7 +6589,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -16783,5 +16783,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_87-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_87-x86_64-edge_raw_image-boot.json index bb5a9359f..fb8d174ba 100644 --- a/test/data/manifests/rhel_87-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_87-x86_64-edge_raw_image-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -856,7 +856,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -2183,7 +2183,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -4545,5 +4545,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_87-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_87-x86_64-edge_simplified_installer-boot.json index 949be1c38..c850c5d11 100644 --- a/test/data/manifests/rhel_87-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_87-x86_64-edge_simplified_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -969,7 +969,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -4110,7 +4110,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -10020,5 +10020,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_88-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_88-aarch64-edge_installer-boot.json index ad51da78f..c4421565d 100644 --- a/test/data/manifests/rhel_88-aarch64-edge_installer-boot.json +++ b/test/data/manifests/rhel_88-aarch64-edge_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -3775,7 +3775,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6368,7 +6368,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -16331,5 +16331,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_88-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_88-aarch64-edge_installer_with_users-boot.json index 27da5a86b..a88f202ae 100644 --- a/test/data/manifests/rhel_88-aarch64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_88-aarch64-edge_installer_with_users-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -3805,7 +3805,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6420,7 +6420,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -16380,5 +16380,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_88-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_88-aarch64-edge_raw_image-boot.json index cede530d7..aecaf6bc1 100644 --- a/test/data/manifests/rhel_88-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_88-aarch64-edge_raw_image-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -814,7 +814,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -2072,7 +2072,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -4308,5 +4308,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_88-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_88-aarch64-edge_simplified_installer-boot.json index deba5935c..d988c0d14 100644 --- a/test/data/manifests/rhel_88-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_88-aarch64-edge_simplified_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -951,7 +951,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3994,7 +3994,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -9769,5 +9769,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_88-x86_64-edge_commit_with_container-boot.json b/test/data/manifests/rhel_88-x86_64-edge_commit_with_container-boot.json index d5d398a76..0f5175ca8 100644 --- a/test/data/manifests/rhel_88-x86_64-edge_commit_with_container-boot.json +++ b/test/data/manifests/rhel_88-x86_64-edge_commit_with_container-boot.json @@ -8915,14 +8915,6 @@ }, "containers": { "os": [ - { - "Source": "registry.gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/fedora-minimal", - "Digest": "sha256:4d76a7480ce1861c95975945633dc9d03807ffb45c64b664ef22e673798d414b", - "TLSVerify": null, - "ImageID": "sha256:d4ee87dab8193afad523b1042b9d3f5ec887555a704e5aaec2876798ebb585a6", - "LocalName": "registry.gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/fedora-minimal:latest", - "ListDigest": "" - }, { "Source": "registry.gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/manifest-list-test", "Digest": "sha256:601c98c8148720ec5c29b8e854a1d5d88faddbc443eca12920d76cf993d7290e", @@ -8930,6 +8922,14 @@ "ImageID": "sha256:dbb63178dc9157068107961f11397df3fb62c02fa64f697d571bf84aad71cb99", "LocalName": "registry.gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/manifest-list-test:v1", "ListDigest": "sha256:58150862447d05feeb263ddb7257bf11d2ce2a697362ac117de2184d10f028fc" + }, + { + "Source": "registry.gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/fedora-minimal", + "Digest": "sha256:4d76a7480ce1861c95975945633dc9d03807ffb45c64b664ef22e673798d414b", + "TLSVerify": null, + "ImageID": "sha256:d4ee87dab8193afad523b1042b9d3f5ec887555a704e5aaec2876798ebb585a6", + "LocalName": "registry.gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/fedora-minimal:latest", + "ListDigest": "" } ] }, diff --git a/test/data/manifests/rhel_88-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_88-x86_64-edge_installer-boot.json index b891e4a82..9fd37742d 100644 --- a/test/data/manifests/rhel_88-x86_64-edge_installer-boot.json +++ b/test/data/manifests/rhel_88-x86_64-edge_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -3879,7 +3879,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6537,7 +6537,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -16734,5 +16734,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_88-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_88-x86_64-edge_installer_with_users-boot.json index ecadb02e8..382ea3197 100644 --- a/test/data/manifests/rhel_88-x86_64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_88-x86_64-edge_installer_with_users-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -3909,7 +3909,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6589,7 +6589,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -16783,5 +16783,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_88-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_88-x86_64-edge_raw_image-boot.json index 62a49feaf..b953c55b8 100644 --- a/test/data/manifests/rhel_88-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_88-x86_64-edge_raw_image-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -856,7 +856,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -2183,7 +2183,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -4545,5 +4545,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_88-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_88-x86_64-edge_simplified_installer-boot.json index 3b9e31002..45ec466be 100644 --- a/test/data/manifests/rhel_88-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_88-x86_64-edge_simplified_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -969,7 +969,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -4110,7 +4110,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -10020,5 +10020,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_89-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_89-aarch64-edge_installer-boot.json index 249dc3c18..a8b4a6ca5 100644 --- a/test/data/manifests/rhel_89-aarch64-edge_installer-boot.json +++ b/test/data/manifests/rhel_89-aarch64-edge_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -3781,7 +3781,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6380,7 +6380,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -16361,5 +16361,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_89-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_89-aarch64-edge_installer_with_users-boot.json index 1be71943b..72075374b 100644 --- a/test/data/manifests/rhel_89-aarch64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_89-aarch64-edge_installer_with_users-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -3811,7 +3811,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6432,7 +6432,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -16410,5 +16410,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_89-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_89-aarch64-edge_raw_image-boot.json index 55c112639..b5de6775a 100644 --- a/test/data/manifests/rhel_89-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_89-aarch64-edge_raw_image-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -814,7 +814,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -2072,7 +2072,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -4308,5 +4308,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_89-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_89-aarch64-edge_simplified_installer-boot.json index dce6b2a8f..f87e783d1 100644 --- a/test/data/manifests/rhel_89-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_89-aarch64-edge_simplified_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -951,7 +951,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3994,7 +3994,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -9769,5 +9769,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_89-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_89-x86_64-edge_installer-boot.json index bdc94021d..754650d24 100644 --- a/test/data/manifests/rhel_89-x86_64-edge_installer-boot.json +++ b/test/data/manifests/rhel_89-x86_64-edge_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -3885,7 +3885,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6549,7 +6549,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -16764,5 +16764,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_89-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_89-x86_64-edge_installer_with_users-boot.json index bb616c9bb..3dcb56dec 100644 --- a/test/data/manifests/rhel_89-x86_64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_89-x86_64-edge_installer_with_users-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -3915,7 +3915,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6601,7 +6601,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -16813,5 +16813,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_89-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_89-x86_64-edge_raw_image-boot.json index 19d661b0b..2bd5e91f5 100644 --- a/test/data/manifests/rhel_89-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_89-x86_64-edge_raw_image-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -856,7 +856,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -2183,7 +2183,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -4545,5 +4545,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_89-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_89-x86_64-edge_simplified_installer-boot.json index f25c00db3..2333de59e 100644 --- a/test/data/manifests/rhel_89-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_89-x86_64-edge_simplified_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -969,7 +969,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -4110,7 +4110,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -10020,5 +10020,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_9-aarch64-edge_ami-boot.json b/test/data/manifests/rhel_9-aarch64-edge_ami-boot.json index f5126091a..4529040de 100644 --- a/test/data/manifests/rhel_9-aarch64-edge_ami-boot.json +++ b/test/data/manifests/rhel_9-aarch64-edge_ami-boot.json @@ -2188,7 +2188,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3541,7 +3541,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -6194,5 +6194,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_9-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_9-aarch64-edge_installer-boot.json index 640d70c7f..ac090dee2 100644 --- a/test/data/manifests/rhel_9-aarch64-edge_installer-boot.json +++ b/test/data/manifests/rhel_9-aarch64-edge_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -9797,7 +9797,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -12525,7 +12525,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -24203,5 +24203,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_9-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_9-aarch64-edge_installer_with_users-boot.json index f8393f23d..de16606a9 100644 --- a/test/data/manifests/rhel_9-aarch64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_9-aarch64-edge_installer_with_users-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -9827,7 +9827,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -12577,7 +12577,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -24252,5 +24252,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_9-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_9-aarch64-edge_raw_image-boot.json index ff2f05e0c..99310d77e 100644 --- a/test/data/manifests/rhel_9-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_9-aarch64-edge_raw_image-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -2188,7 +2188,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3564,7 +3564,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -6217,5 +6217,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_9-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_9-aarch64-edge_simplified_installer-boot.json index 754f826d3..6be82363e 100644 --- a/test/data/manifests/rhel_9-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_9-aarch64-edge_simplified_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -2572,7 +2572,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -7481,7 +7481,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -14126,5 +14126,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_9-x86_64-edge_ami-boot.json b/test/data/manifests/rhel_9-x86_64-edge_ami-boot.json index 0b8233427..9f7e1a8af 100644 --- a/test/data/manifests/rhel_9-x86_64-edge_ami-boot.json +++ b/test/data/manifests/rhel_9-x86_64-edge_ami-boot.json @@ -2308,7 +2308,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3733,7 +3733,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -6536,5 +6536,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_9-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_9-x86_64-edge_installer-boot.json index e7c5d91ff..d13023ee2 100644 --- a/test/data/manifests/rhel_9-x86_64-edge_installer-boot.json +++ b/test/data/manifests/rhel_9-x86_64-edge_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -9967,7 +9967,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -12736,7 +12736,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -24594,5 +24594,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_9-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_9-x86_64-edge_installer_with_users-boot.json index 2d7725441..ee6b94952 100644 --- a/test/data/manifests/rhel_9-x86_64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_9-x86_64-edge_installer_with_users-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -9997,7 +9997,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -12788,7 +12788,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -24643,5 +24643,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_9-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_9-x86_64-edge_raw_image-boot.json index b846c9908..0bf8232d7 100644 --- a/test/data/manifests/rhel_9-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_9-x86_64-edge_raw_image-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -2308,7 +2308,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3756,7 +3756,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -6559,5 +6559,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_9-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_9-x86_64-edge_simplified_installer-boot.json index 2314213c5..c8db3dc0f 100644 --- a/test/data/manifests/rhel_9-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_9-x86_64-edge_simplified_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -2620,7 +2620,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -7661,7 +7661,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -14446,5 +14446,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_90-aarch64-edge_ami-boot.json b/test/data/manifests/rhel_90-aarch64-edge_ami-boot.json index 7e7f326fa..0c8b68188 100644 --- a/test/data/manifests/rhel_90-aarch64-edge_ami-boot.json +++ b/test/data/manifests/rhel_90-aarch64-edge_ami-boot.json @@ -793,7 +793,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -2074,7 +2074,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -4247,5 +4247,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json index 7960a56f2..acb244dbc 100644 --- a/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json +++ b/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -3820,7 +3820,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6476,7 +6476,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -16556,5 +16556,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json index 1bbeab16d..2b715d198 100644 --- a/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -3850,7 +3850,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6528,7 +6528,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -16605,5 +16605,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_90-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_90-aarch64-edge_raw_image-boot.json index d2145fbaa..2ce6c4167 100644 --- a/test/data/manifests/rhel_90-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_90-aarch64-edge_raw_image-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -793,7 +793,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -2097,7 +2097,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -4270,5 +4270,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json index e0b44e94a..8931a82dc 100644 --- a/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -942,7 +942,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -4043,7 +4043,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -9800,5 +9800,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_90-x86_64-edge_ami-boot.json b/test/data/manifests/rhel_90-x86_64-edge_ami-boot.json index 2c5857ff5..cc533dd68 100644 --- a/test/data/manifests/rhel_90-x86_64-edge_ami-boot.json +++ b/test/data/manifests/rhel_90-x86_64-edge_ami-boot.json @@ -841,7 +841,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -2197,7 +2197,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -4514,5 +4514,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_90-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_90-x86_64-edge_installer-boot.json index 912566c2c..568cae7b6 100644 --- a/test/data/manifests/rhel_90-x86_64-edge_installer-boot.json +++ b/test/data/manifests/rhel_90-x86_64-edge_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -3909,7 +3909,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6612,7 +6612,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -16881,5 +16881,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_90-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_90-x86_64-edge_installer_with_users-boot.json index d89048d76..f0614ab5d 100644 --- a/test/data/manifests/rhel_90-x86_64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_90-x86_64-edge_installer_with_users-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -3939,7 +3939,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -6664,7 +6664,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -16930,5 +16930,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_90-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_90-x86_64-edge_raw_image-boot.json index 3735e24a3..6c32f6ce9 100644 --- a/test/data/manifests/rhel_90-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_90-x86_64-edge_raw_image-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -841,7 +841,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -2220,7 +2220,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -4537,5 +4537,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json index 1f434c3b8..b0b2fe3cd 100644 --- a/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json @@ -19,7 +19,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -963,7 +963,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -4162,7 +4162,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -10063,5 +10063,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_91-aarch64-edge_ami-boot.json b/test/data/manifests/rhel_91-aarch64-edge_ami-boot.json index b9b426766..b041499b3 100644 --- a/test/data/manifests/rhel_91-aarch64-edge_ami-boot.json +++ b/test/data/manifests/rhel_91-aarch64-edge_ami-boot.json @@ -2188,7 +2188,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3541,7 +3541,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -6194,5 +6194,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json index f765eb9ea..1220ca10a 100644 --- a/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json +++ b/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -9797,7 +9797,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -12525,7 +12525,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -24203,5 +24203,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json index d01896c56..c86887325 100644 --- a/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -9827,7 +9827,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -12577,7 +12577,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -24252,5 +24252,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_91-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_91-aarch64-edge_raw_image-boot.json index 524acc8d3..f1bd113c0 100644 --- a/test/data/manifests/rhel_91-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_91-aarch64-edge_raw_image-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -2188,7 +2188,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3564,7 +3564,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -6217,5 +6217,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_91-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_91-aarch64-edge_simplified_installer-boot.json index d7cfb11b1..5f918be8f 100644 --- a/test/data/manifests/rhel_91-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_91-aarch64-edge_simplified_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -2572,7 +2572,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -7481,7 +7481,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -14126,5 +14126,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_91-x86_64-edge_ami-boot.json b/test/data/manifests/rhel_91-x86_64-edge_ami-boot.json index b9a721c29..70f9ba491 100644 --- a/test/data/manifests/rhel_91-x86_64-edge_ami-boot.json +++ b/test/data/manifests/rhel_91-x86_64-edge_ami-boot.json @@ -2308,7 +2308,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3733,7 +3733,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -6536,5 +6536,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_91-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_91-x86_64-edge_installer-boot.json index 435033d25..0ed02a555 100644 --- a/test/data/manifests/rhel_91-x86_64-edge_installer-boot.json +++ b/test/data/manifests/rhel_91-x86_64-edge_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -9967,7 +9967,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -12736,7 +12736,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -24594,5 +24594,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_91-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_91-x86_64-edge_installer_with_users-boot.json index 5622ac13e..c58c078fe 100644 --- a/test/data/manifests/rhel_91-x86_64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_91-x86_64-edge_installer_with_users-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -9997,7 +9997,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -12788,7 +12788,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -24643,5 +24643,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_91-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_91-x86_64-edge_raw_image-boot.json index c1f411761..c6c3c2dab 100644 --- a/test/data/manifests/rhel_91-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_91-x86_64-edge_raw_image-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -2308,7 +2308,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3756,7 +3756,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -6559,5 +6559,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_91-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_91-x86_64-edge_simplified_installer-boot.json index 4f8f0446a..7381065b6 100644 --- a/test/data/manifests/rhel_91-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_91-x86_64-edge_simplified_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -2620,7 +2620,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -7661,7 +7661,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -14446,5 +14446,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_92-aarch64-edge_ami-boot.json b/test/data/manifests/rhel_92-aarch64-edge_ami-boot.json index 0a0b423d4..8d1732e82 100644 --- a/test/data/manifests/rhel_92-aarch64-edge_ami-boot.json +++ b/test/data/manifests/rhel_92-aarch64-edge_ami-boot.json @@ -2131,7 +2131,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3477,7 +3477,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -6060,5 +6060,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_92-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_92-aarch64-edge_installer-boot.json index e6d70c5c4..527d10b9b 100644 --- a/test/data/manifests/rhel_92-aarch64-edge_installer-boot.json +++ b/test/data/manifests/rhel_92-aarch64-edge_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -9732,7 +9732,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -12457,7 +12457,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -24055,5 +24055,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_92-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_92-aarch64-edge_installer_with_users-boot.json index 900c7ad8f..df91219e0 100644 --- a/test/data/manifests/rhel_92-aarch64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_92-aarch64-edge_installer_with_users-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -9762,7 +9762,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -12509,7 +12509,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -24104,5 +24104,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_92-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_92-aarch64-edge_raw_image-boot.json index 75a457479..8d3929ad4 100644 --- a/test/data/manifests/rhel_92-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_92-aarch64-edge_raw_image-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -2131,7 +2131,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3500,7 +3500,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -6083,5 +6083,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_92-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_92-aarch64-edge_simplified_installer-boot.json index 19fa4ec8b..0c1c977bb 100644 --- a/test/data/manifests/rhel_92-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_92-aarch64-edge_simplified_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -2515,7 +2515,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -7415,7 +7415,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -13980,5 +13980,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_92-x86_64-edge_ami-boot.json b/test/data/manifests/rhel_92-x86_64-edge_ami-boot.json index 813515209..0636b8622 100644 --- a/test/data/manifests/rhel_92-x86_64-edge_ami-boot.json +++ b/test/data/manifests/rhel_92-x86_64-edge_ami-boot.json @@ -2251,7 +2251,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3669,7 +3669,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -6402,5 +6402,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_92-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_92-x86_64-edge_installer-boot.json index dead4a5b9..f12938a08 100644 --- a/test/data/manifests/rhel_92-x86_64-edge_installer-boot.json +++ b/test/data/manifests/rhel_92-x86_64-edge_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -9910,7 +9910,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -12679,7 +12679,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -24467,5 +24467,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_92-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_92-x86_64-edge_installer_with_users-boot.json index 5324c2041..9f322f68b 100644 --- a/test/data/manifests/rhel_92-x86_64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_92-x86_64-edge_installer_with_users-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -9940,7 +9940,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -12731,7 +12731,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -24516,5 +24516,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_92-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_92-x86_64-edge_raw_image-boot.json index e65136d5f..007ce9e53 100644 --- a/test/data/manifests/rhel_92-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_92-x86_64-edge_raw_image-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -2251,7 +2251,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3692,7 +3692,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -6425,5 +6425,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_92-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_92-x86_64-edge_simplified_installer-boot.json index bfdf1c782..b75012df0 100644 --- a/test/data/manifests/rhel_92-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_92-x86_64-edge_simplified_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -2563,7 +2563,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -7595,7 +7595,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -14300,5 +14300,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_93-aarch64-edge_ami-boot.json b/test/data/manifests/rhel_93-aarch64-edge_ami-boot.json index a0ce72cca..40ab481e7 100644 --- a/test/data/manifests/rhel_93-aarch64-edge_ami-boot.json +++ b/test/data/manifests/rhel_93-aarch64-edge_ami-boot.json @@ -2188,7 +2188,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3555,7 +3555,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -6208,5 +6208,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_93-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_93-aarch64-edge_installer-boot.json index 3b9e30756..9813a2b31 100644 --- a/test/data/manifests/rhel_93-aarch64-edge_installer-boot.json +++ b/test/data/manifests/rhel_93-aarch64-edge_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -9837,7 +9837,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -12580,7 +12580,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -24308,5 +24308,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_93-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_93-aarch64-edge_installer_with_users-boot.json index eefa8dd18..1b4b8b15c 100644 --- a/test/data/manifests/rhel_93-aarch64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_93-aarch64-edge_installer_with_users-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -9867,7 +9867,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -12632,7 +12632,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -24357,5 +24357,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_93-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_93-aarch64-edge_raw_image-boot.json index 976e79484..6810158b9 100644 --- a/test/data/manifests/rhel_93-aarch64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_93-aarch64-edge_raw_image-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -2188,7 +2188,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3578,7 +3578,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -6231,5 +6231,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_93-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_93-aarch64-edge_simplified_installer-boot.json index eb1ac4495..64957b73f 100644 --- a/test/data/manifests/rhel_93-aarch64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_93-aarch64-edge_simplified_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -2572,7 +2572,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -7498,7 +7498,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -14143,5 +14143,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_93-x86_64-edge_ami-boot.json b/test/data/manifests/rhel_93-x86_64-edge_ami-boot.json index 85d0d2a25..f29c5272d 100644 --- a/test/data/manifests/rhel_93-x86_64-edge_ami-boot.json +++ b/test/data/manifests/rhel_93-x86_64-edge_ami-boot.json @@ -2308,7 +2308,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3747,7 +3747,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -6550,5 +6550,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_93-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_93-x86_64-edge_installer-boot.json index 2920fdcce..d86e011e6 100644 --- a/test/data/manifests/rhel_93-x86_64-edge_installer-boot.json +++ b/test/data/manifests/rhel_93-x86_64-edge_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": true }, "blueprint": {} @@ -10015,7 +10015,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -12802,7 +12802,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo", "secrets": { @@ -24720,5 +24720,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "org.osbuild.rhsm.consumer", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_93-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_93-x86_64-edge_installer_with_users-boot.json index 2d67ed892..a78fd06ec 100644 --- a/test/data/manifests/rhel_93-x86_64-edge_installer_with_users-boot.json +++ b/test/data/manifests/rhel_93-x86_64-edge_installer_with_users-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -10045,7 +10045,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -12854,7 +12854,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -24769,5 +24769,16 @@ } ] }, + "ostree-commits": { + "bootiso-tree": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_93-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_93-x86_64-edge_raw_image-boot.json index 1c98a4d11..033f160f0 100644 --- a/test/data/manifests/rhel_93-x86_64-edge_raw_image-boot.json +++ b/test/data/manifests/rhel_93-x86_64-edge_raw_image-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": {} @@ -2308,7 +2308,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -3770,7 +3770,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -6573,5 +6573,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true } diff --git a/test/data/manifests/rhel_93-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_93-x86_64-edge_simplified_installer-boot.json index 5f1e6e59e..362464e12 100644 --- a/test/data/manifests/rhel_93-x86_64-edge_simplified_installer-boot.json +++ b/test/data/manifests/rhel_93-x86_64-edge_simplified_installer-boot.json @@ -21,7 +21,7 @@ "ostree": { "ref": "test/edge", "url": "http://edge.example.com/repo", - "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "parent": "", "rhsm": false }, "blueprint": { @@ -2620,7 +2620,7 @@ "type": "org.osbuild.ostree", "origin": "org.osbuild.source", "references": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "ref": "test/edge" } } @@ -7678,7 +7678,7 @@ }, "org.osbuild.ostree": { "items": { - "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": { + "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad": { "remote": { "url": "http://edge.example.com/repo" } @@ -14463,5 +14463,16 @@ } ] }, + "ostree-commits": { + "ostree-deployment": [ + { + "Ref": "test/edge", + "URL": "http://edge.example.com/repo", + "ContentURL": "", + "Secrets": "", + "Checksum": "8119013dc0bbd4a0140d7392c3a07395399d5a12112f911bd3fc37ba6b7df6ad" + } + ] + }, "no-image-info": true }