Skip to content

Commit ed96308

Browse files
pirat89yuravk
pirat89
authored and
yuravk
committed
Update upgrade data + bump required data stream to 3.0
* Added RHEL 9 repos for Alibaba RHUI with mapping for IPU 8 -> 9 * Actors require "3.0" in the list of provided_data_streams * All data files updated to provide onls "3.0" data stream * Add NL at the end of the device_driver_deprecation_data.json file to be POSIX compatible as expected. (cherry picked from commit 8552bbf)
1 parent 16b4d8c commit ed96308

File tree

4 files changed

+103
-7
lines changed

4 files changed

+103
-7
lines changed

‎etc/leapp/files/device_driver_deprecation_data.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"provided_data_streams": [
3-
"2.0",
43
"3.0"
54
],
65
"data": [
@@ -5058,4 +5057,4 @@
50585057
]
50595058
}
50605059
]
5061-
}
5060+
}

‎etc/leapp/files/pes-events.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500347,7 +500347,6 @@ null
500347500347
}
500348500348
],
500349500349
"provided_data_streams": [
500350-
"2.0",
500351500350
"3.0"
500352500351
],
500353500352
"timestamp": "202401101404Z"

‎etc/leapp/files/repomap.json‎

Lines changed: 101 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"datetime": "202307241553Z",
2+
"datetime": "202401171742Z",
33
"version_format": "1.2.0",
44
"mapping": [
55
{
@@ -225,6 +225,12 @@
225225
"target": [
226226
"rhel9-rhui-google-compute-engine-leapp"
227227
]
228+
},
229+
{
230+
"source": "rhel8-rhui-custom-client-at-alibaba",
231+
"target": [
232+
"rhel9-rhui-custom-client-at-alibaba"
233+
]
228234
}
229235
]
230236
}
@@ -2855,6 +2861,14 @@
28552861
"channel": "ga",
28562862
"repo_type": "rpm"
28572863
},
2864+
{
2865+
"major_version": "9",
2866+
"repoid": "rhui-rhel-9-for-aarch64-baseos-rhui-rpms",
2867+
"arch": "aarch64",
2868+
"channel": "ga",
2869+
"repo_type": "rpm",
2870+
"rhui": "alibaba"
2871+
},
28582872
{
28592873
"major_version": "9",
28602874
"repoid": "rhui-rhel-9-for-x86_64-baseos-e4s-rhui-rpms",
@@ -2870,6 +2884,14 @@
28702884
"channel": "ga",
28712885
"repo_type": "rpm",
28722886
"rhui": "google"
2887+
},
2888+
{
2889+
"major_version": "9",
2890+
"repoid": "rhui-rhel-9-for-x86_64-baseos-rhui-rpms",
2891+
"arch": "x86_64",
2892+
"channel": "ga",
2893+
"repo_type": "rpm",
2894+
"rhui": "alibaba"
28732895
}
28742896
]
28752897
},
@@ -3059,6 +3081,14 @@
30593081
"channel": "ga",
30603082
"repo_type": "rpm"
30613083
},
3084+
{
3085+
"major_version": "9",
3086+
"repoid": "rhui-rhel-9-for-aarch64-appstream-rhui-rpms",
3087+
"arch": "aarch64",
3088+
"channel": "ga",
3089+
"repo_type": "rpm",
3090+
"rhui": "alibaba"
3091+
},
30623092
{
30633093
"major_version": "9",
30643094
"repoid": "rhui-rhel-9-for-x86_64-appstream-e4s-rhui-rpms",
@@ -3074,6 +3104,14 @@
30743104
"channel": "ga",
30753105
"repo_type": "rpm",
30763106
"rhui": "google"
3107+
},
3108+
{
3109+
"major_version": "9",
3110+
"repoid": "rhui-rhel-9-for-x86_64-appstream-rhui-rpms",
3111+
"arch": "x86_64",
3112+
"channel": "ga",
3113+
"repo_type": "rpm",
3114+
"rhui": "alibaba"
30773115
}
30783116
]
30793117
},
@@ -3188,13 +3226,29 @@
31883226
"channel": "ga",
31893227
"repo_type": "rpm"
31903228
},
3229+
{
3230+
"major_version": "9",
3231+
"repoid": "rhui-codeready-builder-for-rhel-9-aarch64-rhui-rpms",
3232+
"arch": "aarch64",
3233+
"channel": "ga",
3234+
"repo_type": "rpm",
3235+
"rhui": "alibaba"
3236+
},
31913237
{
31923238
"major_version": "9",
31933239
"repoid": "rhui-codeready-builder-for-rhel-9-x86_64-rhui-rpms",
31943240
"arch": "x86_64",
31953241
"channel": "ga",
31963242
"repo_type": "rpm",
31973243
"rhui": "google"
3244+
},
3245+
{
3246+
"major_version": "9",
3247+
"repoid": "rhui-codeready-builder-for-rhel-9-x86_64-rhui-rpms",
3248+
"arch": "x86_64",
3249+
"channel": "ga",
3250+
"repo_type": "rpm",
3251+
"rhui": "alibaba"
31983252
}
31993253
]
32003254
},
@@ -3301,13 +3355,29 @@
33013355
"repo_type": "rpm",
33023356
"rhui": "aws"
33033357
},
3358+
{
3359+
"major_version": "9",
3360+
"repoid": "rhui-rhel-9-for-aarch64-supplementary-rhui-rpms",
3361+
"arch": "aarch64",
3362+
"channel": "ga",
3363+
"repo_type": "rpm",
3364+
"rhui": "alibaba"
3365+
},
33043366
{
33053367
"major_version": "9",
33063368
"repoid": "rhui-rhel-9-for-x86_64-supplementary-rhui-rpms",
33073369
"arch": "x86_64",
33083370
"channel": "ga",
33093371
"repo_type": "rpm",
33103372
"rhui": "google"
3373+
},
3374+
{
3375+
"major_version": "9",
3376+
"repoid": "rhui-rhel-9-for-x86_64-supplementary-rhui-rpms",
3377+
"arch": "x86_64",
3378+
"channel": "ga",
3379+
"repo_type": "rpm",
3380+
"rhui": "alibaba"
33113381
}
33123382
]
33133383
},
@@ -3687,6 +3757,14 @@
36873757
"channel": "ga",
36883758
"repo_type": "rpm",
36893759
"rhui": "google"
3760+
},
3761+
{
3762+
"major_version": "9",
3763+
"repoid": "rhui-rhel-9-for-x86_64-highavailability-rhui-rpms",
3764+
"arch": "x86_64",
3765+
"channel": "ga",
3766+
"repo_type": "rpm",
3767+
"rhui": "alibaba"
36903768
}
36913769
]
36923770
},
@@ -3788,10 +3866,30 @@
37883866
"rhui": "google"
37893867
}
37903868
]
3869+
},
3870+
{
3871+
"pesid": "rhel9-rhui-custom-client-at-alibaba",
3872+
"entries": [
3873+
{
3874+
"major_version": "9",
3875+
"repoid": "rhui-custom-rhui_client_at_alibaba-rhel-9",
3876+
"arch": "aarch64",
3877+
"channel": "ga",
3878+
"repo_type": "rpm",
3879+
"rhui": "alibaba"
3880+
},
3881+
{
3882+
"major_version": "9",
3883+
"repoid": "rhui-custom-rhui_client_at_alibaba-rhel-9",
3884+
"arch": "x86_64",
3885+
"channel": "ga",
3886+
"repo_type": "rpm",
3887+
"rhui": "alibaba"
3888+
}
3889+
]
37913890
}
37923891
],
37933892
"provided_data_streams": [
3794-
"2.0",
37953893
"3.0"
37963894
]
3797-
}
3895+
}

‎repos/system_upgrade/common/libraries/config/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

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

88

99
def get_env(name, default=None):

0 commit comments

Comments
 (0)