From 3bc5b2858a3c954158d2a46398015880b0e413ae Mon Sep 17 00:00:00 2001 From: xwjiang-ms Date: Wed, 25 Dec 2024 06:07:33 +0000 Subject: [PATCH 01/22] Add quick build and test pipeline --- .../azure-pipelines-quick-build-and-test.yml | 108 ++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 .azure-pipelines/azure-pipelines-quick-build-and-test.yml diff --git a/.azure-pipelines/azure-pipelines-quick-build-and-test.yml b/.azure-pipelines/azure-pipelines-quick-build-and-test.yml new file mode 100644 index 00000000000..8e110516561 --- /dev/null +++ b/.azure-pipelines/azure-pipelines-quick-build-and-test.yml @@ -0,0 +1,108 @@ +pr: + branches: + include: + - master + paths: + exclude: + - .github + - docs + - LICENSE + - README.md + - SECURITY.md +trigger: none + + +name: $(TeamProject)_$(Build.DefinitionName)_$(SourceBranchName)_$(Date:yyyyMMdd)$(Rev:.r) + +resources: + repositories: + - repository: sonic-mgmt + type: github + name: sonic-net/sonic-mgmt + ref: master + endpoint: sonic-net + - repository: buildimage + type: github + name: sonic-net/sonic-buildimage + endpoint: sonic-net + ref: master + + +parameters: + - name: github_conn + type: string + default: 'github.com_sonic-net' + + - name: SUBMODULE_NAME + type: string + default: '' + + - name: COMMIT_ID + type: string + default: '' + + - name: BRANCH + type: string + default: 'master' + + - name: TOPOLOGY + type: string + default: '' + values: + - t0 + - t0-64-32 + - t1-lag + - multi-asic-t1-lag + - dualtor + - dpu + + - name: DEPLOY_MG_EXTRA_PARAMS + type: string + default: '' + + - name: SCRIPTS + type: string + default: '' + + - name: FEATURES + type: string + default: '' + + +stages: + - stage: BuildVS + pool: sonicbld-1es + jobs: + - template: .azure-pipelines/azure-pipelines-build.yml@buildimage + parameters: + buildOptions: 'USERNAME=admin SONIC_BUILD_JOBS=$(nproc) BUILD_MULTIASIC_KVM=y INCLUDE_DHCP_SERVER=y ${{ variables.VERSION_CONTROL_OPTIONS }}' + jobGroups: + - name: vs + + - stage: Test + dependsOn: BuildVS + condition: and(succeeded(), and(ne(stageDependencies.BuildVS.outputs['vs.SetVar.SKIP_VSTEST'], 'YES'), in(dependencies.BuildVS.result, 'Succeeded', 'SucceededWithIssues'))) + variables: + - group: SONiC-Elastictest + - name: inventory + value: veos_vtb + - name: testbed_file + value: vtestbed.csv + + jobs: + - job: KVMTEST + displayName: "kvmtest by Elastictest" + timeoutInMinutes: 240 + continueOnError: false + pool: sonic-ubuntu-1c + steps: + - template: .azure-pipelines/run-test-elastictest-template.yml + parameters: + TOPOLOGY: ${{ parameters.TOPOLOGY }} + MIN_WORKER: $(T0_INSTANCE_NUM) + MAX_WORKER: $(T0_INSTANCE_NUM) + KVM_IMAGE_BRANCH: $(BUILD_BRANCH) + MGMT_BRANCH: ${{ parameters.BRANCH }} + SCRIPTS: ${{ parameters.SCRIPTS }} + FEATURES: ${{ parameters.FEATURES }} + DEPLOY_MG_EXTRA_PARAMS: ${{ parameters.DEPLOY_MG_EXTRA_PARAMS }} From dccfc702b0be807a4d753ee1f2411c7bd29efbb6 Mon Sep 17 00:00:00 2001 From: xwjiang-ms Date: Thu, 2 Jan 2025 09:11:27 +0000 Subject: [PATCH 02/22] Add quick build and test pipeline --- ...re-pipelines-checkout-submodule-commit.yml | 9 +++++ .../azure-pipelines-quick-build-and-test.yml | 36 ++++++++++++++++--- 2 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 .azure-pipelines/azure-pipelines-checkout-submodule-commit.yml diff --git a/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml b/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml new file mode 100644 index 00000000000..8361e63e0ba --- /dev/null +++ b/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml @@ -0,0 +1,9 @@ +steps: +- script: | + if [ -z "$(SUBMODULE_NAME)" ]; then + git checkout $(COMMIT_ID) + else + git submodule update --init --recursive + cd src/$(SUBMODULE_NAME) + git checkout $(COMMIT_ID) + fi diff --git a/.azure-pipelines/azure-pipelines-quick-build-and-test.yml b/.azure-pipelines/azure-pipelines-quick-build-and-test.yml index 8e110516561..b8f0095c962 100644 --- a/.azure-pipelines/azure-pipelines-quick-build-and-test.yml +++ b/.azure-pipelines/azure-pipelines-quick-build-and-test.yml @@ -28,6 +28,20 @@ resources: ref: master +variables: +- template: .azure-pipelines/azure-pipelines-repd-build-variables.yml@buildimage +- template: .azure-pipelines/template-variables.yml@buildimage +- name: CACHE_MODE + value: rcache +- name: ENABLE_FIPS + value: y +- name: BUILD_BRANCH + ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: + value: $(System.PullRequest.TargetBranch) + ${{ else }}: + value: $(Build.SourceBranchName) + + parameters: - name: github_conn type: string @@ -68,12 +82,26 @@ parameters: type: string default: '' + - name: MIN_WORKER + type: string + default: '' + + - name: MAX_WORKER + type: string + default: '' + stages: - stage: BuildVS pool: sonicbld-1es jobs: - - template: .azure-pipelines/azure-pipelines-build.yml@buildimage + - template: .azure-pipelines/azure-pipelines-checkout-submodule-commit.yml + parameters: + github_conn: ${{ parameters.github_conn }} + SUBMODULE_NAME: ${{ parameters.SUBMODULE_NAME }} + COMMIT_ID: ${{ parameters.COMMIT_ID }} + + - template: .azure-pipelines/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: @@ -96,11 +124,11 @@ stages: continueOnError: false pool: sonic-ubuntu-1c steps: - - template: .azure-pipelines/run-test-elastictest-template.yml + - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt parameters: TOPOLOGY: ${{ parameters.TOPOLOGY }} - MIN_WORKER: $(T0_INSTANCE_NUM) - MAX_WORKER: $(T0_INSTANCE_NUM) + MIN_WORKER: ${{ parameters.MIN_WORKER }} + MAX_WORKER: ${{ parameters.MAX_WORKER }} KVM_IMAGE_BRANCH: $(BUILD_BRANCH) MGMT_BRANCH: ${{ parameters.BRANCH }} SCRIPTS: ${{ parameters.SCRIPTS }} From 65aab7f83e52764c05dacaeab02e2fee1d410494 Mon Sep 17 00:00:00 2001 From: xwjiang-ms Date: Thu, 2 Jan 2025 09:34:39 +0000 Subject: [PATCH 03/22] fix --- .../azure-pipelines-checkout-submodule-commit.yml | 10 ++++++---- .../azure-pipelines-quick-build-and-test.yml | 6 +----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml b/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml index 8361e63e0ba..7f4a0993f0a 100644 --- a/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml +++ b/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml @@ -1,9 +1,11 @@ steps: - script: | - if [ -z "$(SUBMODULE_NAME)" ]; then - git checkout $(COMMIT_ID) + set -ex + + if [ -z "$SUBMODULE_NAME" ]; then + git checkout $COMMIT_ID else git submodule update --init --recursive - cd src/$(SUBMODULE_NAME) - git checkout $(COMMIT_ID) + cd src/$SUBMODULE_NAME + git checkout $COMMIT_ID fi diff --git a/.azure-pipelines/azure-pipelines-quick-build-and-test.yml b/.azure-pipelines/azure-pipelines-quick-build-and-test.yml index b8f0095c962..14a8f17c5d7 100644 --- a/.azure-pipelines/azure-pipelines-quick-build-and-test.yml +++ b/.azure-pipelines/azure-pipelines-quick-build-and-test.yml @@ -43,10 +43,6 @@ variables: parameters: - - name: github_conn - type: string - default: 'github.com_sonic-net' - - name: SUBMODULE_NAME type: string default: '' @@ -96,8 +92,8 @@ stages: pool: sonicbld-1es jobs: - template: .azure-pipelines/azure-pipelines-checkout-submodule-commit.yml + dependsOn: and( ${{ parameters.COMMIT_ID }} ) parameters: - github_conn: ${{ parameters.github_conn }} SUBMODULE_NAME: ${{ parameters.SUBMODULE_NAME }} COMMIT_ID: ${{ parameters.COMMIT_ID }} From b93029efcb553a61f97c1f1c4eadb8dc87d4bc6c Mon Sep 17 00:00:00 2001 From: xwjiang-ms Date: Thu, 2 Jan 2025 09:39:23 +0000 Subject: [PATCH 04/22] fix --- ...re-pipelines-checkout-submodule-commit.yml | 14 ++++++----- .../azure-pipelines-quick-build-and-test.yml | 24 ++++++++++--------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml b/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml index 7f4a0993f0a..ffc36cd932f 100644 --- a/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml +++ b/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml @@ -2,10 +2,12 @@ steps: - script: | set -ex - if [ -z "$SUBMODULE_NAME" ]; then - git checkout $COMMIT_ID - else - git submodule update --init --recursive - cd src/$SUBMODULE_NAME - git checkout $COMMIT_ID + if [ -n "$COMMIT_ID" ]; then + if [ -z "$SUBMODULE_NAME" ]; then + git checkout $COMMIT_ID + else + git submodule update --init --recursive + cd src/$SUBMODULE_NAME + git checkout $COMMIT_ID + fi fi diff --git a/.azure-pipelines/azure-pipelines-quick-build-and-test.yml b/.azure-pipelines/azure-pipelines-quick-build-and-test.yml index 14a8f17c5d7..23d458defc8 100644 --- a/.azure-pipelines/azure-pipelines-quick-build-and-test.yml +++ b/.azure-pipelines/azure-pipelines-quick-build-and-test.yml @@ -91,17 +91,19 @@ stages: - stage: BuildVS pool: sonicbld-1es jobs: - - template: .azure-pipelines/azure-pipelines-checkout-submodule-commit.yml - dependsOn: and( ${{ parameters.COMMIT_ID }} ) - parameters: - SUBMODULE_NAME: ${{ parameters.SUBMODULE_NAME }} - COMMIT_ID: ${{ parameters.COMMIT_ID }} - - - template: .azure-pipelines/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 + - job: BuildVS + pool: sonicbld-1es + steps: + - template: .azure-pipelines/azure-pipelines-checkout-submodule-commit.yml + parameters: + SUBMODULE_NAME: ${{ parameters.SUBMODULE_NAME }} + COMMIT_ID: ${{ parameters.COMMIT_ID }} + + - template: .azure-pipelines/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 - stage: Test dependsOn: BuildVS From 5729cf4d26a806c65fdff4984debec27801bddcb Mon Sep 17 00:00:00 2001 From: xwjiang-ms Date: Thu, 2 Jan 2025 09:43:46 +0000 Subject: [PATCH 05/22] fix --- .azure-pipelines/azure-pipelines-quick-build-and-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-quick-build-and-test.yml b/.azure-pipelines/azure-pipelines-quick-build-and-test.yml index 23d458defc8..6e000d7aa85 100644 --- a/.azure-pipelines/azure-pipelines-quick-build-and-test.yml +++ b/.azure-pipelines/azure-pipelines-quick-build-and-test.yml @@ -94,12 +94,12 @@ stages: - job: BuildVS pool: sonicbld-1es steps: - - template: .azure-pipelines/azure-pipelines-checkout-submodule-commit.yml + - template: azure-pipelines-checkout-submodule-commit.yml parameters: SUBMODULE_NAME: ${{ parameters.SUBMODULE_NAME }} COMMIT_ID: ${{ parameters.COMMIT_ID }} - - template: .azure-pipelines/azure-pipelines-build.yml + - 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: From d61414f3fd15bac1b0ef83e92a749b3581eb127b Mon Sep 17 00:00:00 2001 From: xwjiang-ms Date: Thu, 2 Jan 2025 09:55:10 +0000 Subject: [PATCH 06/22] fix --- .../azure-pipelines-quick-build-and-test.yml | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-quick-build-and-test.yml b/.azure-pipelines/azure-pipelines-quick-build-and-test.yml index 6e000d7aa85..268f21fad15 100644 --- a/.azure-pipelines/azure-pipelines-quick-build-and-test.yml +++ b/.azure-pipelines/azure-pipelines-quick-build-and-test.yml @@ -91,19 +91,16 @@ stages: - stage: BuildVS pool: sonicbld-1es jobs: - - job: BuildVS - pool: sonicbld-1es - steps: - - 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 + - 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 - stage: Test dependsOn: BuildVS From 63f2456b84a6cb96bf49695fa1adceea8a8017b9 Mon Sep 17 00:00:00 2001 From: xwjiang-ms Date: Thu, 2 Jan 2025 09:56:13 +0000 Subject: [PATCH 07/22] fix --- .azure-pipelines/azure-pipelines-checkout-submodule-commit.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml b/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml index ffc36cd932f..4e471fac493 100644 --- a/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml +++ b/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml @@ -1,4 +1,3 @@ -steps: - script: | set -ex From 212928d67195db2e75afac821ffbd3f3b285a7b7 Mon Sep 17 00:00:00 2001 From: xwjiang-ms Date: Thu, 2 Jan 2025 09:56:42 +0000 Subject: [PATCH 08/22] fix --- .azure-pipelines/azure-pipelines-checkout-submodule-commit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml b/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml index 4e471fac493..8bc5d7ee702 100644 --- a/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml +++ b/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml @@ -1,4 +1,4 @@ -- script: | +script: | set -ex if [ -n "$COMMIT_ID" ]; then From 10b84932809cf28a9a339584b674f06ae7ec7ed9 Mon Sep 17 00:00:00 2001 From: xwjiang-ms Date: Thu, 2 Jan 2025 09:58:59 +0000 Subject: [PATCH 09/22] fix --- ...re-pipelines-checkout-submodule-commit.yml | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml b/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml index 8bc5d7ee702..9dc01ce89dd 100644 --- a/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml +++ b/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml @@ -1,12 +1,15 @@ -script: | - set -ex +jobs: + - job: Checkout code + steps: + - script: | + set -ex - if [ -n "$COMMIT_ID" ]; then - if [ -z "$SUBMODULE_NAME" ]; then - git checkout $COMMIT_ID - else - git submodule update --init --recursive - cd src/$SUBMODULE_NAME - git checkout $COMMIT_ID - fi - fi + if [ -n "$COMMIT_ID" ]; then + if [ -z "$SUBMODULE_NAME" ]; then + git checkout $COMMIT_ID + else + git submodule update --init --recursive + cd src/$SUBMODULE_NAME + git checkout $COMMIT_ID + fi + fi From 76d75ca33055e969b36e70a92b2f4bdaa8707346 Mon Sep 17 00:00:00 2001 From: xwjiang-ms Date: Thu, 2 Jan 2025 09:59:50 +0000 Subject: [PATCH 10/22] fix --- .azure-pipelines/azure-pipelines-checkout-submodule-commit.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml b/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml index 9dc01ce89dd..d81123d80e7 100644 --- a/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml +++ b/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml @@ -1,5 +1,5 @@ jobs: - - job: Checkout code + - job: CheckoutCode steps: - script: | set -ex @@ -13,3 +13,4 @@ jobs: git checkout $COMMIT_ID fi fi + displayName: 'Checkout code' From 788c44845373baaf778eadf5471c01d795f539d2 Mon Sep 17 00:00:00 2001 From: xwjiang-ms Date: Fri, 3 Jan 2025 02:37:40 +0000 Subject: [PATCH 11/22] for test --- ...re-pipelines-checkout-submodule-commit.yml | 10 +-- .../azure-pipelines-quick-build-and-test.yml | 66 +++++++++---------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml b/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml index d81123d80e7..9e4da2991d4 100644 --- a/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml +++ b/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml @@ -4,13 +4,13 @@ jobs: - script: | set -ex - if [ -n "$COMMIT_ID" ]; then - if [ -z "$SUBMODULE_NAME" ]; then - git checkout $COMMIT_ID + if [ -n "${{ parameters.COMMIT_ID }}" ]; then + if [ -z "${{ parameters.SUBMODULE_NAME }}" ]; then + git checkout ${{ parameters.COMMIT_ID }} else git submodule update --init --recursive - cd src/$SUBMODULE_NAME - git checkout $COMMIT_ID + cd src/${{ parameters.SUBMODULE_NAME }} + git checkout ${{ parameters.COMMIT_ID }} fi fi displayName: 'Checkout code' diff --git a/.azure-pipelines/azure-pipelines-quick-build-and-test.yml b/.azure-pipelines/azure-pipelines-quick-build-and-test.yml index 268f21fad15..6fe38e2dbd3 100644 --- a/.azure-pipelines/azure-pipelines-quick-build-and-test.yml +++ b/.azure-pipelines/azure-pipelines-quick-build-and-test.yml @@ -96,36 +96,36 @@ stages: 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 - - - stage: Test - dependsOn: BuildVS - condition: and(succeeded(), and(ne(stageDependencies.BuildVS.outputs['vs.SetVar.SKIP_VSTEST'], 'YES'), in(dependencies.BuildVS.result, 'Succeeded', 'SucceededWithIssues'))) - variables: - - group: SONiC-Elastictest - - name: inventory - value: veos_vtb - - name: testbed_file - value: vtestbed.csv - - jobs: - - job: KVMTEST - displayName: "kvmtest by Elastictest" - timeoutInMinutes: 240 - continueOnError: false - pool: sonic-ubuntu-1c - steps: - - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt - parameters: - TOPOLOGY: ${{ parameters.TOPOLOGY }} - MIN_WORKER: ${{ parameters.MIN_WORKER }} - MAX_WORKER: ${{ parameters.MAX_WORKER }} - KVM_IMAGE_BRANCH: $(BUILD_BRANCH) - MGMT_BRANCH: ${{ parameters.BRANCH }} - SCRIPTS: ${{ parameters.SCRIPTS }} - FEATURES: ${{ parameters.FEATURES }} - DEPLOY_MG_EXTRA_PARAMS: ${{ parameters.DEPLOY_MG_EXTRA_PARAMS }} + # - 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 + + # - stage: Test + # dependsOn: BuildVS + # condition: and(succeeded(), and(ne(stageDependencies.BuildVS.outputs['vs.SetVar.SKIP_VSTEST'], 'YES'), in(dependencies.BuildVS.result, 'Succeeded', 'SucceededWithIssues'))) + # variables: + # - group: SONiC-Elastictest + # - name: inventory + # value: veos_vtb + # - name: testbed_file + # value: vtestbed.csv + + # jobs: + # - job: KVMTEST + # displayName: "kvmtest by Elastictest" + # timeoutInMinutes: 240 + # continueOnError: false + # pool: sonic-ubuntu-1c + # steps: + # - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt + # parameters: + # TOPOLOGY: ${{ parameters.TOPOLOGY }} + # MIN_WORKER: ${{ parameters.MIN_WORKER }} + # MAX_WORKER: ${{ parameters.MAX_WORKER }} + # KVM_IMAGE_BRANCH: $(BUILD_BRANCH) + # MGMT_BRANCH: ${{ parameters.BRANCH }} + # SCRIPTS: ${{ parameters.SCRIPTS }} + # FEATURES: ${{ parameters.FEATURES }} + # DEPLOY_MG_EXTRA_PARAMS: ${{ parameters.DEPLOY_MG_EXTRA_PARAMS }} From 2e9fcb836076086376a4ff7968db9c2e72e3c82f Mon Sep 17 00:00:00 2001 From: xwjiang-ms Date: Fri, 3 Jan 2025 02:50:28 +0000 Subject: [PATCH 12/22] remove test code --- .../azure-pipelines-quick-build-and-test.yml | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-quick-build-and-test.yml b/.azure-pipelines/azure-pipelines-quick-build-and-test.yml index 6fe38e2dbd3..268f21fad15 100644 --- a/.azure-pipelines/azure-pipelines-quick-build-and-test.yml +++ b/.azure-pipelines/azure-pipelines-quick-build-and-test.yml @@ -96,36 +96,36 @@ stages: 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 - - # - stage: Test - # dependsOn: BuildVS - # condition: and(succeeded(), and(ne(stageDependencies.BuildVS.outputs['vs.SetVar.SKIP_VSTEST'], 'YES'), in(dependencies.BuildVS.result, 'Succeeded', 'SucceededWithIssues'))) - # variables: - # - group: SONiC-Elastictest - # - name: inventory - # value: veos_vtb - # - name: testbed_file - # value: vtestbed.csv - - # jobs: - # - job: KVMTEST - # displayName: "kvmtest by Elastictest" - # timeoutInMinutes: 240 - # continueOnError: false - # pool: sonic-ubuntu-1c - # steps: - # - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt - # parameters: - # TOPOLOGY: ${{ parameters.TOPOLOGY }} - # MIN_WORKER: ${{ parameters.MIN_WORKER }} - # MAX_WORKER: ${{ parameters.MAX_WORKER }} - # KVM_IMAGE_BRANCH: $(BUILD_BRANCH) - # MGMT_BRANCH: ${{ parameters.BRANCH }} - # SCRIPTS: ${{ parameters.SCRIPTS }} - # FEATURES: ${{ parameters.FEATURES }} - # DEPLOY_MG_EXTRA_PARAMS: ${{ parameters.DEPLOY_MG_EXTRA_PARAMS }} + - 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 + + - stage: Test + dependsOn: BuildVS + condition: and(succeeded(), and(ne(stageDependencies.BuildVS.outputs['vs.SetVar.SKIP_VSTEST'], 'YES'), in(dependencies.BuildVS.result, 'Succeeded', 'SucceededWithIssues'))) + variables: + - group: SONiC-Elastictest + - name: inventory + value: veos_vtb + - name: testbed_file + value: vtestbed.csv + + jobs: + - job: KVMTEST + displayName: "kvmtest by Elastictest" + timeoutInMinutes: 240 + continueOnError: false + pool: sonic-ubuntu-1c + steps: + - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt + parameters: + TOPOLOGY: ${{ parameters.TOPOLOGY }} + MIN_WORKER: ${{ parameters.MIN_WORKER }} + MAX_WORKER: ${{ parameters.MAX_WORKER }} + KVM_IMAGE_BRANCH: $(BUILD_BRANCH) + MGMT_BRANCH: ${{ parameters.BRANCH }} + SCRIPTS: ${{ parameters.SCRIPTS }} + FEATURES: ${{ parameters.FEATURES }} + DEPLOY_MG_EXTRA_PARAMS: ${{ parameters.DEPLOY_MG_EXTRA_PARAMS }} From 2980f3e38a1787cdabf23496ad413161e6f01d35 Mon Sep 17 00:00:00 2001 From: xwjiang-ms Date: Fri, 3 Jan 2025 08:20:21 +0000 Subject: [PATCH 13/22] test --- .azure-pipelines/azure-pipelines-build.yml | 8 ++++++++ .../azure-pipelines-image-template.yml | 16 ++++++++++++++-- .../azure-pipelines-quick-build-and-test.yml | 10 ++++++---- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml index 57819513073..0e06d123e46 100644 --- a/.azure-pipelines/azure-pipelines-build.yml +++ b/.azure-pipelines/azure-pipelines-build.yml @@ -19,6 +19,12 @@ 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 @@ -26,6 +32,8 @@ jobs: 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 index f934bf36648..525c7a57e3e 100644 --- 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 index 268f21fad15..989a28bcbbb 100644 --- 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 From 52e232b5a5495fcf4aa98a338528ecd95c5edc08 Mon Sep 17 00:00:00 2001 From: xwjiang-ms Date: Tue, 7 Jan 2025 09:28:42 +0000 Subject: [PATCH 14/22] test --- .../azure-pipelines-image-template.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml index 525c7a57e3e..dbf43e7b7dc 100644 --- a/.azure-pipelines/azure-pipelines-image-template.yml +++ b/.azure-pipelines/azure-pipelines-image-template.yml @@ -48,20 +48,22 @@ jobs: fetchDepth: 0 condition: and(succeeded(), eq(variables.SKIP_CHECKOUT, '')) displayName: 'Checkout code' + - script: | + if [ -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 }} + cd ../../ + fi - script: | set -x sudo setfacl -R -b $(Agent.BuildDirectory) displayName: 'setfacl' - script: | BRANCH_NAME=$(Build.SourceBranchName) - 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 }} + [ -n "$SYSTEM_PULLREQUEST_PULLREQUESTID" ] && BRANCH_NAME="$SYSTEM_PULLREQUEST_TARGETBRANCH-$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER" fi + git checkout -b $BRANCH_NAME sudo modprobe overlay sudo apt-get install -y acl sudo bash -c "echo 1 > /proc/sys/vm/compact_memory" From e3de1f3b1ac8b664c3669a37451d633427180494 Mon Sep 17 00:00:00 2001 From: xwjiang-ms Date: Tue, 7 Jan 2025 12:32:44 +0000 Subject: [PATCH 15/22] fix error --- .azure-pipelines/azure-pipelines-image-template.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml index dbf43e7b7dc..facfd7639ee 100644 --- a/.azure-pipelines/azure-pipelines-image-template.yml +++ b/.azure-pipelines/azure-pipelines-image-template.yml @@ -49,7 +49,7 @@ jobs: condition: and(succeeded(), eq(variables.SKIP_CHECKOUT, '')) displayName: 'Checkout code' - script: | - if [ -n "${{ parameters.COMMIT_ID }}" and -n "${{ parameters.SUBMODULE_NAME }}"]; then + if [ -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 }} @@ -62,7 +62,6 @@ jobs: - script: | BRANCH_NAME=$(Build.SourceBranchName) [ -n "$SYSTEM_PULLREQUEST_PULLREQUESTID" ] && BRANCH_NAME="$SYSTEM_PULLREQUEST_TARGETBRANCH-$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER" - fi git checkout -b $BRANCH_NAME sudo modprobe overlay sudo apt-get install -y acl From 88b5c6e2d26e2e207f9e8622be4b339a4f5095c4 Mon Sep 17 00:00:00 2001 From: xwjiang-ms Date: Wed, 8 Jan 2025 05:55:48 +0000 Subject: [PATCH 16/22] test --- .azure-pipelines/azure-pipelines-image-template.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml index facfd7639ee..cf2f2a587a3 100644 --- a/.azure-pipelines/azure-pipelines-image-template.yml +++ b/.azure-pipelines/azure-pipelines-image-template.yml @@ -50,10 +50,10 @@ jobs: displayName: 'Checkout code' - script: | if [ -n "${{ parameters.COMMIT_ID }}" and -n "${{ parameters.SUBMODULE_NAME }}" ]; then - git submodule update --init --recursive - cd src/${{ parameters.SUBMODULE_NAME }} + if [ -n "${{ parameters.SUBMODULE_NAME }}" ]; then + git submodule update --init --recursive + cd src/${{ parameters.SUBMODULE_NAME }} git checkout ${{ parameters.COMMIT_ID }} - cd ../../ fi - script: | set -x From 0aacb96965040646cc76c286a8af4cbcc48d0cba Mon Sep 17 00:00:00 2001 From: xwjiang-ms Date: Wed, 8 Jan 2025 07:18:28 +0000 Subject: [PATCH 17/22] test --- .azure-pipelines/azure-pipelines-image-template.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml index cf2f2a587a3..74b88119e0a 100644 --- a/.azure-pipelines/azure-pipelines-image-template.yml +++ b/.azure-pipelines/azure-pipelines-image-template.yml @@ -49,10 +49,11 @@ jobs: condition: and(succeeded(), eq(variables.SKIP_CHECKOUT, '')) displayName: 'Checkout code' - script: | - if [ -n "${{ parameters.COMMIT_ID }}" and -n "${{ parameters.SUBMODULE_NAME }}" ]; then + if [ -n "${{ parameters.COMMIT_ID }}" ]; then if [ -n "${{ parameters.SUBMODULE_NAME }}" ]; then git submodule update --init --recursive cd src/${{ parameters.SUBMODULE_NAME }} + fi git checkout ${{ parameters.COMMIT_ID }} fi - script: | From a5ebc1c417638f842f909825644d00288788794b Mon Sep 17 00:00:00 2001 From: xwjiang-ms Date: Thu, 9 Jan 2025 04:29:06 +0000 Subject: [PATCH 18/22] fix --- ...zure-pipelines-checkout-submodule-commit.yml | 16 ---------------- .../azure-pipelines-quick-build-and-test.yml | 17 ++++++++++++----- 2 files changed, 12 insertions(+), 21 deletions(-) delete mode 100644 .azure-pipelines/azure-pipelines-checkout-submodule-commit.yml diff --git a/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml b/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml deleted file mode 100644 index 9e4da2991d4..00000000000 --- a/.azure-pipelines/azure-pipelines-checkout-submodule-commit.yml +++ /dev/null @@ -1,16 +0,0 @@ -jobs: - - job: CheckoutCode - steps: - - script: | - set -ex - - if [ -n "${{ parameters.COMMIT_ID }}" ]; then - if [ -z "${{ parameters.SUBMODULE_NAME }}" ]; then - git checkout ${{ parameters.COMMIT_ID }} - else - git submodule update --init --recursive - cd src/${{ parameters.SUBMODULE_NAME }} - git checkout ${{ parameters.COMMIT_ID }} - fi - fi - displayName: 'Checkout code' diff --git a/.azure-pipelines/azure-pipelines-quick-build-and-test.yml b/.azure-pipelines/azure-pipelines-quick-build-and-test.yml index 989a28bcbbb..2e23cb9297c 100644 --- a/.azure-pipelines/azure-pipelines-quick-build-and-test.yml +++ b/.azure-pipelines/azure-pipelines-quick-build-and-test.yml @@ -45,11 +45,11 @@ variables: parameters: - name: SUBMODULE_NAME type: string - default: '' + default: ' ' - name: COMMIT_ID type: string - default: '' + default: ' ' - name: BRANCH type: string @@ -68,15 +68,15 @@ parameters: - name: DEPLOY_MG_EXTRA_PARAMS type: string - default: '' + default: ' ' - name: SCRIPTS type: string - default: '' + default: ' ' - name: FEATURES type: string - default: '' + default: ' ' - name: MIN_WORKER type: string @@ -86,6 +86,12 @@ parameters: type: string default: '' + - name: STOP_ON_FAILURE + type: string + default: 'False' + values: + - 'True' + - 'False' stages: - stage: BuildVS @@ -131,3 +137,4 @@ stages: SCRIPTS: ${{ parameters.SCRIPTS }} FEATURES: ${{ parameters.FEATURES }} DEPLOY_MG_EXTRA_PARAMS: ${{ parameters.DEPLOY_MG_EXTRA_PARAMS }} + STOP_ON_FAILURE: ${{ parameters.STOP_ON_FAILURE }} From 70fbb42cd67c55865de7240b110c833b9057e182 Mon Sep 17 00:00:00 2001 From: xwjiang-ms Date: Thu, 9 Jan 2025 09:07:07 +0000 Subject: [PATCH 19/22] refine --- ....yml => azure-pipelines-build-vs-and-test.yml} | 15 +++++---------- .azure-pipelines/azure-pipelines-build.yml | 4 ++-- .../azure-pipelines-image-template.yml | 6 +++--- 3 files changed, 10 insertions(+), 15 deletions(-) rename .azure-pipelines/{azure-pipelines-quick-build-and-test.yml => azure-pipelines-build-vs-and-test.yml} (89%) diff --git a/.azure-pipelines/azure-pipelines-quick-build-and-test.yml b/.azure-pipelines/azure-pipelines-build-vs-and-test.yml similarity index 89% rename from .azure-pipelines/azure-pipelines-quick-build-and-test.yml rename to .azure-pipelines/azure-pipelines-build-vs-and-test.yml index 2e23cb9297c..0b22ee3215e 100644 --- a/.azure-pipelines/azure-pipelines-quick-build-and-test.yml +++ b/.azure-pipelines/azure-pipelines-build-vs-and-test.yml @@ -43,7 +43,7 @@ variables: parameters: - - name: SUBMODULE_NAME + - name: SUBMODULE type: string default: ' ' @@ -51,7 +51,7 @@ parameters: type: string default: ' ' - - name: BRANCH + - name: MGMT_BRANCH type: string default: 'master' @@ -97,17 +97,12 @@ 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-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 }} + SUBMODULE: ${{ parameters.SUBMODULE }} COMMIT_ID: ${{ parameters.COMMIT_ID }} - stage: Test @@ -118,7 +113,7 @@ stages: - name: inventory value: veos_vtb - name: testbed_file - value: vtestbed.csv + value: vtestbed.yaml jobs: - job: KVMTEST @@ -133,7 +128,7 @@ stages: MIN_WORKER: ${{ parameters.MIN_WORKER }} MAX_WORKER: ${{ parameters.MAX_WORKER }} KVM_IMAGE_BRANCH: $(BUILD_BRANCH) - MGMT_BRANCH: ${{ parameters.BRANCH }} + MGMT_BRANCH: ${{ parameters.MGMT_BRANCH }} SCRIPTS: ${{ parameters.SCRIPTS }} FEATURES: ${{ parameters.FEATURES }} DEPLOY_MG_EXTRA_PARAMS: ${{ parameters.DEPLOY_MG_EXTRA_PARAMS }} diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml index 0e06d123e46..f75023b0a17 100644 --- a/.azure-pipelines/azure-pipelines-build.yml +++ b/.azure-pipelines/azure-pipelines-build.yml @@ -19,7 +19,7 @@ parameters: - name: 'qemuOrCrossBuild' type: boolean default: false -- name: SUBMODULE_NAME +- name: SUBMODULE type: string default: '' - name: COMMIT_ID @@ -32,7 +32,7 @@ jobs: jobFilters: ${{ parameters.jobFilters }} preSteps: ${{ parameters.preSteps }} postSteps: ${{ parameters.postSteps }} - SUBMODULE_NAME: ${{ parameters.SUBMODULE_NAME }} + SUBMODULE: ${{ parameters.SUBMODULE }} COMMIT_ID: ${{ parameters.COMMIT_ID }} jobVariables: PLATFORM_AZP: $(GROUP_NAME) diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml index 74b88119e0a..937b4277ec5 100644 --- a/.azure-pipelines/azure-pipelines-image-template.yml +++ b/.azure-pipelines/azure-pipelines-image-template.yml @@ -19,7 +19,7 @@ parameters: - name: jobVariables type: object default: [] -- name: SUBMODULE_NAME +- name: SUBMODULE type: string default: '' - name: COMMIT_ID @@ -50,9 +50,9 @@ jobs: displayName: 'Checkout code' - script: | if [ -n "${{ parameters.COMMIT_ID }}" ]; then - if [ -n "${{ parameters.SUBMODULE_NAME }}" ]; then + if [ -n "${{ parameters.SUBMODULE }}" ]; then git submodule update --init --recursive - cd src/${{ parameters.SUBMODULE_NAME }} + cd src/${{ parameters.SUBMODULE }} fi git checkout ${{ parameters.COMMIT_ID }} fi From 91b6b108cc16447ad7da517cb5a4b9b5bc56192d Mon Sep 17 00:00:00 2001 From: xwjiang-ms Date: Thu, 9 Jan 2025 09:12:48 +0000 Subject: [PATCH 20/22] use 1 KVM worker in default --- .azure-pipelines/azure-pipelines-build-vs-and-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-build-vs-and-test.yml b/.azure-pipelines/azure-pipelines-build-vs-and-test.yml index 0b22ee3215e..ef6d7afd0fa 100644 --- a/.azure-pipelines/azure-pipelines-build-vs-and-test.yml +++ b/.azure-pipelines/azure-pipelines-build-vs-and-test.yml @@ -80,11 +80,11 @@ parameters: - name: MIN_WORKER type: string - default: '' + default: '1' - name: MAX_WORKER type: string - default: '' + default: '1' - name: STOP_ON_FAILURE type: string From b57eb8e66fa8e8eb779a238ad59eebc0b14789ce Mon Sep 17 00:00:00 2001 From: xwjiang-ms Date: Fri, 10 Jan 2025 02:27:52 +0000 Subject: [PATCH 21/22] refine --- .azure-pipelines/azure-pipelines-image-template.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.azure-pipelines/azure-pipelines-image-template.yml b/.azure-pipelines/azure-pipelines-image-template.yml index 937b4277ec5..9d9662bb0ad 100644 --- a/.azure-pipelines/azure-pipelines-image-template.yml +++ b/.azure-pipelines/azure-pipelines-image-template.yml @@ -55,7 +55,10 @@ jobs: cd src/${{ parameters.SUBMODULE }} fi git checkout ${{ parameters.COMMIT_ID }} + else + echo "No specific commit id provided, checkout to latest commit" fi + displayName: 'Checkout commit' - script: | set -x sudo setfacl -R -b $(Agent.BuildDirectory) From a3205f489451c0feb557b832f575ffd49d88a984 Mon Sep 17 00:00:00 2001 From: xwjiang-ms Date: Fri, 17 Jan 2025 00:34:29 +0000 Subject: [PATCH 22/22] fix comments --- .../azure-pipelines-build-vs-and-test.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-build-vs-and-test.yml b/.azure-pipelines/azure-pipelines-build-vs-and-test.yml index ef6d7afd0fa..26c1d7c855d 100644 --- a/.azure-pipelines/azure-pipelines-build-vs-and-test.yml +++ b/.azure-pipelines/azure-pipelines-build-vs-and-test.yml @@ -1,14 +1,4 @@ -pr: - branches: - include: - - master - paths: - exclude: - - .github - - docs - - LICENSE - - README.md - - SECURITY.md +pr: none trigger: none