osbuild.py/pipeline: add the concept of a content store

Whenever an assembler is not specified, the output tree is instead
saved to the content store, in a directory named after the pipeline
id.

This should render the io.weldr.tree assembler redundant.

In order to build the samples as before, specify the content store
as the input directory to build any pipeline that uses the
io.weldr.untree stage.

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2019-07-02 21:52:54 +02:00 committed by Lars Karlitski
parent f25cffa151
commit e607053c32
8 changed files with 26 additions and 37 deletions

View file

@ -4,7 +4,7 @@
{
"name": "io.weldr.untree",
"options": {
"tree": "base-with-grub2"
"tree": "efc7b094c174d9f5fd66c863db7128415f5df0f073125716f5279554f13a659f"
}
}
],

View file

@ -4,7 +4,7 @@
{
"name": "io.weldr.untree",
"options": {
"tree": "base"
"tree": "1f663f817473ffa5b01241b17adbd71bc734962313f5d4eef230073c0ac5884e"
}
}
],

View file

@ -4,7 +4,7 @@
{
"name": "io.weldr.untree",
"options": {
"tree": "base"
"tree": "1f663f817473ffa5b01241b17adbd71bc734962313f5d4eef230073c0ac5884e"
}
},
{
@ -15,11 +15,5 @@
"partition_table_id": "0xdeadbeef"
}
}
],
"assembler": {
"name": "io.weldr.tree",
"options": {
"tree": "base-with-grub2"
}
}
]
}

View file

@ -2,9 +2,9 @@
"name": "base-with-locale",
"stages": [
{
"name": "io.weldr.untargz",
"name": "io.weldr.untree",
"options": {
"filename": "base.tar.gz"
"tree": "1f663f817473ffa5b01241b17adbd71bc734962313f5d4eef230073c0ac5884e"
}
},
{
@ -13,11 +13,5 @@
"language": "en_US"
}
}
],
"assembler": {
"name": "io.weldr.tree",
"options": {
"tree": "base-with-locale"
}
}
]
}

View file

@ -4,7 +4,7 @@
{
"name": "io.weldr.untree",
"options": {
"tree": "base"
"tree": "1f663f817473ffa5b01241b17adbd71bc734962313f5d4eef230073c0ac5884e"
}
},
{
@ -13,11 +13,5 @@
"file_contexts": "etc/selinux/targeted/contexts/files/file_contexts"
}
}
],
"assembler": {
"name": "io.weldr.tree",
"options": {
"tree": "base-with-selinux"
}
}
]
}

View file

@ -20,12 +20,5 @@
]
}
}
],
"assembler":
{
"name": "io.weldr.tree",
"options": {
"tree": "base"
}
}
]
}