Merge pull request #5981 from microsoft/joslobo/merge-for-august-update2

Merge for August Update 2

Author: jslobodzian

.pipelines/prchecks/PackageBuildPRCheck.yml

@@ -102,8 +102,7 @@ extends:
                     steps:
                       - template: .pipelines/templates/PackageBuild.yml@self
                         parameters:
-                          customToolchainArtifactBuild: $(toolchainArtifactNameBase)_${{ configuration.name }}
-                          customToolchainEnabled: true
+                          customToolchainArtifactName: $(toolchainArtifactNameBase)_${{ configuration.name }}
                           isCheckBuild: ${{ packageBuildJob.runCheck }}
                           isDeltaBuild: true
                           outputArtifactsFolder: $(ob_outputDirectory)

.pipelines/templates/PackageBuild.yml

@@ -1,11 +1,19 @@
 parameters:
-  - name: customToolchainArtifactBuild
+  - name: buildRepoRoot
+    type: string
+    default: "$(Build.SourcesDirectory)"
+
+  - name: concurrentPackageBuilds
+    type: number
+    default: 12
+
+  - name: customToolchainArtifactName
     type: string
     default: ""
 
-  - name: customToolchainEnabled
-    type: boolean
-    default: false
+  - name: extraPackageRepos
+    type: string
+    default: ""
 
   - name: isCheckBuild
     type: boolean
@@ -19,9 +27,9 @@ parameters:
     type: string
     default: "$(Build.ArtifactStagingDirectory)"
 
-  - name: buildRepoRoot
+  - name: rpmsCacheArtifactName
     type: string
-    default: "$(Build.SourcesDirectory)"
+    default: ""
 
   - name: rpmsTarballName
     type: string
@@ -31,6 +39,10 @@ parameters:
     type: string
     default: "CBL-Mariner"
 
+  - name: specsFolderPath
+    type: string
+    default: "SPECS"
+
   - name: srpmsTarballName
     type: string
     default: "srpms.tar.gz"
@@ -40,11 +52,11 @@ steps:
     parameters:
       buildRepoRoot: ${{ parameters.buildRepoRoot }}
 
-  - ${{ if eq(parameters.customToolchainEnabled, true) }}:
+  - ${{ if parameters.customToolchainArtifactName }}:
       - task: DownloadPipelineArtifact@2
         displayName: "Download toolchain"
         inputs:
-          artifact: "${{ parameters.customToolchainArtifactBuild }}"
+          artifact: "${{ parameters.customToolchainArtifactName }}"
           patterns: "**/toolchain_built_rpms_all.tar.gz"
 
       - script: |
@@ -57,6 +69,23 @@ steps:
           sudo make -C "${{ parameters.buildRepoRoot }}/toolkit" toolchain TOOLCHAIN_ARCHIVE="$toolchain_archive"
         displayName: "Populate toolchain"
 
+  - ${{ if parameters.rpmsCacheArtifactName }}:
+      - task: DownloadPipelineArtifact@2
+        displayName: "Download RPM cache"
+        inputs:
+          artifact: "${{ parameters.rpmsCacheArtifactName }}"
+          patterns: "**/rpms*.tar.gz"
+
+      - script: |
+          rpms_archive="$(find "$(Pipeline.Workspace)" -name rpms*.tar.gz)"
+          if [[ ! -f "$rpms_archive" ]]; then
+            echo "ERROR: RPMs cache archive not found!" >&2
+            exit 1
+          fi
+
+          sudo make -C "${{ parameters.buildRepoRoot }}/toolkit" hydrate-cached-rpms CACHED_PACKAGES_ARCHIVE="$rpms_archive"
+        displayName: "Populate RPMs cache"
+
   - script: |
       delta_fetch_arg="DELTA_FETCH=n"
       if [[ ${{ parameters.isDeltaBuild }} =~ [Tt]rue ]]; then
@@ -69,9 +98,12 @@ steps:
       fi
 
       sudo make -C "${{ parameters.buildRepoRoot }}/toolkit" build-packages -j$(nproc) \
+        CONCURRENT_PACKAGE_BUILDS=${{ parameters.concurrentPackageBuilds }} \
         CONFIG_FILE="" \
-        $delta_fetch_arg \
         REBUILD_TOOLS=y \
+        REPO_LIST="${{ parameters.extraPackageRepos }}" \
+        SPECS_DIR="${{ parameters.buildRepoRoot }}/${{ parameters.specsFolderPath }}" \
+        $delta_fetch_arg \
         $run_check_arg
     displayName: "Build packages"
 

.pipelines/templates/ToolchainBuild.yml

@@ -34,7 +34,7 @@ steps:
   - bash: |
       published_artifacts_dir="${{ parameters.outputArtifactsFolder }}/ARTIFACTS"
       mkdir -p "$published_artifacts_dir"
-      cp "${{ parameters.buildRepoRoot }}"/build/toolchain/toolchain_built_{,s}rpms_all.tar.gz "$published_artifacts_dir"
+      cp "${{ parameters.buildRepoRoot }}"/build/toolchain/toolchain_built_{,s}rpms_*.tar.gz "$published_artifacts_dir"
     displayName: "Copy artifacts for publishing"
 
   - bash: |

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

@@ -9,7 +9,7 @@
 %define uname_r %{version}-%{release}
 Summary:        Signed Linux Kernel for Azure
 Name:           kernel-azure-signed-%{buildarch}
-Version:        5.15.122.1
+Version:        5.15.125.1
 Release:        1%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
@@ -153,6 +153,12 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %exclude /module_info.ld
 
 %changelog
+* Wed Aug 09 2023 CBL-Mariner Servicing Account <[email protected]> - 5.15.125.1-1
+- Auto-upgrade to 5.15.125.1
+
+* Tue Aug 01 2023 CBL-Mariner Servicing Account <[email protected]> - 5.15.123.1-1
+- Auto-upgrade to 5.15.123.1
+
 * Wed Jul 26 2023 CBL-Mariner Servicing Account <[email protected]> - 5.15.122.1-1
 - Auto-upgrade to 5.15.122.1
 

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

@@ -4,8 +4,8 @@
 %define uname_r %{version}-%{release}
 Summary:        Signed Linux Kernel for HCI
 Name:           kernel-hci-signed-%{buildarch}
-Version:        5.15.122.1
-Release:        2%{?dist}
+Version:        5.15.125.1
+Release:        1%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -149,6 +149,15 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %exclude /module_info.ld
 
 %changelog
+* Wed Aug 09 2023 CBL-Mariner Servicing Account <[email protected]> - 5.15.125.1-1
+- Auto-upgrade to 5.15.125.1
+
+* Mon Aug 07 2023 Lanze Liu <[email protected]> - 5.15.123.1-2
+- Bump release number to match kernel release.
+
+* Tue Aug 01 2023 CBL-Mariner Servicing Account <[email protected]> - 5.15.123.1-1
+- Auto-upgrade to 5.15.123.1
+
 * Fri Jul 28 2023 Vince Perri <[email protected]> - 5.15.122.1-2
 - Bump release number to match kernel release.
 

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

@@ -9,7 +9,7 @@
 %define uname_r %{version}-%{release}
 Summary:        Signed Linux Kernel for %{buildarch} systems
 Name:           kernel-signed-%{buildarch}
-Version:        5.15.122.1
+Version:        5.15.125.1
 Release:        2%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
@@ -153,6 +153,15 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %exclude /module_info.ld
 
 %changelog
+* Thu Aug 10 2023 Rachel Menge <[email protected]> - 5.15.125.1-2
+- Bump release to match kernel
+
+* Wed Aug 09 2023 CBL-Mariner Servicing Account <[email protected]> - 5.15.125.1-1
+- Auto-upgrade to 5.15.125.1
+
+* Tue Aug 01 2023 CBL-Mariner Servicing Account <[email protected]> - 5.15.123.1-1
+- Auto-upgrade to 5.15.123.1
+
 * Fri Jul 28 2023 Juan Camposeco <[email protected]> - 5.15.122.1-2
 - Bump release to match kernel