From 9741b177646d6013de9e870952138419b8f70481 Mon Sep 17 00:00:00 2001
From: Christian Svensson <blue@cmd.nu>
Date: Fri, 19 Jan 2024 23:22:12 +0100
Subject: [PATCH] kamel: ci: rocky tweaks

---
 .azure-pipelines/azure-pipelines-image-template.yml | 3 ---
 .azure-pipelines/build-template.yml                 | 2 --
 .azure-pipelines/kamel-build.yml                    | 8 ++++++++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml
index 2536766b8c65..95d3957cee17 100644
--- a/.azure-pipelines/azure-pipelines-image-template.yml
+++ b/.azure-pipelines/azure-pipelines-image-template.yml
@@ -44,9 +44,6 @@ jobs:
           BRANCH_NAME=$(Build.SourceBranchName)
           [ -n "$SYSTEM_PULLREQUEST_PULLREQUESTID" ] && BRANCH_NAME="$SYSTEM_PULLREQUEST_TARGETBRANCH-$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER"
           git checkout -b $BRANCH_NAME
-          sudo modprobe overlay
-          sudo apt-get install -y acl
-          sudo bash -c "echo 1 > /proc/sys/vm/compact_memory"
           ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$(PLATFORM_AZP) PLATFORM_ARCH=$(PLATFORM_ARCH) $(BUILD_OPTIONS) configure
         displayName: 'Make configure'
     postSteps:
diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml
index 52bff4aa9e51..0f3d9ff4a96a 100644
--- a/.azure-pipelines/build-template.yml
+++ b/.azure-pipelines/build-template.yml
@@ -78,8 +78,6 @@ jobs:
     displayName: 'Reset submodules'
   - script: |
       set -e
-      sudo modprobe overlay
-      sudo apt-get install -y acl
       export DOCKER_DATA_ROOT_FOR_MULTIARCH=/data/march/docker
       CACHE_OPTIONS="SONIC_DPKG_CACHE_METHOD=${{ parameters.cache_mode }} SONIC_DPKG_CACHE_SOURCE=/nfs/dpkg_cache/${{ parameters.platform }}"
       ENABLE_DOCKER_BASE_PULL=y make configure PLATFORM=${{ parameters.platform }} PLATFORM_ARCH=${{ parameters.platform_arch }}
diff --git a/.azure-pipelines/kamel-build.yml b/.azure-pipelines/kamel-build.yml
index ae906725dd95..070aff116d0c 100644
--- a/.azure-pipelines/kamel-build.yml
+++ b/.azure-pipelines/kamel-build.yml
@@ -74,6 +74,14 @@ stages:
   - template: azure-pipelines-build.yml
     parameters:
       buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) ${{ variables.VERSION_CONTROL_OPTIONS }}'
+      preSteps:
+        - script: |
+            # Check build dependencies
+            set -xe
+            which j2
+            which make
+            docker info
+          displayName: 'Verify dependencies'
       jobGroups:
         - name: broadcom
           variables: