Skip to content

Commit

Permalink
Merge 8ba4689 into 40a7aa7
Browse files Browse the repository at this point in the history
  • Loading branch information
lipoja authored Mar 25, 2021
2 parents 40a7aa7 + 8ba4689 commit 62e34c8
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 3 deletions.
5 changes: 4 additions & 1 deletion src/cdn_definitions/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@
"0.0"
]
},
"rhel_open_dist": [
0
],
"rhui_alias": [
{
"dest": "/content/aus/rhel8",
Expand Down Expand Up @@ -188,5 +191,5 @@
"tps_variant_mappings": {
"example-arch": "Example-Variant"
},
"version": "1.1.0"
"version": "1.2.0"
}
7 changes: 6 additions & 1 deletion src/cdn_definitions/data.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
# Version of this data structure's format.
# Version string is maintained in accordance with SemVer.
version: "1.1.0"
version: "1.2.0"

# Aliases between paths used for consuming content under RHUI entitlements.
#
Expand Down Expand Up @@ -189,3 +189,8 @@ signing_keys_mappings:
# A list of RHEL releasevers (minor versions) that should be excluded from listing files
exclude_from_listings:
- "0.0"

# Major RHEL versions which are still expecting new minor releases in
# future. Versions not listed here are exempt from various tooling.
rhel_open_dist:
- 0
13 changes: 12 additions & 1 deletion src/cdn_definitions/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,13 @@
"major_version": {
"type": "integer"
},
"major_version_list": {
"items": {
"$ref": "#/definitions/major_version"
},
"type": "array",
"uniqueItems": true
},
"major_version_string": {
"pattern": "^[0-9]+$",
"type": "string"
Expand Down Expand Up @@ -264,6 +271,9 @@
"release_stream_mappings": {
"$ref": "#/definitions/release_stream_mapping"
},
"rhel_open_dist": {
"$ref": "#/definitions/major_version_list"
},
"rhui_alias": {
"$ref": "#/definitions/path_alias_list"
},
Expand Down Expand Up @@ -298,7 +308,8 @@
"signing_keys_mappings",
"rhui_product_id",
"ignore_lp_version_product_ids",
"exclude_from_listings"
"exclude_from_listings",
"rhel_open_dist"
],
"type": "object"
}
10 changes: 10 additions & 0 deletions src/cdn_definitions/schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ definitions:
major_version:
type: integer

major_version_list:
type: array
items:
$ref: "#/definitions/major_version"
uniqueItems: true

major_version_string:
type: string
pattern: "^[0-9]+$"
Expand Down Expand Up @@ -240,6 +246,9 @@ properties:
signing_keys_mappings:
$ref: "#/definitions/signing_keys_mapping"

rhel_open_dist:
$ref: "#/definitions/major_version_list"

rhui_product_id:
$ref: "#/definitions/product_id"

Expand All @@ -264,5 +273,6 @@ requiredProperties:
- rhui_product_id
- ignore_lp_version_product_ids
- exclude_from_listings
- rhel_open_dist

additionalProperties: false

0 comments on commit 62e34c8

Please sign in to comment.