From bc4e29b43bc4b48a47bd185c7f6659b1e9570b20 Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Wed, 10 Jul 2024 16:20:54 -0400 Subject: [PATCH 01/21] upgrade vr-approval-cli to 0.4.0 --- download-vr-cli.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/download-vr-cli.yml b/download-vr-cli.yml index 5a679dbc0b9d0..f2c86f82bda4d 100644 --- a/download-vr-cli.yml +++ b/download-vr-cli.yml @@ -1,6 +1,6 @@ steps: - bash: | set -exuo pipefail - npm install -g vr-approval-cli@0.0.168 + npm install -g vr-approval-cli@0.4.0 displayName: Download VR App CLI retryCountOnTaskFailure: 3 From 27da6bff298e3e3f6d2235cb5f9e67f42e4d1437 Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Wed, 10 Jul 2024 16:21:14 -0400 Subject: [PATCH 02/21] add new environment variables required --- azure-pipelines.vrt-baseline.yml | 20 ++++++++++++++++++++ azure-pipelines.vrt-pr.yml | 20 ++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/azure-pipelines.vrt-baseline.yml b/azure-pipelines.vrt-baseline.yml index ee714ed304f52..8adc4370b0cb7 100644 --- a/azure-pipelines.vrt-baseline.yml +++ b/azure-pipelines.vrt-baseline.yml @@ -40,6 +40,11 @@ jobs: VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) + STORAGE_ACCOUNT_ID: $(StorageAccountId) + TENANT_ID: $(TenantId) + PRINCIPAL_CLIENT_ID: $(PrincipalClientId) + SERVICE_CONNECTION_ID: $(ServiceConnectionId) + SYSTEM_ACCESSTOKEN: $(System.AccessToken) - job: VRToolUpdateBaseline_V9 variables: @@ -64,6 +69,11 @@ jobs: VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) + STORAGE_ACCOUNT_ID: $(StorageAccountId) + TENANT_ID: $(TenantId) + PRINCIPAL_CLIENT_ID: $(PrincipalClientId) + SERVICE_CONNECTION_ID: $(ServiceConnectionId) + SYSTEM_ACCESSTOKEN: $(System.AccessToken) - job: VRToolUpdateBaseline_V8 variables: @@ -88,6 +98,11 @@ jobs: VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) + STORAGE_ACCOUNT_ID: $(StorageAccountId) + TENANT_ID: $(TenantId) + PRINCIPAL_CLIENT_ID: $(PrincipalClientId) + SERVICE_CONNECTION_ID: $(ServiceConnectionId) + SYSTEM_ACCESSTOKEN: $(System.AccessToken) - job: VRToolUpdateBaseline_V0 variables: @@ -112,3 +127,8 @@ jobs: VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) + STORAGE_ACCOUNT_ID: $(StorageAccountId) + TENANT_ID: $(TenantId) + PRINCIPAL_CLIENT_ID: $(PrincipalClientId) + SERVICE_CONNECTION_ID: $(ServiceConnectionId) + SYSTEM_ACCESSTOKEN: $(System.AccessToken) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index d542831ed1551..8c07f55d9138c 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -92,6 +92,11 @@ jobs: VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) + STORAGE_ACCOUNT_ID: $(StorageAccountId) + TENANT_ID: $(TenantId) + PRINCIPAL_CLIENT_ID: $(PrincipalClientId) + SERVICE_CONNECTION_ID: $(ServiceConnectionId) + SYSTEM_ACCESSTOKEN: $(System.AccessToken) condition: eq(variables['vrTestSkip'], 'no') - job: VisualRegressionTest_V9 @@ -157,6 +162,11 @@ jobs: VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) + STORAGE_ACCOUNT_ID: $(StorageAccountId) + TENANT_ID: $(TenantId) + PRINCIPAL_CLIENT_ID: $(PrincipalClientId) + SERVICE_CONNECTION_ID: $(ServiceConnectionId) + SYSTEM_ACCESSTOKEN: $(System.AccessToken) condition: eq(variables['vrTestSkip'], 'no') - job: VisualRegressionTest_V8 @@ -221,6 +231,11 @@ jobs: VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) + STORAGE_ACCOUNT_ID: $(StorageAccountId) + TENANT_ID: $(TenantId) + PRINCIPAL_CLIENT_ID: $(PrincipalClientId) + SERVICE_CONNECTION_ID: $(ServiceConnectionId) + SYSTEM_ACCESSTOKEN: $(System.AccessToken) condition: eq(variables['vrTestSkip'], 'no') - job: VisualRegressionTest_V0 @@ -285,4 +300,9 @@ jobs: VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) + STORAGE_ACCOUNT_ID: $(StorageAccountId) + TENANT_ID: $(TenantId) + PRINCIPAL_CLIENT_ID: $(PrincipalClientId) + SERVICE_CONNECTION_ID: $(ServiceConnectionId) + SYSTEM_ACCESSTOKEN: $(System.AccessToken) condition: eq(variables['vrTestSkip'], 'no') From 44bbad07c3385d2c5611bf201039d0212a9a5b11 Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Thu, 11 Jul 2024 11:22:01 -0400 Subject: [PATCH 03/21] test using AzureCLI setup --- azure-pipelines.vrt-pr.yml | 432 +++++++++++++++++++------------------ 1 file changed, 227 insertions(+), 205 deletions(-) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index 8c07f55d9138c..0f27e07ce4cbe 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -15,159 +15,159 @@ variables: pool: '1ES-Host-Ubuntu' jobs: - - job: VisualRegressionTest_WebComponents - variables: - pipelineId: '315' - pipelineName: 'fluent-ui_VRT_Pipeline_web-components' - workspace: - clean: all - steps: - - checkout: self - fetchDepth: 0 + # - job: VisualRegressionTest_WebComponents + # variables: + # pipelineId: '315' + # pipelineName: 'fluent-ui_VRT_Pipeline_web-components' + # workspace: + # clean: all + # steps: + # - checkout: self + # fetchDepth: 0 - - template: .devops/templates/tools.yml - - template: download-vr-cli.yml + # - template: .devops/templates/tools.yml + # - template: download-vr-cli.yml - - bash: | - postPolicy="true"; - response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} ) - parsedResponse=${response/*"access_token"/} - token=${parsedResponse:3:${#parsedResponse}-5} - curl --location --request POST 'https://vrapprovalfunction-prod.azurewebsites.net/api/policyStateV2' \ - --header 'Authorization: Bearer '"$token" \ - --header 'Content-Type: application/json' \ - --data-raw ' { - "organization": "uifabric", - "projectName": "fabricpublic", - "prId": $(System.PullRequest.PullRequestNumber), - "commitId": "$(Build.SourceVersion)", - "generate":true, - "clientType":"FLUENTUI", - "blockingPipeline":{ - }, - "nonBlockingPipeline":{ - "$(pipelineId)": { - "pipelineStatus": "PENDING", - "pipelineName": "$(pipelineName)" - } - }, - "postPolicy": '${postPolicy}', - "policyType": "OPTIONAL" - }' - displayName: 'Call policy State Api' - env: - VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) - VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) - VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) + # - bash: | + # postPolicy="true"; + # response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} ) + # parsedResponse=${response/*"access_token"/} + # token=${parsedResponse:3:${#parsedResponse}-5} + # curl --location --request POST 'https://vrapprovalfunction-prod.azurewebsites.net/api/policyStateV2' \ + # --header 'Authorization: Bearer '"$token" \ + # --header 'Content-Type: application/json' \ + # --data-raw ' { + # "organization": "uifabric", + # "projectName": "fabricpublic", + # "prId": $(System.PullRequest.PullRequestNumber), + # "commitId": "$(Build.SourceVersion)", + # "generate":true, + # "clientType":"FLUENTUI", + # "blockingPipeline":{ + # }, + # "nonBlockingPipeline":{ + # "$(pipelineId)": { + # "pipelineStatus": "PENDING", + # "pipelineName": "$(pipelineName)" + # } + # }, + # "postPolicy": '${postPolicy}', + # "policyType": "OPTIONAL" + # }' + # displayName: 'Call policy State Api' + # env: + # VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) + # VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) + # VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) + # VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) - - template: .devops/templates/runpublishvrscreenshot.yml - parameters: - fluentVersion: webcomponents - vrTestPackageName: '@fluentui/vr-tests-web-components' - vrTestPackagePath: 'apps/vr-tests-web-components' + # - template: .devops/templates/runpublishvrscreenshot.yml + # parameters: + # fluentVersion: webcomponents + # vrTestPackageName: '@fluentui/vr-tests-web-components' + # vrTestPackagePath: 'apps/vr-tests-web-components' - - powershell: | - $url = "https://dev.azure.com/uifabric/fabricpublic/_apis/build/builds?definitions=$env:BASELINE_PIPELINE_ID&statusFilter=completed&resultFilter=succeeded&queryOrder=finishTimeDescending&`$top=1" - Write-Host "Looking up latest official build via url: $url" - $pipelineBuildInfo = Invoke-RestMethod -Uri $url -Headers @{Authorization = "Bearer $env:SYSTEM_ACCESSTOKEN"} - Write-Host "Response: $pipelineBuildInfo" - [int]$latestBuildId = $pipelineBuildInfo.value.id - Write-Host "Setting variable LatestBuildId=$latestBuildId" - Write-Host "##vso[task.setvariable variable=LatestBuildId]$latestBuildId" - name: GetLatestGreenCIBuild - env: - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - # TODO: When web-components-v3 branch is merged with master, - # BASELINE-PIPELINE-ID-WEBCOMPONENTS should be changed to simply BASELINE-PIPELINE-ID. - BASELINE_PIPELINE_ID: $(BASELINE-PIPELINE-ID-WEBCOMPONENTS) - condition: eq(variables['vrTestSkip'], 'no') + # - powershell: | + # $url = "https://dev.azure.com/uifabric/fabricpublic/_apis/build/builds?definitions=$env:BASELINE_PIPELINE_ID&statusFilter=completed&resultFilter=succeeded&queryOrder=finishTimeDescending&`$top=1" + # Write-Host "Looking up latest official build via url: $url" + # $pipelineBuildInfo = Invoke-RestMethod -Uri $url -Headers @{Authorization = "Bearer $env:SYSTEM_ACCESSTOKEN"} + # Write-Host "Response: $pipelineBuildInfo" + # [int]$latestBuildId = $pipelineBuildInfo.value.id + # Write-Host "Setting variable LatestBuildId=$latestBuildId" + # Write-Host "##vso[task.setvariable variable=LatestBuildId]$latestBuildId" + # name: GetLatestGreenCIBuild + # env: + # SYSTEM_ACCESSTOKEN: $(System.AccessToken) + # # TODO: When web-components-v3 branch is merged with master, + # # BASELINE-PIPELINE-ID-WEBCOMPONENTS should be changed to simply BASELINE-PIPELINE-ID. + # BASELINE_PIPELINE_ID: $(BASELINE-PIPELINE-ID-WEBCOMPONENTS) + # condition: eq(variables['vrTestSkip'], 'no') - - bash: vr-app run-diff --screenshotsDirectory ./screenshots --buildType pr --clientType "FLUENTUI" --ciDefinitionId 214 --groupName $(pipelineName) --locationPrefix 'FluentUI-web-components' --locationPostfix 'vrscreenshotwebcomponents' --pipelineId $(pipelineId) --clientName 'fluentui-web-components-v3' --threshold '0.04' --cumThreshold '1' - displayName: 'Run fluentui-screenshotdiff' - env: - API_TOKEN: $(fabric-public-pipeline-access-PAT) - GITHUB_API_TOKEN: $(githubRepoStatusPAT) - STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) - VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - VR_APP_API_URL: $(VR_APP_API_URL) - STORAGE_ACCOUNT_ID: $(StorageAccountId) - TENANT_ID: $(TenantId) - PRINCIPAL_CLIENT_ID: $(PrincipalClientId) - SERVICE_CONNECTION_ID: $(ServiceConnectionId) - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - condition: eq(variables['vrTestSkip'], 'no') + # - bash: vr-app run-diff --screenshotsDirectory ./screenshots --buildType pr --clientType "FLUENTUI" --ciDefinitionId 214 --groupName $(pipelineName) --locationPrefix 'FluentUI-web-components' --locationPostfix 'vrscreenshotwebcomponents' --pipelineId $(pipelineId) --clientName 'fluentui-web-components-v3' --threshold '0.04' --cumThreshold '1' + # displayName: 'Run fluentui-screenshotdiff' + # env: + # API_TOKEN: $(fabric-public-pipeline-access-PAT) + # GITHUB_API_TOKEN: $(githubRepoStatusPAT) + # STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) + # VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) + # VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) + # VR_APP_API_URL: $(VR_APP_API_URL) + # STORAGE_ACCOUNT_ID: $(StorageAccountId) + # TENANT_ID: $(TenantId) + # PRINCIPAL_CLIENT_ID: $(PrincipalClientId) + # SERVICE_CONNECTION_ID: $(ServiceConnectionId) + # SYSTEM_ACCESSTOKEN: $(System.AccessToken) + # condition: eq(variables['vrTestSkip'], 'no') - - job: VisualRegressionTest_V9 - variables: - pipelineId: '311' - pipelineName: 'fluent-ui_VRT_Pipeline_v9' + # - job: VisualRegressionTest_V9 + # variables: + # pipelineId: '311' + # pipelineName: 'fluent-ui_VRT_Pipeline_v9' - workspace: - clean: all - steps: - - checkout: self - fetchDepth: 0 + # workspace: + # clean: all + # steps: + # - checkout: self + # fetchDepth: 0 - - template: .devops/templates/tools.yml + # - template: .devops/templates/tools.yml - - template: download-vr-cli.yml + # - template: download-vr-cli.yml - - bash: | - postPolicy="true"; - response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} ) - parsedResponse=${response/*"access_token"/} - token=${parsedResponse:3:${#parsedResponse}-5} - curl --location --request POST 'https://vrapprovalfunction-prod.azurewebsites.net/api/policyStateV2' \ - --header 'Authorization: Bearer '"$token" \ - --header 'Content-Type: application/json' \ - --data-raw ' { - "organization": "uifabric", - "projectName": "fabricpublic", - "prId": $(System.PullRequest.PullRequestNumber), - "commitId": "$(Build.SourceVersion)", - "generate":true, - "clientType":"FLUENTUI", - "blockingPipeline":{ - }, - "nonBlockingPipeline":{ - "$(pipelineId)": { - "pipelineStatus": "PENDING", - "pipelineName": "$(pipelineName)" - } - }, - "postPolicy": '${postPolicy}', - "policyType": "OPTIONAL" - }' - displayName: 'Call policy State Api' - env: - VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) - VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) - VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) + # - bash: | + # postPolicy="true"; + # response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} ) + # parsedResponse=${response/*"access_token"/} + # token=${parsedResponse:3:${#parsedResponse}-5} + # curl --location --request POST 'https://vrapprovalfunction-prod.azurewebsites.net/api/policyStateV2' \ + # --header 'Authorization: Bearer '"$token" \ + # --header 'Content-Type: application/json' \ + # --data-raw ' { + # "organization": "uifabric", + # "projectName": "fabricpublic", + # "prId": $(System.PullRequest.PullRequestNumber), + # "commitId": "$(Build.SourceVersion)", + # "generate":true, + # "clientType":"FLUENTUI", + # "blockingPipeline":{ + # }, + # "nonBlockingPipeline":{ + # "$(pipelineId)": { + # "pipelineStatus": "PENDING", + # "pipelineName": "$(pipelineName)" + # } + # }, + # "postPolicy": '${postPolicy}', + # "policyType": "OPTIONAL" + # }' + # displayName: 'Call policy State Api' + # env: + # VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) + # VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) + # VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) + # VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) - - template: .devops/templates/runpublishvrscreenshot.yml - parameters: - fluentVersion: v9 - vrTestPackageName: '@fluentui/vr-tests-react-components' - vrTestPackagePath: 'apps/vr-tests-react-components' + # - template: .devops/templates/runpublishvrscreenshot.yml + # parameters: + # fluentVersion: v9 + # vrTestPackageName: '@fluentui/vr-tests-react-components' + # vrTestPackagePath: 'apps/vr-tests-react-components' - - bash: vr-app run-diff --buildType pr --screenshotsDirectory ./screenshots --clientType "FLUENTUI" --ciDefinitionId 205 --groupName $(pipelineName) --locationPrefix 'fluentuiv9' --locationPostfix 'vrscreenshotv9' --pipelineId $(pipelineId) --clientName 'fluentuiv9' --threshold '0.04' --cumThreshold '1' - displayName: 'Run fluentui-screenshotdiff' - env: - API_TOKEN: $(fabric-public-pipeline-access-PAT) - GITHUB_API_TOKEN: $(githubRepoStatusPAT) - STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) - VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - VR_APP_API_URL: $(VR_APP_API_URL) - STORAGE_ACCOUNT_ID: $(StorageAccountId) - TENANT_ID: $(TenantId) - PRINCIPAL_CLIENT_ID: $(PrincipalClientId) - SERVICE_CONNECTION_ID: $(ServiceConnectionId) - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - condition: eq(variables['vrTestSkip'], 'no') + # - bash: vr-app run-diff --buildType pr --screenshotsDirectory ./screenshots --clientType "FLUENTUI" --ciDefinitionId 205 --groupName $(pipelineName) --locationPrefix 'fluentuiv9' --locationPostfix 'vrscreenshotv9' --pipelineId $(pipelineId) --clientName 'fluentuiv9' --threshold '0.04' --cumThreshold '1' + # displayName: 'Run fluentui-screenshotdiff' + # env: + # API_TOKEN: $(fabric-public-pipeline-access-PAT) + # GITHUB_API_TOKEN: $(githubRepoStatusPAT) + # STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) + # VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) + # VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) + # VR_APP_API_URL: $(VR_APP_API_URL) + # STORAGE_ACCOUNT_ID: $(StorageAccountId) + # TENANT_ID: $(TenantId) + # PRINCIPAL_CLIENT_ID: $(PrincipalClientId) + # SERVICE_CONNECTION_ID: $(ServiceConnectionId) + # SYSTEM_ACCESSTOKEN: $(System.AccessToken) + # condition: eq(variables['vrTestSkip'], 'no') - job: VisualRegressionTest_V8 variables: @@ -222,8 +222,24 @@ jobs: vrTestPackageName: '@fluentui/vr-tests' vrTestPackagePath: 'apps/vr-tests' - - bash: vr-app run-diff --screenshotsDirectory ./screenshots --buildType pr --clientType "FLUENTUI" --ciDefinitionId 205 --groupName $(pipelineName) --locationPrefix 'fluentuiv8' --locationPostfix 'vrscreenshotv8' --pipelineId $(pipelineId) --clientName 'fluentuiv8' --threshold '0.04' --cumThreshold '1' - displayName: 'Run fluentui-screenshotdiff' + # - bash: vr-app run-diff --screenshotsDirectory ./screenshots --buildType pr --clientType "FLUENTUI" --ciDefinitionId 205 --groupName $(pipelineName) --locationPrefix 'fluentuiv8' --locationPostfix 'vrscreenshotv8' --pipelineId $(pipelineId) --clientName 'fluentuiv8' --threshold '0.04' --cumThreshold '1' + # displayName: 'Run fluentui-screenshotdiff' + # env: + # API_TOKEN: $(fabric-public-pipeline-access-PAT) + # GITHUB_API_TOKEN: $(githubRepoStatusPAT) + # STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) + # VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) + # VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) + # VR_APP_API_URL: $(VR_APP_API_URL) + # STORAGE_ACCOUNT_ID: $(StorageAccountId) + # TENANT_ID: $(TenantId) + # PRINCIPAL_CLIENT_ID: $(PrincipalClientId) + # SERVICE_CONNECTION_ID: $(ServiceConnectionId) + # SYSTEM_ACCESSTOKEN: $(System.AccessToken) + # condition: eq(variables['vrTestSkip'], 'no') + + - task: AzureCLI@2 + displayName: 'Run VR Tests' env: API_TOKEN: $(fabric-public-pipeline-access-PAT) GITHUB_API_TOKEN: $(githubRepoStatusPAT) @@ -236,73 +252,79 @@ jobs: PRINCIPAL_CLIENT_ID: $(PrincipalClientId) SERVICE_CONNECTION_ID: $(ServiceConnectionId) SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + azureSubscription: 'UI Fabric (bac044cf-49e1-4843-8dda-1ce9662606c8)' + scriptType: bash + scriptLocation: 'inlineScript' + inlineScript: | + vr-app run-diff --screenshotsDirectory ./screenshots --buildType pr --clientType "FLUENTUI" --ciDefinitionId 205 --groupName $(pipelineName) --locationPrefix 'fluentuiv8' --locationPostfix 'vrscreenshotv8' --pipelineId $(pipelineId) --clientName 'fluentuiv8' --threshold '0.04' --cumThreshold '1' condition: eq(variables['vrTestSkip'], 'no') - - job: VisualRegressionTest_V0 - variables: - pipelineId: '313' - pipelineName: 'fluent-ui_VRT_Pipeline_v0' + # - job: VisualRegressionTest_V0 + # variables: + # pipelineId: '313' + # pipelineName: 'fluent-ui_VRT_Pipeline_v0' - workspace: - clean: all - steps: - - checkout: self - fetchDepth: 0 + # workspace: + # clean: all + # steps: + # - checkout: self + # fetchDepth: 0 - - template: .devops/templates/tools.yml + # - template: .devops/templates/tools.yml - - template: download-vr-cli.yml + # - template: download-vr-cli.yml - - bash: | - postPolicy="true"; - response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} ) - parsedResponse=${response/*"access_token"/} - token=${parsedResponse:3:${#parsedResponse}-5} - curl --location --request POST 'https://vrapprovalfunction-prod.azurewebsites.net/api/policyStateV2' \ - --header 'Authorization: Bearer '"$token" \ - --header 'Content-Type: application/json' \ - --data-raw ' { - "organization": "uifabric", - "projectName": "fabricpublic", - "prId": $(System.PullRequest.PullRequestNumber), - "commitId": "$(Build.SourceVersion)", - "generate":true, - "clientType":"FLUENTUI", - "blockingPipeline":{ - }, - "nonBlockingPipeline":{ - "$(pipelineId)": { - "pipelineStatus": "PENDING", - "pipelineName": "$(pipelineName)" - } - }, - "postPolicy": '${postPolicy}', - "policyType": "OPTIONAL" - }' - displayName: 'Call policy State Api' - env: - VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) - VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) + # - bash: | + # postPolicy="true"; + # response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} ) + # parsedResponse=${response/*"access_token"/} + # token=${parsedResponse:3:${#parsedResponse}-5} + # curl --location --request POST 'https://vrapprovalfunction-prod.azurewebsites.net/api/policyStateV2' \ + # --header 'Authorization: Bearer '"$token" \ + # --header 'Content-Type: application/json' \ + # --data-raw ' { + # "organization": "uifabric", + # "projectName": "fabricpublic", + # "prId": $(System.PullRequest.PullRequestNumber), + # "commitId": "$(Build.SourceVersion)", + # "generate":true, + # "clientType":"FLUENTUI", + # "blockingPipeline":{ + # }, + # "nonBlockingPipeline":{ + # "$(pipelineId)": { + # "pipelineStatus": "PENDING", + # "pipelineName": "$(pipelineName)" + # } + # }, + # "postPolicy": '${postPolicy}', + # "policyType": "OPTIONAL" + # }' + # displayName: 'Call policy State Api' + # env: + # VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) + # VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) + # VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) - - template: .devops/templates/runpublishvrscreenshot.yml - parameters: - fluentVersion: v0 - vrTestPackageName: '@fluentui/docs' - vrTestPackagePath: 'packages/fluentui/docs' + # - template: .devops/templates/runpublishvrscreenshot.yml + # parameters: + # fluentVersion: v0 + # vrTestPackageName: '@fluentui/docs' + # vrTestPackagePath: 'packages/fluentui/docs' - - bash: vr-app run-diff --buildType pr --screenshotsDirectory ./screenshots --clientType "FLUENTUI" --ciDefinitionId 205 --groupName $(pipelineName) --locationPrefix 'FluentUI-v0' --locationPostfix 'vrscreenshotv0' --pipelineId $(pipelineId) --clientName 'FluentUIV0' --threshold '0.04' --cumThreshold '1' - displayName: 'Run fluentui-screenshotdiff' - env: - API_TOKEN: $(fabric-public-pipeline-access-PAT) - GITHUB_API_TOKEN: $(githubRepoStatusPAT) - STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) - VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - VR_APP_API_URL: $(VR_APP_API_URL) - STORAGE_ACCOUNT_ID: $(StorageAccountId) - TENANT_ID: $(TenantId) - PRINCIPAL_CLIENT_ID: $(PrincipalClientId) - SERVICE_CONNECTION_ID: $(ServiceConnectionId) - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - condition: eq(variables['vrTestSkip'], 'no') + # - bash: vr-app run-diff --buildType pr --screenshotsDirectory ./screenshots --clientType "FLUENTUI" --ciDefinitionId 205 --groupName $(pipelineName) --locationPrefix 'FluentUI-v0' --locationPostfix 'vrscreenshotv0' --pipelineId $(pipelineId) --clientName 'FluentUIV0' --threshold '0.04' --cumThreshold '1' + # displayName: 'Run fluentui-screenshotdiff' + # env: + # API_TOKEN: $(fabric-public-pipeline-access-PAT) + # GITHUB_API_TOKEN: $(githubRepoStatusPAT) + # STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) + # VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) + # VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) + # VR_APP_API_URL: $(VR_APP_API_URL) + # STORAGE_ACCOUNT_ID: $(StorageAccountId) + # TENANT_ID: $(TenantId) + # PRINCIPAL_CLIENT_ID: $(PrincipalClientId) + # SERVICE_CONNECTION_ID: $(ServiceConnectionId) + # SYSTEM_ACCESSTOKEN: $(System.AccessToken) + # condition: eq(variables['vrTestSkip'], 'no') From 006d12a0840ae4865a1f5627c99357786ccbdd03 Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Thu, 11 Jul 2024 11:48:36 -0400 Subject: [PATCH 04/21] use version 0.4.1 --- download-vr-cli.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/download-vr-cli.yml b/download-vr-cli.yml index f2c86f82bda4d..afd91cf647d29 100644 --- a/download-vr-cli.yml +++ b/download-vr-cli.yml @@ -1,6 +1,6 @@ steps: - bash: | set -exuo pipefail - npm install -g vr-approval-cli@0.4.0 + npm install -g vr-approval-cli@0.4.1 displayName: Download VR App CLI retryCountOnTaskFailure: 3 From 0596fb42f8a77a1984ab26f9f18e7103470ca7a7 Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Thu, 11 Jul 2024 12:10:05 -0400 Subject: [PATCH 05/21] remove secret --- azure-pipelines.vrt-pr.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index 0f27e07ce4cbe..a67b6e6cdba54 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -244,7 +244,6 @@ jobs: API_TOKEN: $(fabric-public-pipeline-access-PAT) GITHUB_API_TOKEN: $(githubRepoStatusPAT) STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) STORAGE_ACCOUNT_ID: $(StorageAccountId) From 1f2063f8531ad8e33f4268b237a2a5165d5c783d Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Thu, 11 Jul 2024 12:19:05 -0400 Subject: [PATCH 06/21] add workingDirectory --- azure-pipelines.vrt-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index a67b6e6cdba54..04d742d773ce0 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -256,7 +256,7 @@ jobs: scriptType: bash scriptLocation: 'inlineScript' inlineScript: | - vr-app run-diff --screenshotsDirectory ./screenshots --buildType pr --clientType "FLUENTUI" --ciDefinitionId 205 --groupName $(pipelineName) --locationPrefix 'fluentuiv8' --locationPostfix 'vrscreenshotv8' --pipelineId $(pipelineId) --clientName 'fluentuiv8' --threshold '0.04' --cumThreshold '1' + vr-app run-diff --screenshotsDirectory ./screenshots --workingDirectory . --buildType pr --clientType "FLUENTUI" --ciDefinitionId 205 --groupName $(pipelineName) --locationPrefix 'fluentuiv8' --locationPostfix 'vrscreenshotv8' --pipelineId $(pipelineId) --clientName 'fluentuiv8' --threshold '0.04' --cumThreshold '1' condition: eq(variables['vrTestSkip'], 'no') # - job: VisualRegressionTest_V0 From 3282983be35cca8b62833a7e08569c880fe5f64a Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Mon, 15 Jul 2024 09:39:06 -0400 Subject: [PATCH 07/21] cleanup for test run --- azure-pipelines.vrt-pr.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index 04d742d773ce0..f255ffddb64d4 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -222,22 +222,6 @@ jobs: vrTestPackageName: '@fluentui/vr-tests' vrTestPackagePath: 'apps/vr-tests' - # - bash: vr-app run-diff --screenshotsDirectory ./screenshots --buildType pr --clientType "FLUENTUI" --ciDefinitionId 205 --groupName $(pipelineName) --locationPrefix 'fluentuiv8' --locationPostfix 'vrscreenshotv8' --pipelineId $(pipelineId) --clientName 'fluentuiv8' --threshold '0.04' --cumThreshold '1' - # displayName: 'Run fluentui-screenshotdiff' - # env: - # API_TOKEN: $(fabric-public-pipeline-access-PAT) - # GITHUB_API_TOKEN: $(githubRepoStatusPAT) - # STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - # VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) - # VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - # VR_APP_API_URL: $(VR_APP_API_URL) - # STORAGE_ACCOUNT_ID: $(StorageAccountId) - # TENANT_ID: $(TenantId) - # PRINCIPAL_CLIENT_ID: $(PrincipalClientId) - # SERVICE_CONNECTION_ID: $(ServiceConnectionId) - # SYSTEM_ACCESSTOKEN: $(System.AccessToken) - # condition: eq(variables['vrTestSkip'], 'no') - - task: AzureCLI@2 displayName: 'Run VR Tests' env: From 4f1b3e8ec085459998a751b4432a0a709ebaa8b5 Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Mon, 15 Jul 2024 10:16:19 -0400 Subject: [PATCH 08/21] update baseline yaml --- azure-pipelines.vrt-baseline.yml | 37 ++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/azure-pipelines.vrt-baseline.yml b/azure-pipelines.vrt-baseline.yml index 8adc4370b0cb7..bd2c00461f118 100644 --- a/azure-pipelines.vrt-baseline.yml +++ b/azure-pipelines.vrt-baseline.yml @@ -31,13 +31,12 @@ jobs: vrTestPackageName: '@fluentui/vr-tests-web-components' vrTestPackagePath: 'apps/vr-tests-web-components' - - bash: vr-app run-diff --buildType release --screenshotsDirectory ./screenshots --clientType "FLUENTUI" --locationPrefix 'FluentUI-web-components' --locationPostfix 'vrscreenshotwebcomponents' --pipelineId $(pipelineId) + - task: AzureCLI@2 displayName: 'Run Screenshotdiff update baseline' env: API_TOKEN: $(fabric-public-pipeline-access-PAT) GITHUB_API_TOKEN: $(githubRepoStatusPAT) STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) STORAGE_ACCOUNT_ID: $(StorageAccountId) @@ -45,6 +44,12 @@ jobs: PRINCIPAL_CLIENT_ID: $(PrincipalClientId) SERVICE_CONNECTION_ID: $(ServiceConnectionId) SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + azureSubscription: 'UI Fabric (bac044cf-49e1-4843-8dda-1ce9662606c8)' + scriptType: bash + scriptLocation: 'inlineScript' + inlineScript: | + vr-app run-diff --buildType release --screenshotsDirectory ./screenshots --clientType "FLUENTUI" --locationPrefix 'FluentUI-web-components' --locationPostfix 'vrscreenshotwebcomponents' --pipelineId $(pipelineId) - job: VRToolUpdateBaseline_V9 variables: @@ -60,13 +65,12 @@ jobs: vrTestPackageName: '@fluentui/vr-tests-react-components' vrTestPackagePath: 'apps/vr-tests-react-components' - - bash: vr-app run-diff --buildType release --screenshotsDirectory ./screenshots --clientType "FLUENTUI" --locationPrefix 'fluentuiv9' --locationPostfix 'vrscreenshotv9' --pipelineId $(pipelineId) + - task: AzureCLI@2 displayName: 'Run Screenshotdiff update baseline' env: API_TOKEN: $(fabric-public-pipeline-access-PAT) GITHUB_API_TOKEN: $(githubRepoStatusPAT) STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) STORAGE_ACCOUNT_ID: $(StorageAccountId) @@ -74,6 +78,12 @@ jobs: PRINCIPAL_CLIENT_ID: $(PrincipalClientId) SERVICE_CONNECTION_ID: $(ServiceConnectionId) SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + azureSubscription: 'UI Fabric (bac044cf-49e1-4843-8dda-1ce9662606c8)' + scriptType: bash + scriptLocation: 'inlineScript' + inlineScript: | + vr-app run-diff --buildType release --screenshotsDirectory ./screenshots --clientType "FLUENTUI" --locationPrefix 'fluentuiv9' --locationPostfix 'vrscreenshotv9' --pipelineId $(pipelineId) - job: VRToolUpdateBaseline_V8 variables: @@ -89,13 +99,12 @@ jobs: vrTestPackageName: '@fluentui/vr-tests' vrTestPackagePath: 'apps/vr-tests' - - bash: vr-app run-diff --screenshotsDirectory ./screenshots --buildType release --clientType "FLUENTUI" --locationPrefix 'fluentuiv8' --locationPostfix 'vrscreenshotv8' --pipelineId $(pipelineId) + - task: AzureCLI@2 displayName: 'Run fluentui-screenshotdiff' env: API_TOKEN: $(fabric-public-pipeline-access-PAT) GITHUB_API_TOKEN: $(githubRepoStatusPAT) STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) STORAGE_ACCOUNT_ID: $(StorageAccountId) @@ -103,7 +112,12 @@ jobs: PRINCIPAL_CLIENT_ID: $(PrincipalClientId) SERVICE_CONNECTION_ID: $(ServiceConnectionId) SYSTEM_ACCESSTOKEN: $(System.AccessToken) - + inputs: + azureSubscription: 'UI Fabric (bac044cf-49e1-4843-8dda-1ce9662606c8)' + scriptType: bash + scriptLocation: 'inlineScript' + inlineScript: | + vr-app run-diff --screenshotsDirectory ./screenshots --buildType release --clientType "FLUENTUI" --locationPrefix 'fluentuiv8' --locationPostfix 'vrscreenshotv8' --pipelineId $(pipelineId) - job: VRToolUpdateBaseline_V0 variables: pipelineId: '313' @@ -118,13 +132,12 @@ jobs: vrTestPackageName: '@fluentui/docs' vrTestPackagePath: 'packages/fluentui/docs' - - bash: vr-app run-diff --buildType release --screenshotsDirectory ./screenshots --clientType "FLUENTUI" --locationPrefix 'FluentUI-v0' --locationPostfix 'vrscreenshotv0' --pipelineId $(pipelineId) + - task: AzureCLI@2 displayName: 'Run fluentui-screenshotdiff' env: API_TOKEN: $(fabric-public-pipeline-access-PAT) GITHUB_API_TOKEN: $(githubRepoStatusPAT) STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_API_URL: $(VR_APP_API_URL) STORAGE_ACCOUNT_ID: $(StorageAccountId) @@ -132,3 +145,9 @@ jobs: PRINCIPAL_CLIENT_ID: $(PrincipalClientId) SERVICE_CONNECTION_ID: $(ServiceConnectionId) SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + azureSubscription: 'UI Fabric (bac044cf-49e1-4843-8dda-1ce9662606c8)' + scriptType: bash + scriptLocation: 'inlineScript' + inlineScript: | + vr-app run-diff --buildType release --screenshotsDirectory ./screenshots --clientType "FLUENTUI" --locationPrefix 'FluentUI-v0' --locationPostfix 'vrscreenshotv0' --pipelineId $(pipelineId) From e0d51ba5d4408aa7a9257b6326119553352a4147 Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Mon, 15 Jul 2024 10:38:44 -0400 Subject: [PATCH 09/21] Pipeline variable updates --- azure-pipelines.vrt-baseline.yml | 8 ++++---- azure-pipelines.vrt-pr.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.vrt-baseline.yml b/azure-pipelines.vrt-baseline.yml index bd2c00461f118..7158b7e037ed4 100644 --- a/azure-pipelines.vrt-baseline.yml +++ b/azure-pipelines.vrt-baseline.yml @@ -45,7 +45,7 @@ jobs: SERVICE_CONNECTION_ID: $(ServiceConnectionId) SYSTEM_ACCESSTOKEN: $(System.AccessToken) inputs: - azureSubscription: 'UI Fabric (bac044cf-49e1-4843-8dda-1ce9662606c8)' + azureSubscription: $(AzureSubscription) scriptType: bash scriptLocation: 'inlineScript' inlineScript: | @@ -79,7 +79,7 @@ jobs: SERVICE_CONNECTION_ID: $(ServiceConnectionId) SYSTEM_ACCESSTOKEN: $(System.AccessToken) inputs: - azureSubscription: 'UI Fabric (bac044cf-49e1-4843-8dda-1ce9662606c8)' + azureSubscription: $(AzureSubscription) scriptType: bash scriptLocation: 'inlineScript' inlineScript: | @@ -113,7 +113,7 @@ jobs: SERVICE_CONNECTION_ID: $(ServiceConnectionId) SYSTEM_ACCESSTOKEN: $(System.AccessToken) inputs: - azureSubscription: 'UI Fabric (bac044cf-49e1-4843-8dda-1ce9662606c8)' + azureSubscription: $(AzureSubscription) scriptType: bash scriptLocation: 'inlineScript' inlineScript: | @@ -146,7 +146,7 @@ jobs: SERVICE_CONNECTION_ID: $(ServiceConnectionId) SYSTEM_ACCESSTOKEN: $(System.AccessToken) inputs: - azureSubscription: 'UI Fabric (bac044cf-49e1-4843-8dda-1ce9662606c8)' + azureSubscription: $(AzureSubscription) scriptType: bash scriptLocation: 'inlineScript' inlineScript: | diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index f255ffddb64d4..8174398e71924 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -236,7 +236,7 @@ jobs: SERVICE_CONNECTION_ID: $(ServiceConnectionId) SYSTEM_ACCESSTOKEN: $(System.AccessToken) inputs: - azureSubscription: 'UI Fabric (bac044cf-49e1-4843-8dda-1ce9662606c8)' + azureSubscription: $(AzureSubscription) scriptType: bash scriptLocation: 'inlineScript' inlineScript: | From 0c27a0f755e1e065730d0eaa4312fde45ee7218d Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Mon, 15 Jul 2024 13:55:02 -0400 Subject: [PATCH 10/21] remove call policy state api --- azure-pipelines.vrt-pr.yml | 66 +++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index 8174398e71924..08c762911a1a9 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -183,38 +183,38 @@ jobs: - template: download-vr-cli.yml - - bash: | - postPolicy="true"; - response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} ) - parsedResponse=${response/*"access_token"/} - token=${parsedResponse:3:${#parsedResponse}-5} - curl --location --request POST 'https://vrapprovalfunction-prod.azurewebsites.net/api/policyStateV2' \ - --header 'Authorization: Bearer '"$token" \ - --header 'Content-Type: application/json' \ - --data-raw ' { - "organization": "uifabric", - "projectName": "fabricpublic", - "prId": $(System.PullRequest.PullRequestNumber), - "commitId": "$(Build.SourceVersion)", - "generate":true, - "clientType":"FLUENTUI", - "blockingPipeline":{ - }, - "nonBlockingPipeline":{ - "$(pipelineId)": { - "pipelineStatus": "PENDING", - "pipelineName": "$(pipelineName)" - } - }, - "postPolicy": '${postPolicy}', - "policyType": "OPTIONAL" - }' - displayName: 'Call policy State Api' - env: - VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) - VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) - VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) + # - bash: | + # postPolicy="true"; + # response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} ) + # parsedResponse=${response/*"access_token"/} + # token=${parsedResponse:3:${#parsedResponse}-5} + # curl --location --request POST 'https://vrapprovalfunction-prod.azurewebsites.net/api/policyStateV2' \ + # --header 'Authorization: Bearer '"$token" \ + # --header 'Content-Type: application/json' \ + # --data-raw ' { + # "organization": "uifabric", + # "projectName": "fabricpublic", + # "prId": $(System.PullRequest.PullRequestNumber), + # "commitId": "$(Build.SourceVersion)", + # "generate":true, + # "clientType":"FLUENTUI", + # "blockingPipeline":{ + # }, + # "nonBlockingPipeline":{ + # "$(pipelineId)": { + # "pipelineStatus": "PENDING", + # "pipelineName": "$(pipelineName)" + # } + # }, + # "postPolicy": '${postPolicy}', + # "policyType": "OPTIONAL" + # }' + # displayName: 'Call policy State Api' + # env: + # VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) + # VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) + # VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) + # VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) - template: .devops/templates/runpublishvrscreenshot.yml parameters: @@ -240,7 +240,7 @@ jobs: scriptType: bash scriptLocation: 'inlineScript' inlineScript: | - vr-app run-diff --screenshotsDirectory ./screenshots --workingDirectory . --buildType pr --clientType "FLUENTUI" --ciDefinitionId 205 --groupName $(pipelineName) --locationPrefix 'fluentuiv8' --locationPostfix 'vrscreenshotv8' --pipelineId $(pipelineId) --clientName 'fluentuiv8' --threshold '0.04' --cumThreshold '1' + vr-app run-diff --screenshotsDirectory ./screenshots --buildType pr --clientType "FLUENTUI" --ciDefinitionId 205 --groupName $(pipelineName) --locationPrefix 'fluentuiv8' --locationPostfix 'vrscreenshotv8' --pipelineId $(pipelineId) --clientName 'fluentuiv8' --threshold '0.04' --cumThreshold '1' condition: eq(variables['vrTestSkip'], 'no') # - job: VisualRegressionTest_V0 From 65b823ce0d4e35e12f94a20dffd1fedd07763287 Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Tue, 16 Jul 2024 11:14:10 -0400 Subject: [PATCH 11/21] use 0.4.2 --- azure-pipelines.vrt-pr.yml | 2 +- download-vr-cli.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index e8700137aa876..74da900d3a57d 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -208,7 +208,7 @@ jobs: GITHUB_API_TOKEN: $(githubRepoStatusPAT) STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - VR_APP_API_URL: $(VR_APP_API_URL) + VR_APP_API_URL: $(VR_APP_API_URL_NEW) STORAGE_ACCOUNT_ID: $(StorageAccountId) TENANT_ID: $(TenantId) PRINCIPAL_CLIENT_ID: $(PrincipalClientId) diff --git a/download-vr-cli.yml b/download-vr-cli.yml index afd91cf647d29..1e7cf57205fbd 100644 --- a/download-vr-cli.yml +++ b/download-vr-cli.yml @@ -1,6 +1,6 @@ steps: - bash: | set -exuo pipefail - npm install -g vr-approval-cli@0.4.1 + npm install -g vr-approval-cli@0.4.2 displayName: Download VR App CLI retryCountOnTaskFailure: 3 From 84d135538eef23bf222841605e607a7f1360e4a8 Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Tue, 16 Jul 2024 11:23:13 -0400 Subject: [PATCH 12/21] remove out of scope change --- .../react-carousel-preview/library/src/index.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/react-components/react-carousel-preview/library/src/index.ts b/packages/react-components/react-carousel-preview/library/src/index.ts index ff2e01e457891..d62f937c52747 100644 --- a/packages/react-components/react-carousel-preview/library/src/index.ts +++ b/packages/react-components/react-carousel-preview/library/src/index.ts @@ -70,5 +70,4 @@ export { useCarouselNavImageButtonStyles_unstable, useCarouselNavImageButton_unstable, } from './CarouselNavImageButton'; -export type { CarouselSliderProps, CarouselSliderSlots, CarouselSliderState } from './CarouselSlider'; -export { CarouselSlider, carouselSliderClassNames, renderCarouselSlider_unstable, useCarouselSliderStyles_unstable, useCarouselSlider_unstable } from './CarouselSlider'; +export * from './CarouselSlider'; From daefa7e1b94cc4615e42f4590a30f8022adc44fe Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Tue, 16 Jul 2024 14:43:33 -0400 Subject: [PATCH 13/21] use 0.4.3 --- azure-pipelines.vrt-pr.yml | 2 +- download-vr-cli.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index 74da900d3a57d..3cbf5d62ad508 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -202,7 +202,7 @@ jobs: vrTestPackagePath: 'apps/vr-tests' - task: AzureCLI@2 - displayName: 'Run VR Tests' + displayName: 'Run Snapshot Diffing' env: API_TOKEN: $(fabric-public-pipeline-access-PAT) GITHUB_API_TOKEN: $(githubRepoStatusPAT) diff --git a/download-vr-cli.yml b/download-vr-cli.yml index 1e7cf57205fbd..25edd7043ed40 100644 --- a/download-vr-cli.yml +++ b/download-vr-cli.yml @@ -1,6 +1,6 @@ steps: - bash: | set -exuo pipefail - npm install -g vr-approval-cli@0.4.2 + npm install -g vr-approval-cli@0.4.3 displayName: Download VR App CLI retryCountOnTaskFailure: 3 From 12c298c8b3f4d56028bb9a89c915f8f197a408c9 Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Tue, 16 Jul 2024 15:07:41 -0400 Subject: [PATCH 14/21] bring back call state policy and use new function app --- azure-pipelines.vrt-pr.yml | 70 +++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index 3cbf5d62ad508..e094a52b11083 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -33,7 +33,7 @@ jobs: # response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} ) # parsedResponse=${response/*"access_token"/} # token=${parsedResponse:3:${#parsedResponse}-5} - # curl --location --request POST 'https://vrapprovalfunction-prod.azurewebsites.net/api/policyStateV2' \ + # curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \ # --header 'Authorization: Bearer '"$token" \ # --header 'Content-Type: application/json' \ # --data-raw ' { @@ -98,7 +98,7 @@ jobs: # response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} ) # parsedResponse=${response/*"access_token"/} # token=${parsedResponse:3:${#parsedResponse}-5} - # curl --location --request POST 'https://vrapprovalfunction-prod.azurewebsites.net/api/policyStateV2' \ + # curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \ # --header 'Authorization: Bearer '"$token" \ # --header 'Content-Type: application/json' \ # --data-raw ' { @@ -162,38 +162,38 @@ jobs: - template: download-vr-cli.yml - # - bash: | - # postPolicy="true"; - # response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} ) - # parsedResponse=${response/*"access_token"/} - # token=${parsedResponse:3:${#parsedResponse}-5} - # curl --location --request POST 'https://vrapprovalfunction-prod.azurewebsites.net/api/policyStateV2' \ - # --header 'Authorization: Bearer '"$token" \ - # --header 'Content-Type: application/json' \ - # --data-raw ' { - # "organization": "uifabric", - # "projectName": "fabricpublic", - # "prId": $(System.PullRequest.PullRequestNumber), - # "commitId": "$(Build.SourceVersion)", - # "generate":true, - # "clientType":"FLUENTUI", - # "blockingPipeline":{ - # }, - # "nonBlockingPipeline":{ - # "$(pipelineId)": { - # "pipelineStatus": "PENDING", - # "pipelineName": "$(pipelineName)" - # } - # }, - # "postPolicy": '${postPolicy}', - # "policyType": "OPTIONAL" - # }' - # displayName: 'Call policy State Api' - # env: - # VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) - # VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) - # VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - # VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) + - bash: | + postPolicy="true"; + response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode ) + parsedResponse=${response/*"access_token"/} + token=${parsedResponse:3:${#parsedResponse}-5} + curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \ + --header 'Authorization: Bearer '"$token" \ + --header 'Content-Type: application/json' \ + --data-raw ' { + "organization": "uifabric", + "projectName": "fabricpublic", + "prId": $(System.PullRequest.PullRequestNumber), + "commitId": "$(Build.SourceVersion)", + "generate":true, + "clientType":"FLUENTUI", + "blockingPipeline":{ + }, + "nonBlockingPipeline":{ + "$(pipelineId)": { + "pipelineStatus": "PENDING", + "pipelineName": "$(pipelineName)" + } + }, + "postPolicy": '${postPolicy}', + "policyType": "OPTIONAL" + }' + displayName: 'Call policy State Api' + env: + VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) + VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) + VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) + VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) - template: .devops/templates/runpublishvrscreenshot.yml parameters: @@ -242,7 +242,7 @@ jobs: # response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} ) # parsedResponse=${response/*"access_token"/} # token=${parsedResponse:3:${#parsedResponse}-5} - # curl --location --request POST 'https://vrapprovalfunction-prod.azurewebsites.net/api/policyStateV2' \ + # curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \ # --header 'Authorization: Bearer '"$token" \ # --header 'Content-Type: application/json' \ # --data-raw ' { From 972dd5147539f760001d55d2a989d9e18cb3575c Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Tue, 16 Jul 2024 15:19:03 -0400 Subject: [PATCH 15/21] remove data-urlencode --- azure-pipelines.vrt-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index e094a52b11083..0cbc4c1ed6cc2 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -164,7 +164,7 @@ jobs: - bash: | postPolicy="true"; - response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode ) + response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} ) parsedResponse=${response/*"access_token"/} token=${parsedResponse:3:${#parsedResponse}-5} curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \ From 52234a3dec65713481f01b4f8471f0123df5c46f Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Tue, 16 Jul 2024 15:50:30 -0400 Subject: [PATCH 16/21] enable all other libraries vr test --- azure-pipelines.vrt-pr.yml | 386 +++++++++++++++++++------------------ 1 file changed, 201 insertions(+), 185 deletions(-) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index 0cbc4c1ed6cc2..2f696f333a407 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -15,138 +15,151 @@ variables: pool: '1ES-Host-Ubuntu' jobs: - # - job: VisualRegressionTest_WebComponents - # variables: - # pipelineId: '315' - # pipelineName: 'fluent-ui_VRT_Pipeline_web-components' - # workspace: - # clean: all - # steps: - # - checkout: self - # fetchDepth: 0 + - job: VisualRegressionTest_WebComponents + variables: + pipelineId: '315' + pipelineName: 'fluent-ui_VRT_Pipeline_web-components' + workspace: + clean: all + steps: + - checkout: self + fetchDepth: 0 - # - template: .devops/templates/tools.yml - # - template: download-vr-cli.yml + - template: .devops/templates/tools.yml + - template: download-vr-cli.yml - # - bash: | - # postPolicy="true"; - # response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} ) - # parsedResponse=${response/*"access_token"/} - # token=${parsedResponse:3:${#parsedResponse}-5} - # curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \ - # --header 'Authorization: Bearer '"$token" \ - # --header 'Content-Type: application/json' \ - # --data-raw ' { - # "organization": "uifabric", - # "projectName": "fabricpublic", - # "prId": $(System.PullRequest.PullRequestNumber), - # "commitId": "$(Build.SourceVersion)", - # "generate":true, - # "clientType":"FLUENTUI", - # "blockingPipeline":{ - # }, - # "nonBlockingPipeline":{ - # "$(pipelineId)": { - # "pipelineStatus": "PENDING", - # "pipelineName": "$(pipelineName)" - # } - # }, - # "postPolicy": '${postPolicy}', - # "policyType": "OPTIONAL" - # }' - # displayName: 'Call policy State Api' - # env: - # VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) - # VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) - # VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - # VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) + - bash: | + postPolicy="true"; + response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode ) + parsedResponse=${response/*"access_token"/} + token=${parsedResponse:3:${#parsedResponse}-5} + curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \ + --header 'Authorization: Bearer '"$token" \ + --header 'Content-Type: application/json' \ + --data-raw ' { + "organization": "uifabric", + "projectName": "fabricpublic", + "prId": $(System.PullRequest.PullRequestNumber), + "commitId": "$(Build.SourceVersion)", + "generate":true, + "clientType":"FLUENTUI", + "blockingPipeline":{ + }, + "nonBlockingPipeline":{ + "$(pipelineId)": { + "pipelineStatus": "PENDING", + "pipelineName": "$(pipelineName)" + } + }, + "postPolicy": '${postPolicy}', + "policyType": "OPTIONAL" + }' + displayName: 'Call policy State Api' + env: + VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) + VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) + VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) - # - template: .devops/templates/runpublishvrscreenshot.yml - # parameters: - # fluentVersion: webcomponents - # vrTestPackageName: '@fluentui/vr-tests-web-components' - # vrTestPackagePath: 'apps/vr-tests-web-components' - # # ciDefinitionId is set to 205 because that is the ID of the baseline pipeline (https://uifabric.visualstudio.com/fabricpublic/_build?definitionId=205) used by the master branch - # - bash: vr-app run-diff --screenshotsDirectory ./screenshots --buildType pr --clientType "FLUENTUI" --ciDefinitionId 205 --groupName $(pipelineName) --locationPrefix 'FluentUI-web-components' --locationPostfix 'vrscreenshotwebcomponents' --pipelineId $(pipelineId) --clientName 'fluentui-web-components-v3' --threshold '0.04' --cumThreshold '1' - # displayName: 'Run fluentui-screenshotdiff' - # env: - # API_TOKEN: $(fabric-public-pipeline-access-PAT) - # GITHUB_API_TOKEN: $(githubRepoStatusPAT) - # STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - # VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) - # VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - # VR_APP_API_URL: $(VR_APP_API_URL) - # condition: eq(variables['vrTestSkip'], 'no') + - template: .devops/templates/runpublishvrscreenshot.yml + parameters: + fluentVersion: webcomponents + vrTestPackageName: '@fluentui/vr-tests-web-components' + vrTestPackagePath: 'apps/vr-tests-web-components' - # - job: VisualRegressionTest_V9 - # variables: - # pipelineId: '311' - # pipelineName: 'fluent-ui_VRT_Pipeline_v9' + - task: AzureCLI@2 + displayName: 'Run Snapshot Diffing' + env: + API_TOKEN: $(fabric-public-pipeline-access-PAT) + GITHUB_API_TOKEN: $(githubRepoStatusPAT) + STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) + VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) + VR_APP_API_URL: $(VR_APP_API_URL_NEW) + STORAGE_ACCOUNT_ID: $(StorageAccountId) + TENANT_ID: $(TenantId) + PRINCIPAL_CLIENT_ID: $(PrincipalClientId) + SERVICE_CONNECTION_ID: $(ServiceConnectionId) + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + azureSubscription: $(AzureSubscription) + scriptType: bash + scriptLocation: 'inlineScript' + inlineScript: | + vr-app run-diff --screenshotsDirectory ./screenshots --buildType pr --clientType "FLUENTUI" --ciDefinitionId 205 --groupName $(pipelineName) --locationPrefix 'FluentUI-web-components' --locationPostfix 'vrscreenshotwebcomponents' --pipelineId $(pipelineId) --clientName 'fluentui-web-components-v3' --threshold '0.04' --cumThreshold '1' + condition: eq(variables['vrTestSkip'], 'no') - # workspace: - # clean: all - # steps: - # - checkout: self - # fetchDepth: 0 + - job: VisualRegressionTest_V9 + variables: + pipelineId: '311' + pipelineName: 'fluent-ui_VRT_Pipeline_v9' - # - template: .devops/templates/tools.yml + workspace: + clean: all + steps: + - checkout: self + fetchDepth: 0 - # - template: download-vr-cli.yml + - template: .devops/templates/tools.yml - # - bash: | - # postPolicy="true"; - # response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} ) - # parsedResponse=${response/*"access_token"/} - # token=${parsedResponse:3:${#parsedResponse}-5} - # curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \ - # --header 'Authorization: Bearer '"$token" \ - # --header 'Content-Type: application/json' \ - # --data-raw ' { - # "organization": "uifabric", - # "projectName": "fabricpublic", - # "prId": $(System.PullRequest.PullRequestNumber), - # "commitId": "$(Build.SourceVersion)", - # "generate":true, - # "clientType":"FLUENTUI", - # "blockingPipeline":{ - # }, - # "nonBlockingPipeline":{ - # "$(pipelineId)": { - # "pipelineStatus": "PENDING", - # "pipelineName": "$(pipelineName)" - # } - # }, - # "postPolicy": '${postPolicy}', - # "policyType": "OPTIONAL" - # }' - # displayName: 'Call policy State Api' - # env: - # VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) - # VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) - # VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - # VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) + - template: download-vr-cli.yml - # - template: .devops/templates/runpublishvrscreenshot.yml - # parameters: - # fluentVersion: v9 - # vrTestPackageName: '@fluentui/vr-tests-react-components' - # vrTestPackagePath: 'apps/vr-tests-react-components' + - bash: | + postPolicy="true"; + response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode ) + parsedResponse=${response/*"access_token"/} + token=${parsedResponse:3:${#parsedResponse}-5} + curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \ + --header 'Authorization: Bearer '"$token" \ + --header 'Content-Type: application/json' \ + --data-raw ' { + "organization": "uifabric", + "projectName": "fabricpublic", + "prId": $(System.PullRequest.PullRequestNumber), + "commitId": "$(Build.SourceVersion)", + "generate":true, + "clientType":"FLUENTUI", + "blockingPipeline":{ + }, + "nonBlockingPipeline":{ + "$(pipelineId)": { + "pipelineStatus": "PENDING", + "pipelineName": "$(pipelineName)" + } + }, + "postPolicy": '${postPolicy}', + "policyType": "OPTIONAL" + }' + displayName: 'Call policy State Api' + env: + VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) + VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) + VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) + + - template: .devops/templates/runpublishvrscreenshot.yml + parameters: + fluentVersion: v9 + vrTestPackageName: '@fluentui/vr-tests-react-components' + vrTestPackagePath: 'apps/vr-tests-react-components' - # - bash: vr-app run-diff --buildType pr --screenshotsDirectory ./screenshots --clientType "FLUENTUI" --ciDefinitionId 205 --groupName $(pipelineName) --locationPrefix 'fluentuiv9' --locationPostfix 'vrscreenshotv9' --pipelineId $(pipelineId) --clientName 'fluentuiv9' --threshold '0.04' --cumThreshold '1' - # displayName: 'Run fluentui-screenshotdiff' - # env: - # API_TOKEN: $(fabric-public-pipeline-access-PAT) - # GITHUB_API_TOKEN: $(githubRepoStatusPAT) - # STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - # VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) - # VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - # VR_APP_API_URL: $(VR_APP_API_URL) - # STORAGE_ACCOUNT_ID: $(StorageAccountId) - # TENANT_ID: $(TenantId) - # PRINCIPAL_CLIENT_ID: $(PrincipalClientId) - # SERVICE_CONNECTION_ID: $(ServiceConnectionId) - # SYSTEM_ACCESSTOKEN: $(System.AccessToken) - # condition: eq(variables['vrTestSkip'], 'no') + - task: AzureCLI@2 + displayName: 'Run Snapshot Diffing' + env: + API_TOKEN: $(fabric-public-pipeline-access-PAT) + GITHUB_API_TOKEN: $(githubRepoStatusPAT) + STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) + VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) + VR_APP_API_URL: $(VR_APP_API_URL_NEW) + STORAGE_ACCOUNT_ID: $(StorageAccountId) + TENANT_ID: $(TenantId) + PRINCIPAL_CLIENT_ID: $(PrincipalClientId) + SERVICE_CONNECTION_ID: $(ServiceConnectionId) + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + azureSubscription: $(AzureSubscription) + scriptType: bash + scriptLocation: 'inlineScript' + inlineScript: | + vr-app run-diff --buildType pr --screenshotsDirectory ./screenshots --clientType "FLUENTUI" --ciDefinitionId 205 --groupName $(pipelineName) --locationPrefix 'fluentuiv9' --locationPostfix 'vrscreenshotv9' --pipelineId $(pipelineId) --clientName 'fluentuiv9' --threshold '0.04' --cumThreshold '1' + condition: eq(variables['vrTestSkip'], 'no') - job: VisualRegressionTest_V8 variables: @@ -190,7 +203,6 @@ jobs: }' displayName: 'Call policy State Api' env: - VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) @@ -222,71 +234,75 @@ jobs: vr-app run-diff --screenshotsDirectory ./screenshots --buildType pr --clientType "FLUENTUI" --ciDefinitionId 205 --groupName $(pipelineName) --locationPrefix 'fluentuiv8' --locationPostfix 'vrscreenshotv8' --pipelineId $(pipelineId) --clientName 'fluentuiv8' --threshold '0.04' --cumThreshold '1' condition: eq(variables['vrTestSkip'], 'no') - # - job: VisualRegressionTest_V0 - # variables: - # pipelineId: '313' - # pipelineName: 'fluent-ui_VRT_Pipeline_v0' + - job: VisualRegressionTest_V0 + variables: + pipelineId: '313' + pipelineName: 'fluent-ui_VRT_Pipeline_v0' - # workspace: - # clean: all - # steps: - # - checkout: self - # fetchDepth: 0 + workspace: + clean: all + steps: + - checkout: self + fetchDepth: 0 - # - template: .devops/templates/tools.yml + - template: .devops/templates/tools.yml - # - template: download-vr-cli.yml + - template: download-vr-cli.yml - # - bash: | - # postPolicy="true"; - # response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} ) - # parsedResponse=${response/*"access_token"/} - # token=${parsedResponse:3:${#parsedResponse}-5} - # curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \ - # --header 'Authorization: Bearer '"$token" \ - # --header 'Content-Type: application/json' \ - # --data-raw ' { - # "organization": "uifabric", - # "projectName": "fabricpublic", - # "prId": $(System.PullRequest.PullRequestNumber), - # "commitId": "$(Build.SourceVersion)", - # "generate":true, - # "clientType":"FLUENTUI", - # "blockingPipeline":{ - # }, - # "nonBlockingPipeline":{ - # "$(pipelineId)": { - # "pipelineStatus": "PENDING", - # "pipelineName": "$(pipelineName)" - # } - # }, - # "postPolicy": '${postPolicy}', - # "policyType": "OPTIONAL" - # }' - # displayName: 'Call policy State Api' - # env: - # VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) - # VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - # VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) + - bash: | + postPolicy="true"; + response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode ) + parsedResponse=${response/*"access_token"/} + token=${parsedResponse:3:${#parsedResponse}-5} + curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \ + --header 'Authorization: Bearer '"$token" \ + --header 'Content-Type: application/json' \ + --data-raw ' { + "organization": "uifabric", + "projectName": "fabricpublic", + "prId": $(System.PullRequest.PullRequestNumber), + "commitId": "$(Build.SourceVersion)", + "generate":true, + "clientType":"FLUENTUI", + "blockingPipeline":{ + }, + "nonBlockingPipeline":{ + "$(pipelineId)": { + "pipelineStatus": "PENDING", + "pipelineName": "$(pipelineName)" + } + }, + "postPolicy": '${postPolicy}', + "policyType": "OPTIONAL" + }' + displayName: 'Call policy State Api' + env: + VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) + VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) - # - template: .devops/templates/runpublishvrscreenshot.yml - # parameters: - # fluentVersion: v0 - # vrTestPackageName: '@fluentui/docs' - # vrTestPackagePath: 'packages/fluentui/docs' + - template: .devops/templates/runpublishvrscreenshot.yml + parameters: + fluentVersion: v0 + vrTestPackageName: '@fluentui/docs' + vrTestPackagePath: 'packages/fluentui/docs' - # - bash: vr-app run-diff --buildType pr --screenshotsDirectory ./screenshots --clientType "FLUENTUI" --ciDefinitionId 205 --groupName $(pipelineName) --locationPrefix 'FluentUI-v0' --locationPostfix 'vrscreenshotv0' --pipelineId $(pipelineId) --clientName 'FluentUIV0' --threshold '0.04' --cumThreshold '1' - # displayName: 'Run fluentui-screenshotdiff' - # env: - # API_TOKEN: $(fabric-public-pipeline-access-PAT) - # GITHUB_API_TOKEN: $(githubRepoStatusPAT) - # STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - # VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) - # VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) - # VR_APP_API_URL: $(VR_APP_API_URL) - # STORAGE_ACCOUNT_ID: $(StorageAccountId) - # TENANT_ID: $(TenantId) - # PRINCIPAL_CLIENT_ID: $(PrincipalClientId) - # SERVICE_CONNECTION_ID: $(ServiceConnectionId) - # SYSTEM_ACCESSTOKEN: $(System.AccessToken) - # condition: eq(variables['vrTestSkip'], 'no') + - task: AzureCLI@2 + displayName: 'Run Snapshot Diffing' + env: + API_TOKEN: $(fabric-public-pipeline-access-PAT) + GITHUB_API_TOKEN: $(githubRepoStatusPAT) + STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) + VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) + VR_APP_API_URL: $(VR_APP_API_URL_NEW) + STORAGE_ACCOUNT_ID: $(StorageAccountId) + TENANT_ID: $(TenantId) + PRINCIPAL_CLIENT_ID: $(PrincipalClientId) + SERVICE_CONNECTION_ID: $(ServiceConnectionId) + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + azureSubscription: $(AzureSubscription) + scriptType: bash + scriptLocation: 'inlineScript' + inlineScript: | + vr-app run-diff --buildType pr --screenshotsDirectory ./screenshots --clientType "FLUENTUI" --ciDefinitionId 205 --groupName $(pipelineName) --locationPrefix 'FluentUI-v0' --locationPostfix 'vrscreenshotv0' --pipelineId $(pipelineId) --clientName 'FluentUIV0' --threshold '0.04' --cumThreshold '1' + condition: eq(variables['vrTestSkip'], 'no') From 77f7b8b67d4a9858bb3c8d1546e3e2cda4f5f053 Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Tue, 16 Jul 2024 16:16:53 -0400 Subject: [PATCH 17/21] remove data encode --- azure-pipelines.vrt-pr.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index 2f696f333a407..248b44090aba4 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -30,7 +30,7 @@ jobs: - bash: | postPolicy="true"; - response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode ) + response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} ) parsedResponse=${response/*"access_token"/} token=${parsedResponse:3:${#parsedResponse}-5} curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \ @@ -104,7 +104,7 @@ jobs: - bash: | postPolicy="true"; - response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode ) + response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} ) parsedResponse=${response/*"access_token"/} token=${parsedResponse:3:${#parsedResponse}-5} curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \ @@ -251,7 +251,7 @@ jobs: - bash: | postPolicy="true"; - response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode ) + response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} ) parsedResponse=${response/*"access_token"/} token=${parsedResponse:3:${#parsedResponse}-5} curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \ From c17c4e5f1199b6d7c812edaf81d72e60a9fd94a5 Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Fri, 19 Jul 2024 10:30:07 -0400 Subject: [PATCH 18/21] bring back client secret for call state policy --- azure-pipelines.vrt-pr.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index 248b44090aba4..fba7d4fdde1fa 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -30,7 +30,7 @@ jobs: - bash: | postPolicy="true"; - response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} ) + response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET}) parsedResponse=${response/*"access_token"/} token=${parsedResponse:3:${#parsedResponse}-5} curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \ @@ -58,6 +58,7 @@ jobs: env: VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) + VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) - template: .devops/templates/runpublishvrscreenshot.yml @@ -104,7 +105,7 @@ jobs: - bash: | postPolicy="true"; - response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} ) + response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} ) parsedResponse=${response/*"access_token"/} token=${parsedResponse:3:${#parsedResponse}-5} curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \ @@ -132,6 +133,7 @@ jobs: env: VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) + VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) - template: .devops/templates/runpublishvrscreenshot.yml @@ -177,7 +179,7 @@ jobs: - bash: | postPolicy="true"; - response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} ) + response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET}) parsedResponse=${response/*"access_token"/} token=${parsedResponse:3:${#parsedResponse}-5} curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \ @@ -205,6 +207,7 @@ jobs: env: VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) + VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) - template: .devops/templates/runpublishvrscreenshot.yml @@ -251,7 +254,7 @@ jobs: - bash: | postPolicy="true"; - response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} ) + response=$(curl --request POST ${VR_APP_CLIENT_URL} --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id='${VR_APP_CLIENT_ID} --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET}) parsedResponse=${response/*"access_token"/} token=${parsedResponse:3:${#parsedResponse}-5} curl --location --request POST 'https://vrtfunctionappv0.azurewebsites.net/api/policyStateV2' \ @@ -278,6 +281,7 @@ jobs: displayName: 'Call policy State Api' env: VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) + VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APP_CLIENT_URL: $(VR_APP_CLIENT_URL) - template: .devops/templates/runpublishvrscreenshot.yml From f5bcef23c2717a612198d06ffdd81656b55204b3 Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Fri, 19 Jul 2024 11:03:48 -0400 Subject: [PATCH 19/21] test --- apps/vr-tests/src/stories/Button/Button.stories.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/vr-tests/src/stories/Button/Button.stories.tsx b/apps/vr-tests/src/stories/Button/Button.stories.tsx index 74ce665feb836..ee797850e43b3 100644 --- a/apps/vr-tests/src/stories/Button/Button.stories.tsx +++ b/apps/vr-tests/src/stories/Button/Button.stories.tsx @@ -8,8 +8,8 @@ const baseProps: IButtonProps = { iconProps: { iconName: 'AddFriend', }, - children: 'Button', - secondaryText: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor', + children: 'Hello world', + secondaryText: 'meow', }; export default { From b2b35a4e7f267c35e8ac6d1197c4eaa3cf50b164 Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Fri, 19 Jul 2024 11:57:55 -0400 Subject: [PATCH 20/21] test again --- apps/vr-tests/src/stories/Button/Button.stories.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/vr-tests/src/stories/Button/Button.stories.tsx b/apps/vr-tests/src/stories/Button/Button.stories.tsx index ee797850e43b3..1fc2498935dcd 100644 --- a/apps/vr-tests/src/stories/Button/Button.stories.tsx +++ b/apps/vr-tests/src/stories/Button/Button.stories.tsx @@ -8,7 +8,7 @@ const baseProps: IButtonProps = { iconProps: { iconName: 'AddFriend', }, - children: 'Hello world', + children: 'Hello world im a button', secondaryText: 'meow', }; From a3a0d2fd03a8e2ea4a76a15e88403c2fe3a93890 Mon Sep 17 00:00:00 2001 From: TristanWatanabe Date: Fri, 19 Jul 2024 12:30:12 -0400 Subject: [PATCH 21/21] Revert tests --- apps/vr-tests/src/stories/Button/Button.stories.tsx | 4 ++-- azure-pipelines.vrt-pr.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/vr-tests/src/stories/Button/Button.stories.tsx b/apps/vr-tests/src/stories/Button/Button.stories.tsx index 1fc2498935dcd..74ce665feb836 100644 --- a/apps/vr-tests/src/stories/Button/Button.stories.tsx +++ b/apps/vr-tests/src/stories/Button/Button.stories.tsx @@ -8,8 +8,8 @@ const baseProps: IButtonProps = { iconProps: { iconName: 'AddFriend', }, - children: 'Hello world im a button', - secondaryText: 'meow', + children: 'Button', + secondaryText: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor', }; export default { diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index fba7d4fdde1fa..a1e8c623e797c 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -68,7 +68,7 @@ jobs: vrTestPackagePath: 'apps/vr-tests-web-components' - task: AzureCLI@2 - displayName: 'Run Snapshot Diffing' + displayName: 'Run fluentui-screenshotdiff' env: API_TOKEN: $(fabric-public-pipeline-access-PAT) GITHUB_API_TOKEN: $(githubRepoStatusPAT) @@ -143,7 +143,7 @@ jobs: vrTestPackagePath: 'apps/vr-tests-react-components' - task: AzureCLI@2 - displayName: 'Run Snapshot Diffing' + displayName: 'Run fluentui-screenshotdiff' env: API_TOKEN: $(fabric-public-pipeline-access-PAT) GITHUB_API_TOKEN: $(githubRepoStatusPAT) @@ -217,7 +217,7 @@ jobs: vrTestPackagePath: 'apps/vr-tests' - task: AzureCLI@2 - displayName: 'Run Snapshot Diffing' + displayName: 'Run fluentui-screenshotdiff' env: API_TOKEN: $(fabric-public-pipeline-access-PAT) GITHUB_API_TOKEN: $(githubRepoStatusPAT) @@ -291,7 +291,7 @@ jobs: vrTestPackagePath: 'packages/fluentui/docs' - task: AzureCLI@2 - displayName: 'Run Snapshot Diffing' + displayName: 'Run fluentui-screenshotdiff' env: API_TOKEN: $(fabric-public-pipeline-access-PAT) GITHUB_API_TOKEN: $(githubRepoStatusPAT)