gen-manifests: add ostree rhsm option
This commit is contained in:
parent
cb127cd1b0
commit
369f237d89
3 changed files with 5 additions and 1 deletions
|
|
@ -53,6 +53,7 @@ type ostreeOptions struct {
|
||||||
Ref string `json:"ref"`
|
Ref string `json:"ref"`
|
||||||
URL string `json:"url"`
|
URL string `json:"url"`
|
||||||
Parent string `json:"parent"`
|
Parent string `json:"parent"`
|
||||||
|
RHSM bool `json:"rhsm"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type crBlueprint struct {
|
type crBlueprint struct {
|
||||||
|
|
@ -120,6 +121,7 @@ func makeManifestJob(name string, imgType distro.ImageType, cr composeRequest, d
|
||||||
URL: cr.OSTree.URL,
|
URL: cr.OSTree.URL,
|
||||||
ImageRef: cr.OSTree.Ref,
|
ImageRef: cr.OSTree.Ref,
|
||||||
FetchChecksum: cr.OSTree.Parent,
|
FetchChecksum: cr.OSTree.Parent,
|
||||||
|
RHSM: cr.OSTree.RHSM,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -95,6 +95,7 @@ func TestDistro_Manifest(t *testing.T, pipelinePath string, prefix string, regis
|
||||||
ImageRef: tt.ComposeRequest.OSTree.Ref,
|
ImageRef: tt.ComposeRequest.OSTree.Ref,
|
||||||
FetchChecksum: tt.ComposeRequest.OSTree.Parent,
|
FetchChecksum: tt.ComposeRequest.OSTree.Parent,
|
||||||
URL: tt.ComposeRequest.OSTree.URL,
|
URL: tt.ComposeRequest.OSTree.URL,
|
||||||
|
RHSM: tt.ComposeRequest.OSTree.RHSM,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -538,7 +538,8 @@
|
||||||
"ostree": {
|
"ostree": {
|
||||||
"ref": "test/edge",
|
"ref": "test/edge",
|
||||||
"url": "http://edge.example.com/repo",
|
"url": "http://edge.example.com/repo",
|
||||||
"parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
|
"parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
|
||||||
|
"rhsm": true
|
||||||
},
|
},
|
||||||
"blueprint": {}
|
"blueprint": {}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue