Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion src/cdn_definitions/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@
"override_initial_rhel_release": {
"0": "0.0"
},
"populate_ubi_dot_repos": true,
"release_stream_mappings": {
"aus": [
"0.0"
Expand Down Expand Up @@ -127,6 +126,28 @@
"src": "/content/dist/rhel1/1"
}
],
"repo_content_sync": {
"prod": [
{
"populate_dot_repos": false,
"source": "https://example.com/ubi/data"
},
{
"populate_dot_repos": true,
"source": "https://example.com/client-tools/data"
}
],
"stage": [
{
"populate_dot_repos": false,
"source": "https://example.com/ubi/data"
},
{
"populate_dot_repos": true,
"source": "https://example.com/client-tools/data"
}
]
},
"repo_overrides": {
"prod": [
{
Expand Down
23 changes: 20 additions & 3 deletions src/cdn_definitions/data.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,26 @@ exclude_from_listings:
rhel_open_dist:
- 0

# If set to False, ubi_population repo note will be set False for all ubi DOT repos and
# no ubi DOT repo will be populated.
populate_ubi_dot_repos: True
# repo_content_sync configures selective content synchronization from RHEL repos to other products.
# It is used e.g. by UBI to sync content to Public CDN.
repo_content_sync:
stage:
# Source git repo contains the configuration for tooling that facilitates
# the repo content sync (currently ubipop).
# The configuration includes content set labels and lists with allowed and blocked packages.
- source: https://example.com/ubi/data
# If set to False, ubi_population repo note will be set False for all DOT repos and
# no output DOT repo belonging under the content set defined in the source git repo
# will be populated. Only the mainline repos will be populated. If set to True, all DOT repos
# will be populated alongside the mainline repos.
populate_dot_repos: False
- source: https://example.com/client-tools/data
populate_dot_repos: True
prod:
- source: https://example.com/ubi/data
populate_dot_repos: False
- source: https://example.com/client-tools/data
populate_dot_repos: True

# repo_overrides can be used to define mappings between certain criteria matching CDN repos
# and configuration which should be set on those repos. The intended usage is to allow
Expand Down
27 changes: 27 additions & 0 deletions src/cdn_definitions/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,30 @@
"type": "array",
"uniqueItems": true
},
"repo_content_sync": {
"additionalProperties": false,
"patternProperties": {
".*": {
"items": {
"$ref": "#/definitions/repo_content_sync_record"
},
"type": "array"
}
},
"type": "object"
},
"repo_content_sync_record": {
"additionalProperties": false,
"properties": {
"populate_dot_repos": {
"type": "boolean"
},
"source": {
"type": "string"
}
},
"type": "object"
},
"repo_override": {
"additionalProperties": false,
"allOf": [
Expand Down Expand Up @@ -442,6 +466,9 @@
"releasever_alias": {
"$ref": "#/definitions/path_alias_list"
},
"repo_content_sync": {
"$ref": "#/definitions/repo_content_sync"
},
"repo_overrides": {
"$ref": "#/definitions/repo_overrides"
},
Expand Down
23 changes: 23 additions & 0 deletions src/cdn_definitions/schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,24 @@ definitions:
$ref: "#/definitions/repo_override"
additionalProperties: false

repo_content_sync_record:
type: object
properties:
source:
type: string
populate_dot_repos:
type: boolean
additionalProperties: false

repo_content_sync:
type: object
patternProperties:
".*":
type: array
items:
$ref: "#/definitions/repo_content_sync_record"
additionalProperties: false

directory_layout:
type: object
properties:
Expand Down Expand Up @@ -358,6 +376,7 @@ properties:
rhel_open_dist:
$ref: "#/definitions/major_version_list"

# Deprecated by rhui_product_ids
rhui_product_id:
$ref: "#/definitions/product_id"

Expand All @@ -370,9 +389,13 @@ properties:
exclude_from_listings:
$ref: "#/definitions/exclude_versions_from_listings"

# Deprecated by repo_content_sync
populate_ubi_dot_repos:
type: boolean

repo_content_sync:
$ref: "#/definitions/repo_content_sync"

repo_overrides:
$ref: "#/definitions/repo_overrides"

Expand Down