manifest: image-tree -> ostree-deployment

Describes much better what the pipeline actually does.
This commit is contained in:
Simon de Vlieger 2023-04-13 11:10:15 +02:00
parent 66345cf54c
commit 8041563a36
60 changed files with 118 additions and 118 deletions

View file

@ -166,7 +166,7 @@ var (
bootable: true,
image: iotRawImage,
buildPipelines: []string{"build"},
payloadPipelines: []string{"image-tree", "image", "xz"},
payloadPipelines: []string{"ostree-deployment", "image", "xz"},
exports: []string{"xz"},
basePartitionTables: iotBasePartitionTables,

View file

@ -69,7 +69,7 @@ func edgeRawImgType() imageType {
bootISO: false,
image: edgeRawImage,
buildPipelines: []string{"build"},
payloadPipelines: []string{"image-tree", "image", "xz"},
payloadPipelines: []string{"ostree-deployment", "image", "xz"},
exports: []string{"xz"},
basePartitionTables: edgeBasePartitionTables,
}
@ -130,7 +130,7 @@ func edgeSimplifiedInstallerImgType(rd distribution) imageType {
bootISO: true,
image: edgeSimplifiedInstallerImage,
buildPipelines: []string{"build"},
payloadPipelines: []string{"image-tree", "image", "xz", "coi-tree", "efiboot-tree", "bootiso-tree", "bootiso"},
payloadPipelines: []string{"ostree-deployment", "image", "xz", "coi-tree", "efiboot-tree", "bootiso-tree", "bootiso"},
exports: []string{"bootiso"},
basePartitionTables: edgeBasePartitionTables,
}

View file

@ -68,7 +68,7 @@ var (
bootISO: false,
image: edgeRawImage,
buildPipelines: []string{"build"},
payloadPipelines: []string{"image-tree", "image", "xz"},
payloadPipelines: []string{"ostree-deployment", "image", "xz"},
exports: []string{"xz"},
basePartitionTables: edgeBasePartitionTables,
}
@ -124,7 +124,7 @@ var (
bootISO: true,
image: edgeSimplifiedInstallerImage,
buildPipelines: []string{"build"},
payloadPipelines: []string{"image-tree", "image", "xz", "coi-tree", "efiboot-tree", "bootiso-tree", "bootiso"},
payloadPipelines: []string{"ostree-deployment", "image", "xz", "coi-tree", "efiboot-tree", "bootiso-tree", "bootiso"},
exports: []string{"bootiso"},
basePartitionTables: edgeBasePartitionTables,
}

View file

@ -52,7 +52,7 @@ func NewOSTreeDeployment(m *Manifest,
platform platform.Platform) *OSTreeDeployment {
p := &OSTreeDeployment{
Base: NewBase(m, "image-tree", buildPipeline),
Base: NewBase(m, "ostree-deployment", buildPipeline),
commit: commit,
osName: osName,
platform: platform,

View file

@ -2046,7 +2046,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2460,7 +2460,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2398,7 +2398,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2812,7 +2812,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2158,7 +2158,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2580,7 +2580,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2446,7 +2446,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2867,7 +2867,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2110,7 +2110,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2574,7 +2574,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2494,7 +2494,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2958,7 +2958,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2237,7 +2237,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2709,7 +2709,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2549,7 +2549,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -3020,7 +3020,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2015,7 +2015,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2380,7 +2380,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2023,7 +2023,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2390,7 +2390,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2031,7 +2031,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2396,7 +2396,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2039,7 +2039,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2406,7 +2406,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -1846,7 +1846,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2211,7 +2211,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -1854,7 +1854,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2221,7 +2221,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -1862,7 +1862,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2227,7 +2227,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -1862,7 +1862,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2229,7 +2229,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -801,7 +801,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1215,7 +1215,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -938,7 +938,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1352,7 +1352,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -843,7 +843,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1265,7 +1265,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -956,7 +956,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1377,7 +1377,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -801,7 +801,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1215,7 +1215,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -941,7 +941,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1355,7 +1355,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -843,7 +843,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1265,7 +1265,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -959,7 +959,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1380,7 +1380,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -801,7 +801,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1215,7 +1215,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -938,7 +938,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1352,7 +1352,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -843,7 +843,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1265,7 +1265,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -956,7 +956,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1377,7 +1377,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -801,7 +801,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1215,7 +1215,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -938,7 +938,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1352,7 +1352,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -843,7 +843,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1265,7 +1265,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -956,7 +956,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1377,7 +1377,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -801,7 +801,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1215,7 +1215,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -938,7 +938,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1352,7 +1352,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -843,7 +843,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1265,7 +1265,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -956,7 +956,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1377,7 +1377,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2175,7 +2175,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2625,7 +2625,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2559,7 +2559,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -3009,7 +3009,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2295,7 +2295,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2753,7 +2753,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2607,7 +2607,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -3064,7 +3064,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -780,7 +780,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1230,7 +1230,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -929,7 +929,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1379,7 +1379,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -828,7 +828,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1286,7 +1286,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -950,7 +950,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -1407,7 +1407,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2175,7 +2175,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2625,7 +2625,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2559,7 +2559,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -3009,7 +3009,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2295,7 +2295,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2753,7 +2753,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2607,7 +2607,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -3064,7 +3064,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2118,7 +2118,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2582,7 +2582,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2502,7 +2502,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2966,7 +2966,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2238,7 +2238,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2710,7 +2710,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2550,7 +2550,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -3021,7 +3021,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2175,7 +2175,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2639,7 +2639,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2559,7 +2559,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -3023,7 +3023,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2295,7 +2295,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -2767,7 +2767,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},

View file

@ -2607,7 +2607,7 @@
]
},
{
"name": "image-tree",
"name": "ostree-deployment",
"build": "name:build",
"stages": [
{
@ -3078,7 +3078,7 @@
"type": "org.osbuild.tree",
"origin": "org.osbuild.pipeline",
"references": [
"name:image-tree"
"name:ostree-deployment"
]
}
},