From 78bb3d0f32625041d0ed1826e15bf84650c1288b Mon Sep 17 00:00:00 2001 From: Sunil Surana Date: Thu, 17 Nov 2022 22:14:18 +0530 Subject: [PATCH] Update variables in vrt pipeline to refer from variable group (#25696) --- azure-pipelines.vrt-baseline.yml | 8 ++++---- azure-pipelines.vrt-pr.yml | 12 ++++++++---- package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/azure-pipelines.vrt-baseline.yml b/azure-pipelines.vrt-baseline.yml index f214826135d7b0..2afeec0e6dea10 100644 --- a/azure-pipelines.vrt-baseline.yml +++ b/azure-pipelines.vrt-baseline.yml @@ -32,11 +32,11 @@ jobs: displayName: 'Run Screenshotdiff update baseline' env: API_URL: $(System.CollectionUri) - API_TOKEN: $(TEST_PAT) + API_TOKEN: $(fabric-public-pipeline-access-PAT) API_REPOSITORY: $(Build.Repository.Name) API_PROJECT: $(System.TeamProject) SCREENSHOT_ARTIFACT_FOLDER: vrscreenshotv9 - GITHUB_API_TOKEN: $(GITHUB_TEST_PAT) + GITHUB_API_TOKEN: $(githubRepoStatusPAT) STORAGE_ACCOUNT_FLUENTUI: $(STORAGE-ACCOUNT-FLUENTUI) STORAGE_KEY_FLUENTUI: $(STORAGE-KEY-BLOB-FLUENTUI) BLOB_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) @@ -59,11 +59,11 @@ jobs: displayName: 'Run Screenshotdiff update baseline' env: API_URL: $(System.CollectionUri) - API_TOKEN: $(TEST_PAT) + API_TOKEN: $(fabric-public-pipeline-access-PAT) API_REPOSITORY: $(Build.Repository.Name) API_PROJECT: $(System.TeamProject) SCREENSHOT_ARTIFACT_FOLDER: vrscreenshotv8 - GITHUB_API_TOKEN: $(GITHUB_TEST_PAT) + GITHUB_API_TOKEN: $(githubRepoStatusPAT) STORAGE_ACCOUNT_FLUENTUI: $(STORAGE-ACCOUNT-FLUENTUI) STORAGE_KEY_FLUENTUI: $(STORAGE-KEY-BLOB-FLUENTUI) BLOB_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index fc69a7ecf24bb3..fb545405f3deda 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -17,7 +17,7 @@ pool: '1ES-Host-Ubuntu' jobs: - job: VisualRegressionTest_V9 variables: - pipelineId: '211' + pipelineId: '311' pipelineName: 'fluent-ui VRT Pipeline v9' workspace: @@ -82,7 +82,7 @@ jobs: displayName: 'Run fluentui-screenshotdiff' env: API_URL: $(System.CollectionUri) - API_TOKEN: $(TEST_PAT) + API_TOKEN: $(fabric-public-pipeline-access-PAT) API_REPOSITORY: $(Build.Repository.Name) API_PROJECT: $(System.TeamProject) SCREENSHOT_ARTIFACT_FOLDER: vrscreenshotv9 @@ -91,11 +91,13 @@ jobs: STORAGE_KEY_FLUENTUI: $(STORAGE-KEY-BLOB-FLUENTUI) BLOB_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) + GITHUB_REPO_OWNER: 'microsoft' + GITHUB_REPO_NAME: 'fluentui' condition: eq(variables['vrTestSkip'], 'no') - job: VisualRegressionTest_V8 variables: - pipelineId: '212' + pipelineId: '312' pipelineName: 'fluent-ui VRT Pipeline v8' workspace: clean: all @@ -159,7 +161,7 @@ jobs: displayName: 'Run fluentui-screenshotdiff' env: API_URL: $(System.CollectionUri) - API_TOKEN: $(TEST_PAT) + API_TOKEN: $(fabric-public-pipeline-access-PAT) API_REPOSITORY: $(Build.Repository.Name) API_PROJECT: $(System.TeamProject) SCREENSHOT_ARTIFACT_FOLDER: vrscreenshotv8 @@ -168,4 +170,6 @@ jobs: STORAGE_KEY_FLUENTUI: $(STORAGE-KEY-BLOB-FLUENTUI) BLOB_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) + GITHUB_REPO_OWNER: 'microsoft' + GITHUB_REPO_NAME: 'fluentui' condition: eq(variables['vrTestSkip'], 'no') diff --git a/package.json b/package.json index eef0e4cbd20c11..eed7465219814b 100644 --- a/package.json +++ b/package.json @@ -303,7 +303,7 @@ "tsconfig-paths-webpack-plugin": "4.0.0", "tslib": "2.4.0", "typescript": "4.3.5", - "vrscreenshotdiff": "0.0.9", + "vrscreenshotdiff": "0.0.10", "webpack": "5.74.0", "webpack-bundle-analyzer": "4.4.2", "webpack-cli": "4.10.0", diff --git a/yarn.lock b/yarn.lock index f36dc48667787c..04e2ca97345a8f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -26712,10 +26712,10 @@ void-elements@^2.0.0: resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w= -vrscreenshotdiff@0.0.9: - version "0.0.9" - resolved "https://registry.yarnpkg.com/vrscreenshotdiff/-/vrscreenshotdiff-0.0.9.tgz#a484fb7303ce52f72bc01cd1851dc8f9d46f3ca1" - integrity sha512-EF5IV2DS2QoTT1TjSbvhRi2sLK3Hn87Wysj64p5QfBWGfTX3vVv1x6anQX/ktU849iXyCxQjSex2F44xxImPog== +vrscreenshotdiff@0.0.10: + version "0.0.10" + resolved "https://registry.yarnpkg.com/vrscreenshotdiff/-/vrscreenshotdiff-0.0.10.tgz#aa1807d0a0bc2d26f3ad2bc9fcde68838f50fff6" + integrity sha512-ZoQjC5pc5nTQ5//pjO0nKLCFgSctla07XVku/7kAYQZLfClvOXQwdXiohEN7C6vYFfvLUbkYykYuJhgYiujlmQ== dependencies: "@octokit/rest" "^19.0.3" adal-node "^0.2.3"