Skip to content

Commit 423ec25

Browse files
xwjiang-msFengPan-Frank
authored andcommitted
Revert dynamic GLOBAL_PARAMS for reliable template passing (#25461)
What is the motivation for this PR PR sonic-mgmt#21636 imported GLOBAL_PARAMS to refactor pr_test_template.yml, which caused downstream templates to fail to receive parameters reliably. This aims to make parameter passing stable and predictable by replacing dynamic expansion with explicit parameters. How did you do it Reverted dynamic GLOBAL_PARAMS expansion to explicit parameters for reliable template passing. How did you verify/test it Not provided in PR description. Signed-off-by: xiaweijiang <xiaweijiang@microsoft.com> Signed-off-by: Feng Pan <fenpan@microsoft.com>
1 parent f647a50 commit 423ec25

2 files changed

Lines changed: 17 additions & 22 deletions

File tree

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

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,10 @@ stages:
7676
jobs:
7777
- template: .azure-pipelines/pr_test_template.yml@sonic-mgmt
7878
parameters:
79-
GLOBAL_PARAMS:
80-
BUILD_REASON: ${{ parameters.BUILD_REASON }}
81-
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
82-
STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
83-
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
79+
BUILD_REASON: ${{ parameters.BUILD_REASON }}
80+
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
81+
STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
82+
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
8483
CHECKOUT_SONIC_MGMT: ${{ parameters.CHECKOUT_SONIC_MGMT }}
8584

8685
- stage: Test_round_2
@@ -90,11 +89,10 @@ stages:
9089
jobs:
9190
- template: .azure-pipelines/pr_test_template.yml@sonic-mgmt
9291
parameters:
93-
GLOBAL_PARAMS:
94-
BUILD_REASON: ${{ parameters.BUILD_REASON }}
95-
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
96-
STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
97-
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
92+
BUILD_REASON: ${{ parameters.BUILD_REASON }}
93+
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
94+
STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
95+
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
9896
CHECKOUT_SONIC_MGMT: ${{ parameters.CHECKOUT_SONIC_MGMT }}
9997

10098
- stage: Test_round_3
@@ -104,11 +102,10 @@ stages:
104102
jobs:
105103
- template: .azure-pipelines/pr_test_template.yml@sonic-mgmt
106104
parameters:
107-
GLOBAL_PARAMS:
108-
BUILD_REASON: ${{ parameters.BUILD_REASON }}
109-
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
110-
STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
111-
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
105+
BUILD_REASON: ${{ parameters.BUILD_REASON }}
106+
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
107+
STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
108+
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
112109
CHECKOUT_SONIC_MGMT: ${{ parameters.CHECKOUT_SONIC_MGMT }}
113110

114111
- stage: Test_round_4
@@ -118,9 +115,8 @@ stages:
118115
jobs:
119116
- template: .azure-pipelines/pr_test_template.yml@sonic-mgmt
120117
parameters:
121-
GLOBAL_PARAMS:
122-
BUILD_REASON: ${{ parameters.BUILD_REASON }}
123-
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
124-
STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
125-
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
118+
BUILD_REASON: ${{ parameters.BUILD_REASON }}
119+
RETRY_TIMES: ${{ parameters.RETRY_TIMES }}
120+
STOP_ON_FAILURE: ${{ parameters.TEST_PLAN_STOP_ON_FAILURE }}
121+
TEST_PLAN_NUM: ${{ parameters.TEST_PLAN_NUM }}
126122
CHECKOUT_SONIC_MGMT: ${{ parameters.CHECKOUT_SONIC_MGMT }}

azure-pipelines.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,5 +208,4 @@ stages:
208208
- template: .azure-pipelines/pr_test_template.yml@sonic-mgmt
209209
parameters:
210210
CHECKOUT_SONIC_MGMT: ${{ parameters.CHECKOUT_SONIC_MGMT }}
211-
GLOBAL_PARAMS:
212-
PTF_MODIFIED: $(PTF_MODIFIED)
211+
PTF_MODIFIED: $(PTF_MODIFIED)

0 commit comments

Comments
 (0)