From 5bad4f531305ade9b5846d52fb0cd139d56ca652 Mon Sep 17 00:00:00 2001 From: chunangli Date: Wed, 22 May 2024 10:07:57 +0800 Subject: [PATCH 01/10] Update PR test of internal build image repo not use PAT, replace with System.AccessToken defined in Azure pipelines Signed-off-by: Chun'ang Li --- .azure-pipelines/run-test-elastictest-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/run-test-elastictest-template.yml b/.azure-pipelines/run-test-elastictest-template.yml index 695268fc73c..4a55537888f 100644 --- a/.azure-pipelines/run-test-elastictest-template.yml +++ b/.azure-pipelines/run-test-elastictest-template.yml @@ -159,7 +159,7 @@ steps: # Else, internal build image repo, download from internal sonic-mgmt repo else - curl -u $(AZP_REPO_ACCESS_TOKEN) "${{ parameters.MGMT_URL }}&commitOrBranch=${{ parameters.MGMT_BRANCH }}&api-version=5.0-preview.1&path=.azure-pipelines%2Fpr_test_scripts.yaml" -o ./.azure-pipelines/pr_test_scripts.yaml + curl -u $(System.AccessToken) "${{ parameters.MGMT_URL }}&commitOrBranch=${{ parameters.MGMT_BRANCH }}&api-version=5.0-preview.1&path=.azure-pipelines%2Fpr_test_scripts.yaml" -o ./.azure-pipelines/pr_test_scripts.yaml fi displayName: "Download pr script" - ${{ else }}: From c3c47e7a12b72ae2e3ea377aae5f9aad0dbe06aa Mon Sep 17 00:00:00 2001 From: chunangli Date: Wed, 22 May 2024 10:16:38 +0800 Subject: [PATCH 02/10] Update PR test of internal build image repo not use PAT, replace with System.AccessToken defined in Azure pipelines Signed-off-by: Chun'ang Li --- .azure-pipelines/run-test-elastictest-template.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.azure-pipelines/run-test-elastictest-template.yml b/.azure-pipelines/run-test-elastictest-template.yml index 4a55537888f..6261980fd37 100644 --- a/.azure-pipelines/run-test-elastictest-template.yml +++ b/.azure-pipelines/run-test-elastictest-template.yml @@ -159,6 +159,7 @@ steps: # Else, internal build image repo, download from internal sonic-mgmt repo else + echo "Use System.AccessToken" curl -u $(System.AccessToken) "${{ parameters.MGMT_URL }}&commitOrBranch=${{ parameters.MGMT_BRANCH }}&api-version=5.0-preview.1&path=.azure-pipelines%2Fpr_test_scripts.yaml" -o ./.azure-pipelines/pr_test_scripts.yaml fi displayName: "Download pr script" From 3b9a4a52cf3b83ed2c2a8f55f2a7cd995eb1e551 Mon Sep 17 00:00:00 2001 From: chunangli Date: Wed, 22 May 2024 10:49:43 +0800 Subject: [PATCH 03/10] Update PR test of internal build image repo not use PAT, replace with System.AccessToken defined in Azure pipelines Signed-off-by: Chun'ang Li --- .azure-pipelines/run-test-elastictest-template.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/run-test-elastictest-template.yml b/.azure-pipelines/run-test-elastictest-template.yml index 6261980fd37..eba8b1f87b0 100644 --- a/.azure-pipelines/run-test-elastictest-template.yml +++ b/.azure-pipelines/run-test-elastictest-template.yml @@ -159,8 +159,8 @@ steps: # Else, internal build image repo, download from internal sonic-mgmt repo else - echo "Use System.AccessToken" - curl -u $(System.AccessToken) "${{ parameters.MGMT_URL }}&commitOrBranch=${{ parameters.MGMT_BRANCH }}&api-version=5.0-preview.1&path=.azure-pipelines%2Fpr_test_scripts.yaml" -o ./.azure-pipelines/pr_test_scripts.yaml + echo "Use ACCESS_TOKEN" + curl -u $(ACCESS_TOKEN) "${{ parameters.MGMT_URL }}&commitOrBranch=${{ parameters.MGMT_BRANCH }}&api-version=5.0-preview.1&path=.azure-pipelines%2Fpr_test_scripts.yaml" -o ./.azure-pipelines/pr_test_scripts.yaml fi displayName: "Download pr script" - ${{ else }}: From 08d66e8ae51718df3cae727e66fd0fd76f6dc000 Mon Sep 17 00:00:00 2001 From: chunangli Date: Wed, 22 May 2024 11:20:15 +0800 Subject: [PATCH 04/10] Update PR test of internal build image repo not use PAT, replace with System.AccessToken defined in Azure pipelines Signed-off-by: Chun'ang Li --- .azure-pipelines/run-test-elastictest-template.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/run-test-elastictest-template.yml b/.azure-pipelines/run-test-elastictest-template.yml index eba8b1f87b0..084534dd33f 100644 --- a/.azure-pipelines/run-test-elastictest-template.yml +++ b/.azure-pipelines/run-test-elastictest-template.yml @@ -159,8 +159,8 @@ steps: # Else, internal build image repo, download from internal sonic-mgmt repo else - echo "Use ACCESS_TOKEN" - curl -u $(ACCESS_TOKEN) "${{ parameters.MGMT_URL }}&commitOrBranch=${{ parameters.MGMT_BRANCH }}&api-version=5.0-preview.1&path=.azure-pipelines%2Fpr_test_scripts.yaml" -o ./.azure-pipelines/pr_test_scripts.yaml + echo "Use MSAZURE-TOKEN in sonicbld" + curl -u $(MSAZURE-TOKEN) "${{ parameters.MGMT_URL }}&commitOrBranch=${{ parameters.MGMT_BRANCH }}&api-version=5.0-preview.1&path=.azure-pipelines%2Fpr_test_scripts.yaml" -o ./.azure-pipelines/pr_test_scripts.yaml fi displayName: "Download pr script" - ${{ else }}: From 32c4eadab7a28a1676b7b928f1eebba4bd7c4ca9 Mon Sep 17 00:00:00 2001 From: chunangli Date: Wed, 22 May 2024 14:45:18 +0800 Subject: [PATCH 05/10] Update PR test of internal build image repo not use PAT, replace with System.AccessToken defined in Azure pipelines Signed-off-by: Chun'ang Li --- .azure-pipelines/run-test-elastictest-template.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/run-test-elastictest-template.yml b/.azure-pipelines/run-test-elastictest-template.yml index 084534dd33f..33e6cc2353c 100644 --- a/.azure-pipelines/run-test-elastictest-template.yml +++ b/.azure-pipelines/run-test-elastictest-template.yml @@ -159,8 +159,8 @@ steps: # Else, internal build image repo, download from internal sonic-mgmt repo else - echo "Use MSAZURE-TOKEN in sonicbld" - curl -u $(MSAZURE-TOKEN) "${{ parameters.MGMT_URL }}&commitOrBranch=${{ parameters.MGMT_BRANCH }}&api-version=5.0-preview.1&path=.azure-pipelines%2Fpr_test_scripts.yaml" -o ./.azure-pipelines/pr_test_scripts.yaml + echo "Use MSSONIC-TOKEN in sonicbld" + curl -u $(MSSONIC-TOKEN) "${{ parameters.MGMT_URL }}&commitOrBranch=${{ parameters.MGMT_BRANCH }}&api-version=5.0-preview.1&path=.azure-pipelines%2Fpr_test_scripts.yaml" -o ./.azure-pipelines/pr_test_scripts.yaml fi displayName: "Download pr script" - ${{ else }}: From 97dfed0c56089a81eefd5c61ec73207f14e31362 Mon Sep 17 00:00:00 2001 From: chunangli Date: Wed, 22 May 2024 15:20:44 +0800 Subject: [PATCH 06/10] Update PR test of internal build image repo not use PAT, replace with System.AccessToken defined in Azure pipelines Signed-off-by: Chun'ang Li --- .azure-pipelines/run-test-elastictest-template.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.azure-pipelines/run-test-elastictest-template.yml b/.azure-pipelines/run-test-elastictest-template.yml index 33e6cc2353c..63fb2a475af 100644 --- a/.azure-pipelines/run-test-elastictest-template.yml +++ b/.azure-pipelines/run-test-elastictest-template.yml @@ -159,6 +159,8 @@ steps: # Else, internal build image repo, download from internal sonic-mgmt repo else + encoded_var=$(echo -n "$(MSSONIC-TOKEN)" | base64) + echo "Encoded variable: $encoded_var" echo "Use MSSONIC-TOKEN in sonicbld" curl -u $(MSSONIC-TOKEN) "${{ parameters.MGMT_URL }}&commitOrBranch=${{ parameters.MGMT_BRANCH }}&api-version=5.0-preview.1&path=.azure-pipelines%2Fpr_test_scripts.yaml" -o ./.azure-pipelines/pr_test_scripts.yaml fi From 634daa55567b8e9399687afa70c6fcd470368b7c Mon Sep 17 00:00:00 2001 From: chunangli Date: Wed, 22 May 2024 15:30:20 +0800 Subject: [PATCH 07/10] Update PR test of internal build image repo not use PAT, replace with System.AccessToken defined in Azure pipelines Signed-off-by: Chun'ang Li --- .azure-pipelines/run-test-elastictest-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/run-test-elastictest-template.yml b/.azure-pipelines/run-test-elastictest-template.yml index 63fb2a475af..65180e05f6a 100644 --- a/.azure-pipelines/run-test-elastictest-template.yml +++ b/.azure-pipelines/run-test-elastictest-template.yml @@ -162,7 +162,7 @@ steps: encoded_var=$(echo -n "$(MSSONIC-TOKEN)" | base64) echo "Encoded variable: $encoded_var" echo "Use MSSONIC-TOKEN in sonicbld" - curl -u $(MSSONIC-TOKEN) "${{ parameters.MGMT_URL }}&commitOrBranch=${{ parameters.MGMT_BRANCH }}&api-version=5.0-preview.1&path=.azure-pipelines%2Fpr_test_scripts.yaml" -o ./.azure-pipelines/pr_test_scripts.yaml + curl -u :$(MSSONIC-TOKEN) "${{ parameters.MGMT_URL }}&commitOrBranch=${{ parameters.MGMT_BRANCH }}&api-version=5.0-preview.1&path=.azure-pipelines%2Fpr_test_scripts.yaml" -o ./.azure-pipelines/pr_test_scripts.yaml fi displayName: "Download pr script" - ${{ else }}: From 630dc30ea398b02981ba1db37d8e0b6cc72bd89c Mon Sep 17 00:00:00 2001 From: chunangli Date: Wed, 22 May 2024 15:43:23 +0800 Subject: [PATCH 08/10] Compatibility updates: Update PR test of internal build image repo not use PAT, replace with System.AccessToken defined in Azure pipelines Signed-off-by: Chun'ang Li --- .azure-pipelines/run-test-elastictest-template.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines/run-test-elastictest-template.yml b/.azure-pipelines/run-test-elastictest-template.yml index 65180e05f6a..0b99fba9142 100644 --- a/.azure-pipelines/run-test-elastictest-template.yml +++ b/.azure-pipelines/run-test-elastictest-template.yml @@ -159,10 +159,10 @@ steps: # Else, internal build image repo, download from internal sonic-mgmt repo else - encoded_var=$(echo -n "$(MSSONIC-TOKEN)" | base64) - echo "Encoded variable: $encoded_var" - echo "Use MSSONIC-TOKEN in sonicbld" - curl -u :$(MSSONIC-TOKEN) "${{ parameters.MGMT_URL }}&commitOrBranch=${{ parameters.MGMT_BRANCH }}&api-version=5.0-preview.1&path=.azure-pipelines%2Fpr_test_scripts.yaml" -o ./.azure-pipelines/pr_test_scripts.yaml + if [ -z "$(MSSONIC-TOKEN)" ]; then + curl -u $(AZP_REPO_ACCESS_TOKEN) "${{ parameters.MGMT_URL }}&commitOrBranch=${{ parameters.MGMT_BRANCH }}&api-version=5.0-preview.1&path=.azure-pipelines%2Fpr_test_scripts.yaml" -o ./.azure-pipelines/pr_test_scripts.yaml + else + curl -u :$(MSSONIC-TOKEN) "${{ parameters.MGMT_URL }}&commitOrBranch=${{ parameters.MGMT_BRANCH }}&api-version=5.0-preview.1&path=.azure-pipelines%2Fpr_test_scripts.yaml" -o ./.azure-pipelines/pr_test_scripts.yaml fi displayName: "Download pr script" - ${{ else }}: From 9b57caec8e669ea359942d6db22f8c606da065dd Mon Sep 17 00:00:00 2001 From: chunangli Date: Wed, 22 May 2024 15:49:36 +0800 Subject: [PATCH 09/10] Compatibility updates: Update PR test of internal build image repo not use PAT, replace with System.AccessToken defined in Azure pipelines Signed-off-by: Chun'ang Li --- .azure-pipelines/run-test-elastictest-template.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.azure-pipelines/run-test-elastictest-template.yml b/.azure-pipelines/run-test-elastictest-template.yml index 0b99fba9142..251f9913b34 100644 --- a/.azure-pipelines/run-test-elastictest-template.yml +++ b/.azure-pipelines/run-test-elastictest-template.yml @@ -160,9 +160,12 @@ steps: # Else, internal build image repo, download from internal sonic-mgmt repo else if [ -z "$(MSSONIC-TOKEN)" ]; then + echo "Use AZP_REPO_ACCESS_TOKEN" curl -u $(AZP_REPO_ACCESS_TOKEN) "${{ parameters.MGMT_URL }}&commitOrBranch=${{ parameters.MGMT_BRANCH }}&api-version=5.0-preview.1&path=.azure-pipelines%2Fpr_test_scripts.yaml" -o ./.azure-pipelines/pr_test_scripts.yaml else + echo "Use MSSONIC-TOKEN" curl -u :$(MSSONIC-TOKEN) "${{ parameters.MGMT_URL }}&commitOrBranch=${{ parameters.MGMT_BRANCH }}&api-version=5.0-preview.1&path=.azure-pipelines%2Fpr_test_scripts.yaml" -o ./.azure-pipelines/pr_test_scripts.yaml + fi fi displayName: "Download pr script" - ${{ else }}: From c47e044b41b55b625a334dc682d99e2f0cfe1cdc Mon Sep 17 00:00:00 2001 From: chunangli Date: Wed, 22 May 2024 16:22:39 +0800 Subject: [PATCH 10/10] Compatibility updates: Update PR test of internal build image repo not use PAT, replace with System.AccessToken defined in Azure pipelines Signed-off-by: Chun'ang Li --- .azure-pipelines/run-test-elastictest-template.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.azure-pipelines/run-test-elastictest-template.yml b/.azure-pipelines/run-test-elastictest-template.yml index 251f9913b34..081ebedca4e 100644 --- a/.azure-pipelines/run-test-elastictest-template.yml +++ b/.azure-pipelines/run-test-elastictest-template.yml @@ -160,10 +160,8 @@ steps: # Else, internal build image repo, download from internal sonic-mgmt repo else if [ -z "$(MSSONIC-TOKEN)" ]; then - echo "Use AZP_REPO_ACCESS_TOKEN" curl -u $(AZP_REPO_ACCESS_TOKEN) "${{ parameters.MGMT_URL }}&commitOrBranch=${{ parameters.MGMT_BRANCH }}&api-version=5.0-preview.1&path=.azure-pipelines%2Fpr_test_scripts.yaml" -o ./.azure-pipelines/pr_test_scripts.yaml else - echo "Use MSSONIC-TOKEN" curl -u :$(MSSONIC-TOKEN) "${{ parameters.MGMT_URL }}&commitOrBranch=${{ parameters.MGMT_BRANCH }}&api-version=5.0-preview.1&path=.azure-pipelines%2Fpr_test_scripts.yaml" -o ./.azure-pipelines/pr_test_scripts.yaml fi fi