Merge branch 'sonic-net:master' into Watchport-Blackbox-Test-Plan

.azure-pipelines/baseline_test/baseline.test.mgmt.public.master.yml

@@ -4,81 +4,60 @@ trigger: none
 pr: none
 
 schedules:
-  - cron: "0 4 * * *"
+  - cron: "0 8 * * *"
     displayName: Baseline test Scheduler
     branches:
       include:
         - master
     always: true
 
 stages:
-- stage: Pre_test
-  variables:
-  - group: GIT_SECRETS
-  jobs:
-  - job: validate_test_cases
-    displayName: "Validate Test Cases"
-    timeoutInMinutes: 20
-    continueOnError: false
-    pool: ubuntu-20.04
-    steps:
-    - template: ../pytest-collect-only.yml
 
 - stage: Test_round_1
-  dependsOn:
-  - Pre_test
-  condition: succeeded('Pre_test')
   variables:
   - group: SONiC-Elastictest
   - name: inventory
     value: veos_vtb
   - name: testbed_file
     value: vtestbed.yaml
-  - group: GIT_SECRETS
   jobs:
   - template: baseline.test.template.yml
 
 - stage: Test_round_2
   dependsOn:
-  - Pre_test
   - Test_round_1
-  condition: and(succeeded('Pre_test'), succeededOrFailed('Test_round_1'))
+  condition: succeededOrFailed('Test_round_1')
   variables:
   - group: SONiC-Elastictest
   - name: inventory
     value: veos_vtb
   - name: testbed_file
     value: vtestbed.yaml
-  - group: GIT_SECRETS
   jobs:
   - template: baseline.test.template.yml
 
 - stage: Test_round_3
   dependsOn:
-  - Pre_test
   - Test_round_2
-  condition: and(succeeded('Pre_test'), succeededOrFailed('Test_round_2'))
+  condition: succeededOrFailed('Test_round_2')
   variables:
   - group: SONiC-Elastictest
   - name: inventory
     value: veos_vtb
   - name: testbed_file
     value: vtestbed.yaml
-  - group: GIT_SECRETS
   jobs:
   - template: baseline.test.template.yml
 
 - stage: Test_round_4
   dependsOn:
-  - Pre_test
   - Test_round_3
-  condition: and(succeeded('Pre_test'), succeededOrFailed('Test_round_3'))
+  condition: succeededOrFailed('Test_round_3')
   variables:
   - group: SONiC-Elastictest
   - name: inventory
     value: veos_vtb
   - name: testbed_file
     value: vtestbed.yaml
-  - group: GIT_SECRETS
   jobs:
   - template: baseline.test.template.yml

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

@@ -3,7 +3,7 @@ jobs:
   displayName: "kvmtest-t0 by Elastictest"
   timeoutInMinutes: 240
   continueOnError: false
-  pool: ubuntu-20.04
+  pool: sonic-ubuntu-1c
   steps:
   - template: ../run-test-elastictest-template.yml
     parameters:
@@ -21,7 +21,7 @@ jobs:
   displayName: "kvmtest-t0-2vlans by Elastictest"
   timeoutInMinutes: 240
   continueOnError: false
-  pool: ubuntu-20.04
+  pool: sonic-ubuntu-1c
   steps:
   - template: ../run-test-elastictest-template.yml
     parameters:
@@ -41,7 +41,7 @@ jobs:
   displayName: "kvmtest-t1-lag by Elastictest"
   timeoutInMinutes: 240
   continueOnError: false
-  pool: ubuntu-20.04
+  pool: sonic-ubuntu-1c
   steps:
   - template: ../run-test-elastictest-template.yml
     parameters:
@@ -59,7 +59,7 @@ jobs:
   displayName: "kvmtest-dualtor-t0 by Elastictest"
   timeoutInMinutes: 240
   continueOnError: false
-  pool: ubuntu-20.04
+  pool: sonic-ubuntu-1c
   steps:
     - template: ../run-test-elastictest-template.yml
       parameters:
@@ -78,7 +78,7 @@ jobs:
   displayName: "kvmtest-multi-asic-t1-lag by Elastictest"
   timeoutInMinutes: 240
   continueOnError: false
-  pool: ubuntu-20.04
+  pool: sonic-ubuntu-1c
   steps:
     - template: ../run-test-elastictest-template.yml
       parameters:
@@ -98,7 +98,7 @@ jobs:
   displayName: "kvmtest-t0-sonic by Elastictest"
   timeoutInMinutes: 240
   continueOnError: false
-  pool: ubuntu-20.04
+  pool: sonic-ubuntu-1c
   steps:
     - template: ../run-test-elastictest-template.yml
       parameters:
@@ -119,7 +119,7 @@ jobs:
   displayName: "kvmtest-dpu by Elastictest"
   timeoutInMinutes: 240
   continueOnError: false
-  pool: ubuntu-20.04
+  pool: sonic-ubuntu-1c
   steps:
     - template: ../run-test-elastictest-template.yml
       parameters: