Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update upgrade data + bump required data stream to 3.0 #1165

Merged
merged 1 commit into from
Jan 18, 2024
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
3 changes: 1 addition & 2 deletions etc/leapp/files/device_driver_deprecation_data.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"provided_data_streams": [
"2.0",
"3.0"
],
"data": [
Expand Down Expand Up @@ -5058,4 +5057,4 @@
]
}
]
}
}
1 change: 0 additions & 1 deletion etc/leapp/files/pes-events.json
Original file line number Diff line number Diff line change
Expand Up @@ -500347,7 +500347,6 @@ null
}
],
"provided_data_streams": [
"2.0",
"3.0"
],
"timestamp": "202401101404Z"
Expand Down
104 changes: 101 additions & 3 deletions etc/leapp/files/repomap.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"datetime": "202307241553Z",
"datetime": "202401171742Z",
"version_format": "1.2.0",
"mapping": [
{
Expand Down Expand Up @@ -225,6 +225,12 @@
"target": [
"rhel9-rhui-google-compute-engine-leapp"
]
},
{
"source": "rhel8-rhui-custom-client-at-alibaba",
"target": [
"rhel9-rhui-custom-client-at-alibaba"
]
}
]
}
Expand Down Expand Up @@ -2855,6 +2861,14 @@
"channel": "ga",
"repo_type": "rpm"
},
{
"major_version": "9",
"repoid": "rhui-rhel-9-for-aarch64-baseos-rhui-rpms",
"arch": "aarch64",
"channel": "ga",
"repo_type": "rpm",
"rhui": "alibaba"
},
{
"major_version": "9",
"repoid": "rhui-rhel-9-for-x86_64-baseos-e4s-rhui-rpms",
Expand All @@ -2870,6 +2884,14 @@
"channel": "ga",
"repo_type": "rpm",
"rhui": "google"
},
{
"major_version": "9",
"repoid": "rhui-rhel-9-for-x86_64-baseos-rhui-rpms",
"arch": "x86_64",
"channel": "ga",
"repo_type": "rpm",
"rhui": "alibaba"
}
]
},
Expand Down Expand Up @@ -3059,6 +3081,14 @@
"channel": "ga",
"repo_type": "rpm"
},
{
"major_version": "9",
"repoid": "rhui-rhel-9-for-aarch64-appstream-rhui-rpms",
"arch": "aarch64",
"channel": "ga",
"repo_type": "rpm",
"rhui": "alibaba"
},
{
"major_version": "9",
"repoid": "rhui-rhel-9-for-x86_64-appstream-e4s-rhui-rpms",
Expand All @@ -3074,6 +3104,14 @@
"channel": "ga",
"repo_type": "rpm",
"rhui": "google"
},
{
"major_version": "9",
"repoid": "rhui-rhel-9-for-x86_64-appstream-rhui-rpms",
"arch": "x86_64",
"channel": "ga",
"repo_type": "rpm",
"rhui": "alibaba"
}
]
},
Expand Down Expand Up @@ -3188,13 +3226,29 @@
"channel": "ga",
"repo_type": "rpm"
},
{
"major_version": "9",
"repoid": "rhui-codeready-builder-for-rhel-9-aarch64-rhui-rpms",
"arch": "aarch64",
"channel": "ga",
"repo_type": "rpm",
"rhui": "alibaba"
},
{
"major_version": "9",
"repoid": "rhui-codeready-builder-for-rhel-9-x86_64-rhui-rpms",
"arch": "x86_64",
"channel": "ga",
"repo_type": "rpm",
"rhui": "google"
},
{
"major_version": "9",
"repoid": "rhui-codeready-builder-for-rhel-9-x86_64-rhui-rpms",
"arch": "x86_64",
"channel": "ga",
"repo_type": "rpm",
"rhui": "alibaba"
}
]
},
Expand Down Expand Up @@ -3301,13 +3355,29 @@
"repo_type": "rpm",
"rhui": "aws"
},
{
"major_version": "9",
"repoid": "rhui-rhel-9-for-aarch64-supplementary-rhui-rpms",
"arch": "aarch64",
"channel": "ga",
"repo_type": "rpm",
"rhui": "alibaba"
},
{
"major_version": "9",
"repoid": "rhui-rhel-9-for-x86_64-supplementary-rhui-rpms",
"arch": "x86_64",
"channel": "ga",
"repo_type": "rpm",
"rhui": "google"
},
{
"major_version": "9",
"repoid": "rhui-rhel-9-for-x86_64-supplementary-rhui-rpms",
"arch": "x86_64",
"channel": "ga",
"repo_type": "rpm",
"rhui": "alibaba"
}
]
},
Expand Down Expand Up @@ -3687,6 +3757,14 @@
"channel": "ga",
"repo_type": "rpm",
"rhui": "google"
},
{
"major_version": "9",
"repoid": "rhui-rhel-9-for-x86_64-highavailability-rhui-rpms",
"arch": "x86_64",
"channel": "ga",
"repo_type": "rpm",
"rhui": "alibaba"
}
]
},
Expand Down Expand Up @@ -3788,10 +3866,30 @@
"rhui": "google"
}
]
},
{
"pesid": "rhel9-rhui-custom-client-at-alibaba",
"entries": [
{
"major_version": "9",
"repoid": "rhui-custom-rhui_client_at_alibaba-rhel-9",
"arch": "aarch64",
"channel": "ga",
"repo_type": "rpm",
"rhui": "alibaba"
},
{
"major_version": "9",
"repoid": "rhui-custom-rhui_client_at_alibaba-rhel-9",
"arch": "x86_64",
"channel": "ga",
"repo_type": "rpm",
"rhui": "alibaba"
}
]
}
],
"provided_data_streams": [
"2.0",
"3.0"
]
}
}
2 changes: 1 addition & 1 deletion repos/system_upgrade/common/libraries/config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# The devel variable for target product channel can also contain 'beta'
SUPPORTED_TARGET_CHANNELS = {'ga', 'e4s', 'eus', 'aus'}
CONSUMED_DATA_STREAM_ID = '2.0'
CONSUMED_DATA_STREAM_ID = '3.0'


def get_env(name, default=None):
Expand Down
Loading