Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update variables in vrt pipeline to refer from variable group #25696

Merged
merged 14 commits into from
Nov 17, 2022
8 changes: 4 additions & 4 deletions azure-pipelines.vrt-baseline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
12 changes: 8 additions & 4 deletions azure-pipelines.vrt-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pool: '1ES-Host-Ubuntu'
jobs:
- job: VisualRegressionTest_V9
variables:
pipelineId: '211'
pipelineId: '311'
pipelineName: 'fluent-ui VRT Pipeline v9'

workspace:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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')
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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=

[email protected].9:
version "0.0.9"
resolved "https://registry.yarnpkg.com/vrscreenshotdiff/-/vrscreenshotdiff-0.0.9.tgz#a484fb7303ce52f72bc01cd1851dc8f9d46f3ca1"
integrity sha512-EF5IV2DS2QoTT1TjSbvhRi2sLK3Hn87Wysj64p5QfBWGfTX3vVv1x6anQX/ktU849iXyCxQjSex2F44xxImPog==
[email protected].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"
Expand Down