From abc9f21045d1fa2c019962dad8b6ebdf746dc401 Mon Sep 17 00:00:00 2001 From: Caleigh Runge-Hottman Date: Thu, 4 Nov 2021 10:20:52 -0400 Subject: [PATCH] cdn-definitions supports releasever_aliases [RHELDST-7900] --- src/cdn_definitions/data.json | 10 ++++++++++ src/cdn_definitions/data.yaml | 19 +++++++++++++++++++ src/cdn_definitions/schema.json | 3 +++ src/cdn_definitions/schema.yaml | 3 +++ 4 files changed, 35 insertions(+) diff --git a/src/cdn_definitions/data.json b/src/cdn_definitions/data.json index 649c062..6924ed5 100644 --- a/src/cdn_definitions/data.json +++ b/src/cdn_definitions/data.json @@ -64,6 +64,16 @@ "0.0" ] }, + "releasever_alias": [ + { + "dest": "/content/dist/rhel0/0.9", + "src": "/content/dist/rhel0/0" + }, + { + "dest": "/content/dist/rhel1/1.11", + "src": "/content/dist/rhel1/1" + } + ], "rhel_open_dist": [ 0 ], diff --git a/src/cdn_definitions/data.yaml b/src/cdn_definitions/data.yaml index 359cc19..68f1792 100644 --- a/src/cdn_definitions/data.yaml +++ b/src/cdn_definitions/data.yaml @@ -94,6 +94,25 @@ origin_alias: dest: /origin/rpms +# Aliases between two RHEL-X repositories, both of which contain the latest RHEL-X release. +releasever_alias: + +# Each item defines a "src" (a floating RHEL-X repository that always contains the latest content +# for a major RHEL release) and a "dest" (a RHEL-X.Y repository, containing the published content +# for the latest minor release version of RHEL-X). +# +# For example, /content/dist/rhelX/X should be an alias for /content/dist/rhelX/X.Y, where X is a +# major version of RHEL and X.Y is a minor version of RHEL. +# +# These aliases are intended for use with product versions no longer receiving releases, i.e. those +# not covered by rhel_open_dist. For currently active versions, aliases are instead derived from +# other fields such as env_to_releasever_mappings. +- src: /content/dist/rhel0/0 + dest: /content/dist/rhel0/0.9 +- src: /content/dist/rhel1/1 + dest: /content/dist/rhel1/1.11 + + # Content set prefixes which should be using symlinks at the $releasever level # according to normal business logic, but for historical reasons are exempt # and instead do not use symlinks. diff --git a/src/cdn_definitions/schema.json b/src/cdn_definitions/schema.json index aba448e..0bfe5f6 100644 --- a/src/cdn_definitions/schema.json +++ b/src/cdn_definitions/schema.json @@ -274,6 +274,9 @@ "release_stream_mappings": { "$ref": "#/definitions/release_stream_mapping" }, + "releasever_alias": { + "$ref": "#/definitions/path_alias_list" + }, "rhel_open_dist": { "$ref": "#/definitions/major_version_list" }, diff --git a/src/cdn_definitions/schema.yaml b/src/cdn_definitions/schema.yaml index 6851b5c..1c48c07 100644 --- a/src/cdn_definitions/schema.yaml +++ b/src/cdn_definitions/schema.yaml @@ -222,6 +222,9 @@ properties: origin_alias: $ref: "#/definitions/path_alias_list" + releasever_alias: + $ref: "#/definitions/path_alias_list" + symlink_exceptions: $ref: "#/definitions/symlink_exception_list"