Skip to content

Commit f21d4d3

Browse files
jslobodzianjslobodzian
committed
Merge branch 'main' into joslobo/bump-for-jan-2024-release
2 parents 1d1d101 + 515cb74 commit f21d4d3

248 files changed

Lines changed: 9185 additions & 1375 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/CODEOWNERS‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919
/SPECS/kernel-azure/* @microsoft/cbl-mariner-kernel
2020
/SPECS/kernel-hci/* @microsoft/cbl-mariner-kernel
2121
/SPECS/kernel-headers/* @microsoft/cbl-mariner-kernel
22-
/SPECS/kernel-mshv/* @microsoft/cbl-mariner-kernel
23-
/SPECS/kernel-uvm/* @microsoft/cbl-mariner-kernel
22+
/SPECS/kernel-mshv/* @microsoft/cbl-mariner-kata-containers
23+
/SPECS/kernel-uvm/* @microsoft/cbl-mariner-kata-containers
24+
/SPECS/kernel-uvm-cvm/* @microsoft/cbl-mariner-kata-containers
2425
/SPECS-SIGNED/kernel-signed/* @microsoft/cbl-mariner-kernel
2526
/SPECS-SIGNED/kernel-hci-signed/* @microsoft/cbl-mariner-kernel
2627
/SPECS-SIGNED/kernel-azure-signed/* @microsoft/cbl-mariner-kernel
@@ -59,17 +60,33 @@
5960
/SPECS/moby-buildx/* @microsoft/cbl-mariner-container-runtime
6061
/SPECS/moby-cli/* @microsoft/cbl-mariner-container-runtime
6162
/SPECS/moby-containerd/* @microsoft/cbl-mariner-container-runtime
62-
/SPECS/moby-containerd-cc/* @microsoft/cbl-mariner-container-runtime
63+
/SPECS/moby-containerd-cc/* @microsoft/cbl-mariner-kata-containers
6364
/SPECS/moby-engine/* @microsoft/cbl-mariner-container-runtime
6465
/SPECS/moby-runc/* @microsoft/cbl-mariner-container-runtime
65-
/SPECS/kata-containers/* @microsoft/cbl-mariner-container-runtime
66-
/SPECS/kata-containers-cc/* @microsoft/cbl-mariner-container-runtime
66+
/SPECS/kata-containers/* @microsoft/cbl-mariner-kata-containers
67+
/SPECS/kata-containers-cc/* @microsoft/cbl-mariner-kata-containers
6768

6869
/SPECS/cloud-hypervisor/* @microsoft/cbl-mariner-virtualization
70+
/SPECS/hvloader/* @microsoft/cbl-mariner-kata-containers
6971

7072
/SPECS/cloud-init/* @microsoft/cbl-mariner-provisioning
7173
/SPECS/walinuxagent/* @microsoft/cbl-mariner-provisioning
7274

75+
# Modifications to the toolkit requires reviews from the toolkit team
76+
/toolkit/ @microsoft/cbl-mariner-tooling
77+
78+
# Docs to be reviewed by general CBL-Mariner devs
79+
/toolkit/docs/ @microsoft/cbl-mariner-devs
80+
81+
# Default image configurations to be reviewed by general CBL-Mariner devs
82+
/toolkit/imageconfigs/ @microsoft/cbl-mariner-devs
83+
84+
# Package and toolchain manifests to be reviewed by general CBL-Mariner devs
85+
/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @microsoft/cbl-mariner-devs
86+
/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @microsoft/cbl-mariner-devs
87+
/toolkit/resources/manifests/package/toolchain_aarch64.txt @microsoft/cbl-mariner-devs
88+
/toolkit/resources/manifests/package/toolchain_x86_64.txt @microsoft/cbl-mariner-devs
89+
7390
# Modifications to the raw toolchain require admin approval.
7491
/toolkit/scripts/toolchain/container/* @microsoft/cbl-mariner-admins
7592
/toolkit/scripts/toolchain/cgmanifest.json @microsoft/cbl-mariner-admins

‎.github/workflows/validate-cg-manifest.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ ignore_no_source_tarball=" \
3737
initramfs \
3838
installkernel \
3939
javapackages-tools-meta \
40+
kata-packages-uvm \
4041
kde-filesystem \
4142
kf5 \
4243
livepatching \

‎.pipelines/templates/PackageBuild.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,5 +258,4 @@ steps:
258258
failOnTestFailures: ${{ parameters.failOnTestFailures }}
259259
outputArtifactsFolder: ${{ parameters.outputArtifactsFolder }}
260260
outputArtifactsTestsSubfolder: ${{ parameters.outputArtifactsTestsSubfolder }}
261-
pipArtifactFeeds: ${{ parameters.pipArtifactFeeds }}
262261
testSuiteName: ${{ parameters.testSuiteName }}

‎.pipelines/templates/PackageTestResultsAnalysis.yml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ parameters:
1818
type: string
1919
default: "TESTS"
2020

21-
- name: pipArtifactFeeds
22-
type: string
23-
default: ""
24-
2521
- name: testSuiteName
2622
type: string
2723
default: "Package test"
@@ -36,13 +32,7 @@ parameters:
3632
default: "$(Agent.TempDirectory)"
3733

3834
steps:
39-
- ${{ if parameters.pipArtifactFeeds }}:
40-
- task: PipAuthenticate@1
41-
inputs:
42-
artifactFeeds: "${{ parameters.pipArtifactFeeds }}"
43-
displayName: "Authenticate to custom pip artifact feeds"
44-
45-
- bash: pip3 install junit_xml
35+
- bash: sudo tdnf install -y python3-junit-xml
4636
retryCountOnTaskFailure: 3
4737
displayName: "Install Python dependencies"
4838

‎SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
%define uname_r %{version}-%{release}
1010
Summary: Signed Linux Kernel for Azure
1111
Name: kernel-azure-signed-%{buildarch}
12-
Version: 5.15.138.1
12+
Version: 5.15.143.1
1313
Release: 1%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
@@ -153,6 +153,12 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
153153
%exclude /module_info.ld
154154

155155
%changelog
156+
* Tue Dec 19 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.143.1-1
157+
- Auto-upgrade to 5.15.143.1
158+
159+
* Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1
160+
- Auto-upgrade to 5.15.139.1
161+
156162
* Tue Nov 21 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.138.1-1
157163
- Auto-upgrade to 5.15.138.1
158164

‎SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%define uname_r %{version}-%{release}
55
Summary: Signed Linux Kernel for HCI
66
Name: kernel-hci-signed-%{buildarch}
7-
Version: 5.15.138.1
7+
Version: 5.15.143.1
88
Release: 1%{?dist}
99
License: GPLv2
1010
Vendor: Microsoft Corporation
@@ -149,6 +149,12 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
149149
%exclude /module_info.ld
150150

151151
%changelog
152+
* Tue Dec 19 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.143.1-1
153+
- Auto-upgrade to 5.15.143.1
154+
155+
* Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1
156+
- Auto-upgrade to 5.15.139.1
157+
152158
* Tue Nov 21 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.138.1-1
153159
- Auto-upgrade to 5.15.138.1
154160

‎SPECS-SIGNED/kernel-mos-signed/kernel-mos-signed.spec‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%define uname_r %{version}-%{release}
55
Summary: Signed Linux Kernel for MOS systems
66
Name: kernel-mos-signed-%{buildarch}
7-
Version: 5.15.136.1
7+
Version: 5.15.143.1
88
Release: 1%{?dist}
99
License: GPLv2
1010
Vendor: Microsoft Corporation
@@ -150,6 +150,12 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
150150
%exclude /module_info.ld
151151

152152
%changelog
153+
* Wed Dec 20 2023 Gary Swalling <gaswal@microsoft.com> - 5.15.143.1-1
154+
- Update to 5.15.143.1
155+
156+
* Mon Dec 11 2023 Rachel Menge <rachelmenge@microsoft.com> - 5.15.139.1-1
157+
- Update to 5.15.139.1
158+
153159
* Wed Nov 08 2023 Rachel Menge <rachelmenge@microsoft.com> - 5.15.136.1-1
154160
- Original version for CBL-Mariner.
155161
- License verified

‎SPECS-SIGNED/kernel-signed/kernel-signed.spec‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
%define uname_r %{version}-%{release}
1010
Summary: Signed Linux Kernel for %{buildarch} systems
1111
Name: kernel-signed-%{buildarch}
12-
Version: 5.15.138.1
13-
Release: 4%{?dist}
12+
Version: 5.15.143.1
13+
Release: 1%{?dist}
1414
License: GPLv2
1515
Vendor: Microsoft Corporation
1616
Distribution: Mariner
@@ -153,6 +153,12 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
153153
%exclude /module_info.ld
154154

155155
%changelog
156+
* Tue Dec 19 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.143.1-1
157+
- Auto-upgrade to 5.15.143.1
158+
159+
* Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.139.1-1
160+
- Auto-upgrade to 5.15.139.1
161+
156162
* Tue Nov 28 2023 Juan Camposeco <juanarturoc@microsoft.com> - 5.15.138.1-4
157163
- Bump release to match kernel
158164

‎SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎SPECS/LICENSES-AND-NOTICES/data/licenses.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -907,6 +907,7 @@
907907
"mod_security_crs",
908908
"mod_wsgi",
909909
"mokutil",
910+
"moreutils",
910911
"mpage",
911912
"mrtg",
912913
"mstflint",
@@ -1505,6 +1506,7 @@
15051506
"perl-Text-Unidecode",
15061507
"perl-Text-WrapI18N",
15071508
"perl-Tie-IxHash",
1509+
"perl-Time-Duration",
15081510
"perl-TimeDate",
15091511
"perl-Tree-DAG_Node",
15101512
"perl-Unicode-EastAsianWidth",
@@ -1843,6 +1845,7 @@
18431845
"qt5-rpm-macros",
18441846
"quagga",
18451847
"quota",
1848+
"quotatool",
18461849
"radvd",
18471850
"ragel",
18481851
"raptor2",
@@ -2187,6 +2190,7 @@
21872190
"jsonbuilder",
21882191
"jx",
21892192
"kata-containers-cc",
2193+
"kata-packages-uvm",
21902194
"keda",
21912195
"keras",
21922196
"kernel-azure-signed",

0 commit comments

Comments
 (0)