Merge branch 'master' into pensando-mtfuji-v2

Author: prabhataravind

.azure-pipelines/azure-pipelines-Official.yml

@@ -14,7 +14,7 @@ schedules:
     - 202012
   always: true
 
-pool: sonicbld-1es
+pool: sonicso1ES-amd64
 
 stages:
 - stage: Build

.azure-pipelines/azure-pipelines-UpgrateVersion.yml

@@ -26,7 +26,7 @@ resources:
     ref: master
     endpoint: sonic-net
 
-pool: sonicbld-1es
+pool: sonicso1ES-amd64
 
 parameters:
 - name: 'jobFilters'

.azure-pipelines/azure-pipelines-build-vs-and-test.yml

@@ -93,7 +93,7 @@ parameters:
 
 stages:
   - stage: BuildVS
-    pool: sonicbld-1es
+    pool: sonicso1ES-amd64
     jobs:
     - template: azure-pipelines-build.yml
       parameters:

.azure-pipelines/azure-pipelines-build.yml

@@ -78,14 +78,14 @@ jobs:
 
         - name: marvell-prestera-armhf
           ${{ if not(parameters.qemuOrCrossBuild) }}:
-            pool: sonicbld-armhf
+            pool: sonicso1ES-armhf
           variables:
             PLATFORM_NAME: marvell-prestera
             PLATFORM_ARCH: armhf
 
         - name: marvell-prestera-arm64
           ${{ if not(parameters.qemuOrCrossBuild) }}:
-            pool: sonicbld-arm64
+            pool: sonicso1ES-arm64
           variables:
             PLATFORM_NAME: marvell-prestera
             PLATFORM_ARCH: arm64
@@ -106,12 +106,12 @@ jobs:
             platform_rpc: nephos
 
         - name: pensando
-          pool: sonicbld-arm64
+          pool: sonicso1ES-arm64
           variables:
             PLATFORM_ARCH: arm64
 
         - name: nvidia-bluefield
-          pool: sonicbld-arm64
+          pool: sonicso1ES-arm64
           variables:
             PLATFORM_ARCH: arm64
 
@@ -147,6 +147,7 @@ jobs:
               rm target/sonic-vs.img
             fi
             make $BUILD_OPTIONS target/docker-sonic-vs.gz target/sonic-vs.img.gz
+            make $BUILD_OPTIONS target/docker-ptf.gz
             if [ $(Build.Reason) != 'PullRequest' ];then
               gzip -kd target/sonic-vs.img.gz
               SONIC_RUN_CMDS="qemu-img convert target/sonic-vs.img -O vhdx -o subformat=dynamic target/sonic-vs.vhdx" make $BUILD_OPTIONS sonic-slave-run

.azure-pipelines/azure-pipelines-image-template.yml

@@ -60,15 +60,17 @@ jobs:
           fi
         displayName: 'Checkout commit'
       - script: |
-          set -x
+          set -ex
+          sudo apt-get update
+          sudo apt-get install -y acl
           sudo setfacl -R -b $(Agent.BuildDirectory)
         displayName: 'setfacl'
       - script: |
+          set -ex
           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"
           [ -z "$PLATFORM_NAME" ] && PLATFORM_NAME=$(PLATFORM_AZP)
           ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$PLATFORM_NAME PLATFORM_ARCH=$(PLATFORM_ARCH) $(BUILD_OPTIONS) configure
@@ -78,6 +80,28 @@ jobs:
           BUILD_REASON=$(Build.Reason)
           echo "Build.Reason = $BUILD_REASON"
           echo "Build.DefinitionName = $BUILD_DEFINITIONNAME"
+          if [[ "$BUILD_REASON" == "PullRequest" ]]; then
+            echo "Checking for changes to dockers/docker-ptf/Dockerfile.j2 in PR..."
+            # Get the target branch and check for changes
+            TARGET_BRANCH="origin/$(System.PullRequest.TargetBranch)"
+            echo "Comparing against target branch: $TARGET_BRANCH"
+            # Fetch target branch to ensure we have the latest
+            git fetch origin $(System.PullRequest.TargetBranch)
+            # Check if docker-ptf Dockerfile.j2 has changes
+            # NOTE: The PTF_MODIFIED template parameter is of type string
+            # Ensure to set it to "True" or "False" (not boolean true/false)
+            if git diff --name-only $TARGET_BRANCH...HEAD | grep -q "dockers/docker-ptf/Dockerfile.j2"; then
+              echo "docker-ptf/Dockerfile.j2 has been modified in this PR"
+              echo "##vso[task.setvariable variable=PTF_MODIFIED;isOutput=true]True"
+            else
+              echo "docker-ptf/Dockerfile.j2 has not been modified in this PR"
+              echo "##vso[task.setvariable variable=PTF_MODIFIED;isOutput=true]False"
+            fi
+          else
+            echo "Not a PR build, setting PTF_MODIFIED to false"
+            echo "##vso[task.setvariable variable=PTF_MODIFIED;isOutput=true]False"
+          fi
+
           if [[ "$BUILD_REASON" != "PullRequest" && "$BUILD_DEFINITIONNAME" == "Azure.sonic-buildimage.official.vs" ]]
           then
             PORT=443
@@ -96,6 +120,7 @@ jobs:
           mv target/* $(Build.ArtifactStagingDirectory)/target/
         env:
           REGISTRY_PASSWD: $(REGISTRY_PASSWD)
+        name: PublishAndSetPtfTag
         displayName: Publish to Docker Registry and Copy Artifacts
         condition: always()
       - publish:  $(Build.ArtifactStagingDirectory)

.azure-pipelines/baseline_test/baseline.test.buildimage.yml

@@ -59,7 +59,7 @@ variables:
 
 stages:
   - stage: BuildVS
-    pool: sonicbld-1es
+    pool: sonicso1ES-amd64
     jobs:
     - template: ../azure-pipelines-build.yml
       parameters:

.azure-pipelines/build-template.yml

@@ -35,9 +35,10 @@ parameters:
 - name: pool
   type: string
   values:
-  - sonicbld-1es
-  - sonicbld_8c
-  default: sonicbld-1es
+  - sonicso1ES-amd64
+  - sonicso1ES-arm64
+  - sonicso1ES-armhf
+  default: sonicso1ES-amd64
 
 - name: dbg_image
   type: boolean

.azure-pipelines/docker-sonic-mgmt-mixed.yml

@@ -40,7 +40,7 @@ stages:
 - stage: Build
   jobs:
   - job: Build
-    pool: sonicbld-1es
+    pool: sonicso1ES-amd64
     timeoutInMinutes: 360
     steps:
     - template: cleanup.yml
@@ -55,8 +55,8 @@ stages:
         set -xe
         git submodule update --init --recursive -- src/sonic-platform-daemons src/sonic-genl-packet src/sonic-sairedis src/ptf src/sonic-device-data src/sonic-dash-api
 
-        make SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y configure PLATFORM=generic DOCKER_BUILDKIT=0
-        make -f Makefile.work BLDENV=bullseye SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y LEGACY_SONIC_MGMT_DOCKER=n target/docker-sonic-mgmt.gz
+        make NOBUSTER=1 NOBULLSEYE=1 SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y configure PLATFORM=generic DOCKER_BUILDKIT=0
+        make -f Makefile.work BLDENV=bookworm SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y target/docker-sonic-mgmt.gz
         cp target -r $(Build.ArtifactStagingDirectory)/target
         docker load -i target/docker-sonic-mgmt.gz
         docker tag docker-sonic-mgmt $REGISTRY_SERVER/docker-sonic-mgmt:latest
@@ -69,7 +69,7 @@ stages:
       displayName: "Archive docker image sonic-mgmt"
 
   - job: validate_docker_image_and_upload
-    pool: sonicbld-1es
+    pool: sonicso1ES-amd64
     timeoutInMinutes: 360
     dependsOn: Build
     steps:

.azure-pipelines/docker-sonic-mgmt.yml

@@ -10,9 +10,6 @@ parameters:
   - amd64
   - armhf
   - arm64
-- name: march
-  type: string
-  default: ''
 - name: dist
   type: string
   values:
@@ -30,22 +27,22 @@ parameters:
   default: sonicdev
 - name: pool
   type: string
-  default: sonicbld-1es
+  default: sonicso1ES-amd64
   values:
-  - sonicbld-1es
-  - sonicbld-arm64
-  - sonicbld-armhf
+  - sonicso1ES-amd64
+  - sonicso1ES-arm64
+  - sonicso1ES-armhf
 
 jobs:
-- job: sonic_slave_${{ parameters.dist }}${{ parameters.march }}
+- job: sonic_slave_${{ parameters.dist }}_${{ parameters.arch }}
   timeoutInMinutes: 360
   variables:
-  - template: /.azure-pipelines/template-variables.yml@buildimage
-  - template: /.azure-pipelines/azure-pipelines-repd-build-variables.yml@buildimage
+  - template: template-variables.yml
+  - template: azure-pipelines-repd-build-variables.yml
   pool: ${{ parameters.pool }}
   steps:
   - template: cleanup.yml
-  - template: /.azure-pipelines/template-clean-sonic-slave.yml@buildimage
+  - template: template-clean-sonic-slave.yml
   - checkout: self
     clean: true
   - task: Docker@2
@@ -68,7 +65,7 @@ jobs:
         exit 0
       fi
 
-      DOCKER_DATA_ROOT_FOR_MULTIARCH=/data/march/docker BLDENV=${{ parameters.dist }} make -f Makefile.work configure $build_options PLATFORM=generic PLATFORM_ARCH=${{ parameters.arch }} $args || docker image ls $image_tag
+      BLDENV=${{ parameters.dist }} make -f Makefile.work configure $build_options PLATFORM=generic PLATFORM_ARCH=${{ parameters.arch }} || docker image ls $image_tag
       if [[ "$(Build.Reason)" == "PullRequest" ]];then
         exit 0
       fi