test

sonic-net · Jan 3, 2025 · 2980f3e · 2980f3e
1 parent 2e9fcb8
commit 2980f3e
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml
@@ -19,13 +19,21 @@ parameters:
 - name: 'qemuOrCrossBuild'
   type: boolean
   default: false
+- name: SUBMODULE_NAME
+  type: string
+  default: ''
+- name: COMMIT_ID
+  type: string
+  default: ''
 
 jobs:
 - template: azure-pipelines-image-template.yml
   parameters:
     jobFilters: ${{ parameters.jobFilters }}
     preSteps: ${{ parameters.preSteps }}
     postSteps: ${{ parameters.postSteps }}
+    SUBMODULE_NAME: ${{ parameters.SUBMODULE_NAME }}
+    COMMIT_ID: ${{ parameters.COMMIT_ID }}
     jobVariables:
       PLATFORM_AZP: $(GROUP_NAME)
       PLATFORM_ARCH: amd64

diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml
@@ -19,6 +19,12 @@ parameters:
 - name: jobVariables
   type: object
   default: []
+- name: SUBMODULE_NAME
+  type: string
+  default: ''
+- name: COMMIT_ID
+  type: string
+  default: ''
 jobs:
 - template: azure-pipelines-job-groups.yml
   parameters:
@@ -48,8 +54,14 @@ jobs:
         displayName: 'setfacl'
       - script: |
           BRANCH_NAME=$(Build.SourceBranchName)
-          [ -n "$SYSTEM_PULLREQUEST_PULLREQUESTID" ] && BRANCH_NAME="$SYSTEM_PULLREQUEST_TARGETBRANCH-$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER"
-          git checkout -b $BRANCH_NAME
+          if [ -n "$SYSTEM_PULLREQUEST_PULLREQUESTID" ]; then
+            BRANCH_NAME="$SYSTEM_PULLREQUEST_TARGETBRANCH-$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER"
+            git checkout -b $BRANCH_NAME
+          elif [ -n "${{ parameters.COMMIT_ID }}" and -n "${{ parameters.SUBMODULE_NAME }}"]; then
+            git submodule update --init --recursive
+            cd src/${{ parameters.SUBMODULE_NAME }}
+            git checkout ${{ parameters.COMMIT_ID }}
+          fi
           sudo modprobe overlay
           sudo apt-get install -y acl
           sudo bash -c "echo 1 > /proc/sys/vm/compact_memory"

diff --git a/.azure-pipelines/azure-pipelines-quick-build-and-test.yml b/.azure-pipelines/azure-pipelines-quick-build-and-test.yml
@@ -91,16 +91,18 @@ stages:
   - stage: BuildVS
     pool: sonicbld-1es
     jobs:
-    - template: azure-pipelines-checkout-submodule-commit.yml
-      parameters:
-        SUBMODULE_NAME: ${{ parameters.SUBMODULE_NAME }}
-        COMMIT_ID: ${{ parameters.COMMIT_ID }}
+    # - template: azure-pipelines-checkout-submodule-commit.yml
+    #   parameters:
+    #     SUBMODULE_NAME: ${{ parameters.SUBMODULE_NAME }}
+    #     COMMIT_ID: ${{ parameters.COMMIT_ID }}
 
     - template: azure-pipelines-build.yml
       parameters:
         buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) BUILD_MULTIASIC_KVM=y INCLUDE_DHCP_SERVER=y ${{ variables.  VERSION_CONTROL_OPTIONS }}'
         jobGroups:
         - name: vs
+        SUBMODULE_NAME: ${{ parameters.SUBMODULE_NAME }}
+        COMMIT_ID: ${{ parameters.COMMIT_ID }}
 
   - stage: Test
     dependsOn: BuildVS