Skip to content

Commit 1185b7a

Browse files
PeaceRebeldustymabe
PeaceRebel
authored and
dustymabe
committed
cmd-import: Add container labels to meta.json
kola needs to use `stream` to run upgrade tests.
1 parent 656d1b0 commit 1185b7a

File tree

5 files changed

+83
-59
lines changed

5 files changed

+83
-59
lines changed

‎pkg/builds/cosa_v1.go‎

Lines changed: 58 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package builds
22

33
// generated by 'make schema'
4-
// source hash: 445150ada0fe019c7bb33c793185b312111ed7538a59e1a0b424c10c6c2dbc0d
4+
// source hash: 4289a52f5ee4665caa5432d9caa653b74605117632ac045955912e624d149524
55

66
type AdvisoryDiff []AdvisoryDiffItems
77

@@ -34,60 +34,61 @@ type AwsWinLiAmis struct {
3434
}
3535

3636
type Build struct {
37-
AdvisoryDiffAgainstParent AdvisoryDiff `json:"parent-advisories-diff,omitempty"`
38-
AdvisoryDiffBetweenBuilds AdvisoryDiff `json:"advisories-diff,omitempty"`
39-
AlibabaAliyunUploads []AliyunImage `json:"aliyun,omitempty"`
40-
Amis []Amis `json:"amis,omitempty"`
41-
Architecture string `json:"coreos-assembler.basearch,omitempty"`
42-
AwsWinLi []AwsWinLiAmis `json:"aws-winli,omitempty"`
43-
Azure *Cloudartifact `json:"azure,omitempty"`
44-
BaseOsContainer *PrimaryImage `json:"base-oscontainer,omitempty"`
45-
BuildArtifacts *BuildArtifacts `json:"images,omitempty"`
46-
BuildID string `json:"buildid"`
47-
BuildRef string `json:"ref,omitempty"`
48-
BuildSummary string `json:"summary,omitempty"`
49-
BuildTimeStamp string `json:"coreos-assembler.build-timestamp,omitempty"`
50-
BuildURL string `json:"build-url,omitempty"`
51-
ConfigGitRev string `json:"coreos-assembler.config-gitrev,omitempty"`
52-
ConfigVariant string `json:"coreos-assembler.config-variant,omitempty"`
53-
ContainerConfigGit *Git `json:"coreos-assembler.container-config-git,omitempty"`
54-
CoreOsSource string `json:"coreos-assembler.code-source,omitempty"`
55-
CosaContainerImageGit *Git `json:"coreos-assembler.container-image-git,omitempty"`
56-
CosaDelayedMetaMerge bool `json:"coreos-assembler.delayed-meta-merge,omitempty"`
57-
CosaImageChecksum string `json:"coreos-assembler.image-config-checksum,omitempty"`
58-
CosaImageVersion int `json:"coreos-assembler.image-genver,omitempty"`
59-
CosaImportedOciImage bool `json:"coreos-assembler.oci-imported,omitempty"`
60-
Extensions *Extensions `json:"extensions,omitempty"`
61-
ExtensionsContainer *PrimaryImage `json:"extensions-container,omitempty"`
62-
FedoraCoreOsParentCommit string `json:"fedora-coreos.parent-commit,omitempty"`
63-
FedoraCoreOsParentVersion string `json:"fedora-coreos.parent-version,omitempty"`
64-
Gcp *Gcp `json:"gcp,omitempty"`
65-
GitDirty string `json:"coreos-assembler.config-dirty,omitempty"`
66-
IbmCloud []Cloudartifact `json:"ibmcloud,omitempty"`
67-
ImageInputChecksum string `json:"coreos-assembler.image-input-checksum,omitempty"`
68-
InputHashOfTheRpmOstree string `json:"rpm-ostree-inputhash,omitempty"`
69-
Koji *Koji `json:"koji,omitempty"`
70-
KubevirtContainer *PrimaryImage `json:"kubevirt,omitempty"`
71-
MetaStamp float64 `json:"coreos-assembler.meta-stamp,omitempty"`
72-
Name string `json:"name"`
73-
Oscontainer *PrimaryImage `json:"oscontainer,omitempty"`
74-
OstreeCommit string `json:"ostree-commit"`
75-
OstreeContentBytesWritten int `json:"ostree-content-bytes-written,omitempty"`
76-
OstreeContentChecksum string `json:"ostree-content-checksum,omitempty"`
77-
OstreeNCacheHits int `json:"ostree-n-cache-hits,omitempty"`
78-
OstreeNContentTotal int `json:"ostree-n-content-total,omitempty"`
79-
OstreeNContentWritten int `json:"ostree-n-content-written,omitempty"`
80-
OstreeNMetadataTotal int `json:"ostree-n-metadata-total,omitempty"`
81-
OstreeNMetadataWritten int `json:"ostree-n-metadata-written,omitempty"`
82-
OstreeTimestamp string `json:"ostree-timestamp"`
83-
OstreeVersion string `json:"ostree-version"`
84-
OverridesActive bool `json:"coreos-assembler.overrides-active,omitempty"`
85-
PkgdiffAgainstParent PackageSetDifferences `json:"parent-pkgdiff,omitempty"`
86-
PkgdiffBetweenBuilds PackageSetDifferences `json:"pkgdiff,omitempty"`
87-
PowerVirtualServer []Cloudartifact `json:"powervs,omitempty"`
88-
ReleasePayload *Image `json:"release-payload,omitempty"`
89-
S3 *S3 `json:"s3,omitempty"`
90-
YumReposGit *Git `json:"coreos-assembler.yumrepos-git,omitempty"`
37+
AdvisoryDiffAgainstParent AdvisoryDiff `json:"parent-advisories-diff,omitempty"`
38+
AdvisoryDiffBetweenBuilds AdvisoryDiff `json:"advisories-diff,omitempty"`
39+
AlibabaAliyunUploads []AliyunImage `json:"aliyun,omitempty"`
40+
Amis []Amis `json:"amis,omitempty"`
41+
Architecture string `json:"coreos-assembler.basearch,omitempty"`
42+
AwsWinLi []AwsWinLiAmis `json:"aws-winli,omitempty"`
43+
Azure *Cloudartifact `json:"azure,omitempty"`
44+
BaseOsContainer *PrimaryImage `json:"base-oscontainer,omitempty"`
45+
BuildArtifacts *BuildArtifacts `json:"images,omitempty"`
46+
BuildID string `json:"buildid"`
47+
BuildRef string `json:"ref,omitempty"`
48+
BuildSummary string `json:"summary,omitempty"`
49+
BuildTimeStamp string `json:"coreos-assembler.build-timestamp,omitempty"`
50+
BuildURL string `json:"build-url,omitempty"`
51+
ConfigGitRev string `json:"coreos-assembler.config-gitrev,omitempty"`
52+
ConfigVariant string `json:"coreos-assembler.config-variant,omitempty"`
53+
ContainerConfigGit *Git `json:"coreos-assembler.container-config-git,omitempty"`
54+
CoreOsSource string `json:"coreos-assembler.code-source,omitempty"`
55+
CosaContainerImageGit *Git `json:"coreos-assembler.container-image-git,omitempty"`
56+
CosaDelayedMetaMerge bool `json:"coreos-assembler.delayed-meta-merge,omitempty"`
57+
CosaImageChecksum string `json:"coreos-assembler.image-config-checksum,omitempty"`
58+
CosaImageVersion int `json:"coreos-assembler.image-genver,omitempty"`
59+
CosaImportedOciImage bool `json:"coreos-assembler.oci-imported,omitempty"`
60+
Extensions *Extensions `json:"extensions,omitempty"`
61+
ExtensionsContainer *PrimaryImage `json:"extensions-container,omitempty"`
62+
FedoraCoreOsParentCommit string `json:"fedora-coreos.parent-commit,omitempty"`
63+
FedoraCoreOsParentVersion string `json:"fedora-coreos.parent-version,omitempty"`
64+
Gcp *Gcp `json:"gcp,omitempty"`
65+
GitDirty string `json:"coreos-assembler.config-dirty,omitempty"`
66+
IbmCloud []Cloudartifact `json:"ibmcloud,omitempty"`
67+
ImageInputChecksum string `json:"coreos-assembler.image-input-checksum,omitempty"`
68+
InputHashOfTheRpmOstree string `json:"rpm-ostree-inputhash,omitempty"`
69+
Koji *Koji `json:"koji,omitempty"`
70+
KubevirtContainer *PrimaryImage `json:"kubevirt,omitempty"`
71+
MetaStamp float64 `json:"coreos-assembler.meta-stamp,omitempty"`
72+
Name string `json:"name"`
73+
OciLabels map[string]CoreosAssemblerOciImportedLabel `json:"coreos-assembler.oci-imported-labels,omitempty"`
74+
Oscontainer *PrimaryImage `json:"oscontainer,omitempty"`
75+
OstreeCommit string `json:"ostree-commit"`
76+
OstreeContentBytesWritten int `json:"ostree-content-bytes-written,omitempty"`
77+
OstreeContentChecksum string `json:"ostree-content-checksum,omitempty"`
78+
OstreeNCacheHits int `json:"ostree-n-cache-hits,omitempty"`
79+
OstreeNContentTotal int `json:"ostree-n-content-total,omitempty"`
80+
OstreeNContentWritten int `json:"ostree-n-content-written,omitempty"`
81+
OstreeNMetadataTotal int `json:"ostree-n-metadata-total,omitempty"`
82+
OstreeNMetadataWritten int `json:"ostree-n-metadata-written,omitempty"`
83+
OstreeTimestamp string `json:"ostree-timestamp"`
84+
OstreeVersion string `json:"ostree-version"`
85+
OverridesActive bool `json:"coreos-assembler.overrides-active,omitempty"`
86+
PkgdiffAgainstParent PackageSetDifferences `json:"parent-pkgdiff,omitempty"`
87+
PkgdiffBetweenBuilds PackageSetDifferences `json:"pkgdiff,omitempty"`
88+
PowerVirtualServer []Cloudartifact `json:"powervs,omitempty"`
89+
ReleasePayload *Image `json:"release-payload,omitempty"`
90+
S3 *S3 `json:"s3,omitempty"`
91+
YumReposGit *Git `json:"coreos-assembler.yumrepos-git,omitempty"`
9192
}
9293

9394
type BuildArtifacts struct {
@@ -138,6 +139,8 @@ type Cloudartifact struct {
138139
URL string `json:"url"`
139140
}
140141

142+
type CoreosAssemblerOciImportedLabel string
143+
141144
type Extensions struct {
142145
Manifest map[string]interface{} `json:"manifest"`
143146
Path string `json:"path,omitempty"`

‎pkg/builds/schema_doc.go‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Generated by ./generate-schema.sh
2-
// Source hash: 445150ada0fe019c7bb33c793185b312111ed7538a59e1a0b424c10c6c2dbc0d
2+
// Source hash: 4289a52f5ee4665caa5432d9caa653b74605117632ac045955912e624d149524
33
// DO NOT EDIT
44

55
package builds
@@ -297,7 +297,8 @@ var generatedSchemaJSON = `{
297297
"coreos-assembler.meta-stamp",
298298
"coreos-assembler.overrides-active",
299299
"coreos-assembler.yumrepos-git",
300-
"coreos-assembeler.oci-imported",
300+
"coreos-assembler.oci-imported",
301+
"coreos-assembler.oci-imported-labels",
301302
"fedora-coreos.parent-commit",
302303
"fedora-coreos.parent-version",
303304
"ref"
@@ -385,6 +386,15 @@ var generatedSchemaJSON = `{
385386
"title": "COSA imported OCI image",
386387
"default": "False"
387388
},
389+
"coreos-assembler.oci-imported-labels": {
390+
"$id": "#/properties/coreos-assembler.oci-imported-labels",
391+
"type": "object",
392+
"title": "OCI Labels",
393+
"default": {},
394+
"additionalProperties": {
395+
"type": "string"
396+
}
397+
},
388398
"coreos-assembler.code-source": {
389399
"$id": "#/properties/coreos-assembler.code-source",
390400
"type": "string",

‎src/cmd-coreos-prune‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Build = collections.namedtuple("Build", ["id", "images", "arch", "meta_json"])
5555
# set metadata caching to 5m
5656
CACHE_MAX_AGE_METADATA = 60 * 5
5757
# These lists are up to date as of schema hash
58-
# 445150ada0fe019c7bb33c793185b312111ed7538a59e1a0b424c10c6c2dbc0d. If changing
58+
# 4289a52f5ee4665caa5432d9caa653b74605117632ac045955912e624d149524. If changing
5959
# this hash, ensure that the list of SUPPORTED and UNSUPPORTED artifacts below
6060
# is up to date.
6161
SUPPORTED = ["amis", "aws-winli", "gcp"]

‎src/cmd-import‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ def generate_build_meta(tmp_oci_archive, tmp_oci_manifest, metadata, ostree_comm
127127
'coreos-assembler.basearch': arch,
128128
'coreos-assembler.build-timestamp': created_timestamp,
129129
'coreos-assembler.oci-imported': True,
130+
'coreos-assembler.oci-imported-labels': metadata.get('Labels', {}),
130131
'ostree-timestamp': created_timestamp,
131132
'images': {
132133
'ostree': {

‎src/v1.json‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,8 @@
291291
"coreos-assembler.meta-stamp",
292292
"coreos-assembler.overrides-active",
293293
"coreos-assembler.yumrepos-git",
294-
"coreos-assembeler.oci-imported",
294+
"coreos-assembler.oci-imported",
295+
"coreos-assembler.oci-imported-labels",
295296
"fedora-coreos.parent-commit",
296297
"fedora-coreos.parent-version",
297298
"ref"
@@ -379,6 +380,15 @@
379380
"title": "COSA imported OCI image",
380381
"default": "False"
381382
},
383+
"coreos-assembler.oci-imported-labels": {
384+
"$id": "#/properties/coreos-assembler.oci-imported-labels",
385+
"type": "object",
386+
"title": "OCI Labels",
387+
"default": {},
388+
"additionalProperties": {
389+
"type": "string"
390+
}
391+
},
382392
"coreos-assembler.code-source": {
383393
"$id": "#/properties/coreos-assembler.code-source",
384394
"type": "string",

0 commit comments

Comments
 (0)