From 337e53453d51dd32c82a3b491323301808897047 Mon Sep 17 00:00:00 2001 From: Devjoyti Barman <53661347+Devjoyti-Barman@users.noreply.github.com> Date: Mon, 19 Jun 2023 08:47:53 +0000 Subject: [PATCH 01/13] Added the yml file to download vr-approval-cli --- download-vr-cli.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 download-vr-cli.yml diff --git a/download-vr-cli.yml b/download-vr-cli.yml new file mode 100644 index 00000000000000..33ef950ea20481 --- /dev/null +++ b/download-vr-cli.yml @@ -0,0 +1,6 @@ +steps: + - bash: | + set -exuo pipefail + npm install -g vr-approval-cli + displayName: Download VR App CLI + retryCountOnTaskFailure: 3 From 91b8f5e84800af902e348260fa03ba0247dcf57f Mon Sep 17 00:00:00 2001 From: Devjoyti Barman <53661347+Devjoyti-Barman@users.noreply.github.com> Date: Mon, 19 Jun 2023 10:02:13 +0000 Subject: [PATCH 02/13] Added the azurePipeline steps --- azure-pipelines.vrt-pr.yml | 109 ++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 63 deletions(-) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index 8d50ee5da0c982..f1f3c9acf088c2 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -1,7 +1,7 @@ pr: - master -# There's a separate pipeline for CI which also uses this file, but with a trigger override in the UI +# There's a separate pipeline for CI which also uses this file, but with a trigger override in the UI. # https://dev.azure.com/uifabric/fabricpublic/_apps/hub/ms.vss-ciworkflow.build-ci-hub?_a=edit-build-definition&id=164&view=Tab_Triggers trigger: none @@ -28,12 +28,14 @@ jobs: - template: .devops/templates/tools.yml + - template: download-vr-cli.yml + - bash: | postPolicy="true"; response=$(curl --request POST 'https://login.microsoftonline.com/72f988bf-86f1-41af-91ab-2d7cd011db47/oauth2/token' --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id=288a69b6-760d-4c1f-ad6d-0183b5e5740f' --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} ) parsedResponse=${response/*"access_token"/} token=${parsedResponse:3:${#parsedResponse}-5} - curl --location --request POST 'https://vrt-fluentapp.azurewebsites.net/api/policyState' \ + curl --location --request POST 'https://vrtestfunctionapp.azurewebsites.net/api/policyStateV2' \ --header 'Authorization: Bearer '"$token" \ --header 'Content-Type: application/json' \ --data-raw ' { @@ -42,12 +44,13 @@ jobs: "prId": $(System.PullRequest.PullRequestNumber), "commitId": "$(Build.SourceVersion)", "generate":true, + "clientType":"FLUENTUI", "blockingPipeline":{ }, "nonBlockingPipeline":{ "$(pipelineId)": { "pipelineStatus": "PENDING", - "pipelineName": "$(pipelineName)" + "pipelineName": "E2E Tests-v9" } }, "postPolicy": '${postPolicy}', @@ -64,21 +67,7 @@ jobs: vrTestPackageName: '@fluentui/vr-tests-react-components' vrTestPackagePath: 'apps/vr-tests-react-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) - BASELINE_PIPELINE_ID: $(BASELINE-PIPELINE-ID) - condition: eq(variables['vrTestSkip'], 'no') - - - bash: node node_modules/vrscreenshotdiff/lib/index.js pr --clientType "fluentuiv9" --buildId $(Build.BuildId) --lkgCIBuild $(LatestBuildId) --pipelineId $(pipelineId) --pipelineName '$(pipelineName)' + - bash: vr-app run-diff --buildType pr --screenshotsDirectory ./screenshots/ --clientType "FLUENTUI" --ciDefinitionId 205 --groupName 'E2E Tests-v9' --locationPrefix 'fluentuiv9' --locationPostfix 'vrscreenshotv9' --pipelineId $(pipelineId) --clientName 'fluentuiv9' --threshold '0.04' --cumThreshold '1' displayName: 'Run fluentui-screenshotdiff' env: API_URL: $(System.CollectionUri) @@ -89,12 +78,16 @@ jobs: GITHUB_API_TOKEN: $(githubRepoStatusPAT) STORAGE_ACCOUNT_FLUENTUI: $(STORAGE-ACCOUNT-FLUENTUI) STORAGE_KEY_FLUENTUI: $(STORAGE-KEY-BLOB-FLUENTUI) - BLOB_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) + STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) + #BLOB_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) + # VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) GITHUB_REPO_OWNER: 'microsoft' GITHUB_REPO_NAME: 'fluentui' - VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) - VR_APP_NAME: $(VR_APP_NAME) + # VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) + # VR_APP_NAME: $(VR_APP_NAME) + VR_APP_API_URL: 'https://vrtestfunctionapp.azurewebsites.net/api/' + VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) + VR_APP_CLIENT_ID: '288a69b6-760d-4c1f-ad6d-0183b5e5740f' condition: eq(variables['vrTestSkip'], 'no') - job: VisualRegressionTest_V8 @@ -109,12 +102,14 @@ jobs: - template: .devops/templates/tools.yml + - template: download-vr-cli.yml + - bash: | postPolicy="true"; response=$(curl --request POST 'https://login.microsoftonline.com/72f988bf-86f1-41af-91ab-2d7cd011db47/oauth2/token' --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id=288a69b6-760d-4c1f-ad6d-0183b5e5740f' --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} ) parsedResponse=${response/*"access_token"/} token=${parsedResponse:3:${#parsedResponse}-5} - curl --location --request POST 'https://vrt-fluentapp.azurewebsites.net/api/policyState' \ + curl --location --request POST 'https://vrtestfunctionapp.azurewebsites.net/api/policyStateV2' \ --header 'Authorization: Bearer '"$token" \ --header 'Content-Type: application/json' \ --data-raw ' { @@ -123,12 +118,13 @@ jobs: "prId": $(System.PullRequest.PullRequestNumber), "commitId": "$(Build.SourceVersion)", "generate":true, + "clientType":"FLUENTUI", "blockingPipeline":{ }, "nonBlockingPipeline":{ "$(pipelineId)": { "pipelineStatus": "PENDING", - "pipelineName": "$(pipelineName)" + "pipelineName": "E2E Tests-v8" } }, "postPolicy": '${postPolicy}', @@ -145,21 +141,8 @@ jobs: vrTestPackageName: '@fluentui/vr-tests' vrTestPackagePath: 'apps/vr-tests' - - 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) - BASELINE_PIPELINE_ID: $(BASELINE-PIPELINE-ID) - condition: eq(variables['vrTestSkip'], 'no') + - bash: vr-app run-diff --screenshotsDirectory ./screenshots --buildType pr --clientType "FLUENTUI" --ciDefinitionId 205 --groupName 'E2E Tests-v8' --locationPrefix 'fluentuiv8' --locationPostfix 'vrscreenshotv8' --pipelineId $(pipelineId) --clientName 'fluentuiv8' --threshold '0.04' --cumThreshold '1' - - bash: node node_modules/vrscreenshotdiff/lib/index.js pr --clientType "fluentuiv8" --buildId $(Build.BuildId) --lkgCIBuild $(LatestBuildId) --pipelineId $(pipelineId) --pipelineName '$(pipelineName)' displayName: 'Run fluentui-screenshotdiff' env: API_URL: $(System.CollectionUri) @@ -170,12 +153,17 @@ jobs: GITHUB_API_TOKEN: $(githubRepoStatusPAT) STORAGE_ACCOUNT_FLUENTUI: $(STORAGE-ACCOUNT-FLUENTUI) STORAGE_KEY_FLUENTUI: $(STORAGE-KEY-BLOB-FLUENTUI) - BLOB_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) + # BLOB_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) + STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) + # VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) GITHUB_REPO_OWNER: 'microsoft' GITHUB_REPO_NAME: 'fluentui' - VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) - VR_APP_NAME: $(VR_APP_NAME) + # VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) + # VR_APP_NAME: $(VR_APP_NAME) + # VR_APP_API_URL: 'https://vrtestfunctionapp.azurewebsites.net/api/' + VR_APP_API_URL: 'https://vrtestfunctionapp.azurewebsites.net/api/' + VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) + VR_APP_CLIENT_ID: '288a69b6-760d-4c1f-ad6d-0183b5e5740f' condition: eq(variables['vrTestSkip'], 'no') - job: VisualRegressionTest_V0 @@ -191,12 +179,14 @@ jobs: - template: .devops/templates/tools.yml + - template: download-vr-cli.yml + - bash: | postPolicy="true"; response=$(curl --request POST 'https://login.microsoftonline.com/72f988bf-86f1-41af-91ab-2d7cd011db47/oauth2/token' --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id=288a69b6-760d-4c1f-ad6d-0183b5e5740f' --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} ) parsedResponse=${response/*"access_token"/} token=${parsedResponse:3:${#parsedResponse}-5} - curl --location --request POST 'https://vrt-fluentapp.azurewebsites.net/api/policyState' \ + curl --location --request POST 'https://vrtestfunctionapp.azurewebsites.net/api/policyStateV2' \ --header 'Authorization: Bearer '"$token" \ --header 'Content-Type: application/json' \ --data-raw ' { @@ -205,12 +195,13 @@ jobs: "prId": $(System.PullRequest.PullRequestNumber), "commitId": "$(Build.SourceVersion)", "generate":true, + "clientType":"FLUENTUI", "blockingPipeline":{ }, "nonBlockingPipeline":{ "$(pipelineId)": { "pipelineStatus": "PENDING", - "pipelineName": "$(pipelineName)" + "pipelineName": "E2E Tests-v0" } }, "postPolicy": '${postPolicy}', @@ -219,40 +210,32 @@ jobs: displayName: 'Call policy State Api' env: VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) + - template: .devops/templates/runpublishvrscreenshot.yml parameters: fluentVersion: v0 vrTestPackageName: '@fluentui/docs' vrTestPackagePath: 'packages/fluentui/docs' - - 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) - BASELINE_PIPELINE_ID: $(BASELINE-PIPELINE-ID) - condition: eq(variables['vrTestSkip'], 'no') - - bash: node node_modules/vrscreenshotdiff/lib/index.js pr --clientType "FluentUI-v0" --buildId $(Build.BuildId) --lkgCIBuild $(LatestBuildId) --pipelineId $(pipelineId) --pipelineName '$(pipelineName)' + - bash: vr-app run-diff --buildType pr --screenshotsDirectory ./screenshots/ --clientType "FLUENTUI" --ciDefinitionId 205 --groupName 'E2E Tests-v0' --locationPrefix 'FluentUI-v0' --locationPostfix 'vrscreenshotv0' --pipelineId $(pipelineId) --clientName 'FluentUIV0' --threshold '0.04' --cumThreshold '1' displayName: 'Run fluentui-screenshotdiff' env: API_URL: $(System.CollectionUri) API_TOKEN: $(fabric-public-pipeline-access-PAT) API_REPOSITORY: $(Build.Repository.Name) API_PROJECT: $(System.TeamProject) - SCREENSHOT_ARTIFACT_FOLDER: vrscreenshotv0 + SCREENSHOT_ARTIFACT_FOLDER: vrscreenshotv9 GITHUB_API_TOKEN: $(githubRepoStatusPAT) STORAGE_ACCOUNT_FLUENTUI: $(STORAGE-ACCOUNT-FLUENTUI) STORAGE_KEY_FLUENTUI: $(STORAGE-KEY-BLOB-FLUENTUI) - BLOB_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) + STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) + #BLOB_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) + # VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) GITHUB_REPO_OWNER: 'microsoft' GITHUB_REPO_NAME: 'fluentui' - VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) - VR_APP_NAME: $(VR_APP_NAME) + # VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) + # VR_APP_NAME: $(VR_APP_NAME) + VR_APP_API_URL: 'https://vrtestfunctionapp.azurewebsites.net/api/' + VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) + VR_APP_CLIENT_ID: '288a69b6-760d-4c1f-ad6d-0183b5e5740f' condition: eq(variables['vrTestSkip'], 'no') From 5acf558f6fd75fda41463447be3a570a051e13b0 Mon Sep 17 00:00:00 2001 From: Devjoyti Barman <53661347+Devjoyti-Barman@users.noreply.github.com> Date: Tue, 20 Jun 2023 07:45:23 +0000 Subject: [PATCH 03/13] Moveed the policy api to generalized backend --- 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 f1f3c9acf088c2..f820802b1731bb 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -35,7 +35,7 @@ jobs: response=$(curl --request POST 'https://login.microsoftonline.com/72f988bf-86f1-41af-91ab-2d7cd011db47/oauth2/token' --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id=288a69b6-760d-4c1f-ad6d-0183b5e5740f' --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} ) parsedResponse=${response/*"access_token"/} token=${parsedResponse:3:${#parsedResponse}-5} - curl --location --request POST 'https://vrtestfunctionapp.azurewebsites.net/api/policyStateV2' \ + curl --location --request POST 'https://vrapprovalfunction-prod.azurewebsites.net/api/policyStateV2' \ --header 'Authorization: Bearer '"$token" \ --header 'Content-Type: application/json' \ --data-raw ' { @@ -109,7 +109,7 @@ jobs: response=$(curl --request POST 'https://login.microsoftonline.com/72f988bf-86f1-41af-91ab-2d7cd011db47/oauth2/token' --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id=288a69b6-760d-4c1f-ad6d-0183b5e5740f' --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} ) parsedResponse=${response/*"access_token"/} token=${parsedResponse:3:${#parsedResponse}-5} - curl --location --request POST 'https://vrtestfunctionapp.azurewebsites.net/api/policyStateV2' \ + curl --location --request POST 'https://vrapprovalfunction-prod.azurewebsites.net/api/policyStateV2' \ --header 'Authorization: Bearer '"$token" \ --header 'Content-Type: application/json' \ --data-raw ' { @@ -186,7 +186,7 @@ jobs: response=$(curl --request POST 'https://login.microsoftonline.com/72f988bf-86f1-41af-91ab-2d7cd011db47/oauth2/token' --header 'Content-Type: application/x-www-form-urlencoded' --data-urlencode 'grant_type=client_credentials' --data-urlencode 'client_id=288a69b6-760d-4c1f-ad6d-0183b5e5740f' --data-urlencode 'client_secret='${VR_APPROVAL_CLIENT_SECRET} ) parsedResponse=${response/*"access_token"/} token=${parsedResponse:3:${#parsedResponse}-5} - curl --location --request POST 'https://vrtestfunctionapp.azurewebsites.net/api/policyStateV2' \ + curl --location --request POST 'https://vrapprovalfunction-prod.azurewebsites.net/api/policyStateV2' \ --header 'Authorization: Bearer '"$token" \ --header 'Content-Type: application/json' \ --data-raw ' { From 699897eb096f5f5a024eb7b26a5a851fb4c3c98e Mon Sep 17 00:00:00 2001 From: Devjoyti Barman <53661347+Devjoyti-Barman@users.noreply.github.com> Date: Tue, 20 Jun 2023 07:52:44 +0000 Subject: [PATCH 04/13] Moved to the prod API --- azure-pipelines.vrt-pr.yml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index f820802b1731bb..7b2c274cb899d0 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -79,13 +79,10 @@ jobs: STORAGE_ACCOUNT_FLUENTUI: $(STORAGE-ACCOUNT-FLUENTUI) STORAGE_KEY_FLUENTUI: $(STORAGE-KEY-BLOB-FLUENTUI) STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - #BLOB_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - # VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) GITHUB_REPO_OWNER: 'microsoft' GITHUB_REPO_NAME: 'fluentui' # VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) - # VR_APP_NAME: $(VR_APP_NAME) - VR_APP_API_URL: 'https://vrtestfunctionapp.azurewebsites.net/api/' + VR_APP_API_URL: 'https://vrapprovalfunction-prod.azurewebsites.net/api/' VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APP_CLIENT_ID: '288a69b6-760d-4c1f-ad6d-0183b5e5740f' condition: eq(variables['vrTestSkip'], 'no') @@ -153,15 +150,11 @@ jobs: GITHUB_API_TOKEN: $(githubRepoStatusPAT) STORAGE_ACCOUNT_FLUENTUI: $(STORAGE-ACCOUNT-FLUENTUI) STORAGE_KEY_FLUENTUI: $(STORAGE-KEY-BLOB-FLUENTUI) - # BLOB_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - # VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) GITHUB_REPO_OWNER: 'microsoft' GITHUB_REPO_NAME: 'fluentui' # VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) - # VR_APP_NAME: $(VR_APP_NAME) - # VR_APP_API_URL: 'https://vrtestfunctionapp.azurewebsites.net/api/' - VR_APP_API_URL: 'https://vrtestfunctionapp.azurewebsites.net/api/' + VR_APP_API_URL: 'https://vrapprovalfunction-prod.azurewebsites.net/api/' VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APP_CLIENT_ID: '288a69b6-760d-4c1f-ad6d-0183b5e5740f' condition: eq(variables['vrTestSkip'], 'no') @@ -229,13 +222,10 @@ jobs: STORAGE_ACCOUNT_FLUENTUI: $(STORAGE-ACCOUNT-FLUENTUI) STORAGE_KEY_FLUENTUI: $(STORAGE-KEY-BLOB-FLUENTUI) STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - #BLOB_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - # VR_APPROVAL_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) GITHUB_REPO_OWNER: 'microsoft' GITHUB_REPO_NAME: 'fluentui' # VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) - # VR_APP_NAME: $(VR_APP_NAME) - VR_APP_API_URL: 'https://vrtestfunctionapp.azurewebsites.net/api/' + VR_APP_API_URL: 'https://vrapprovalfunction-prod.azurewebsites.net/api/' VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APP_CLIENT_ID: '288a69b6-760d-4c1f-ad6d-0183b5e5740f' condition: eq(variables['vrTestSkip'], 'no') From eea6f1e0df17b11a09a765ab363a6bd70b2445d1 Mon Sep 17 00:00:00 2001 From: Devjoyti Barman <53661347+Devjoyti-Barman@users.noreply.github.com> Date: Wed, 21 Jun 2023 08:24:14 +0000 Subject: [PATCH 05/13] removed unused configs --- azure-pipelines.vrt-pr.yml | 43 +++++++------------------------------- 1 file changed, 8 insertions(+), 35 deletions(-) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index 7b2c274cb899d0..24a38648b93082 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -70,21 +70,12 @@ jobs: - bash: vr-app run-diff --buildType pr --screenshotsDirectory ./screenshots/ --clientType "FLUENTUI" --ciDefinitionId 205 --groupName 'E2E Tests-v9' --locationPrefix 'fluentuiv9' --locationPostfix 'vrscreenshotv9' --pipelineId $(pipelineId) --clientName 'fluentuiv9' --threshold '0.04' --cumThreshold '1' displayName: 'Run fluentui-screenshotdiff' env: - API_URL: $(System.CollectionUri) API_TOKEN: $(fabric-public-pipeline-access-PAT) - API_REPOSITORY: $(Build.Repository.Name) - API_PROJECT: $(System.TeamProject) - SCREENSHOT_ARTIFACT_FOLDER: vrscreenshotv9 - GITHUB_API_TOKEN: $(githubRepoStatusPAT) - STORAGE_ACCOUNT_FLUENTUI: $(STORAGE-ACCOUNT-FLUENTUI) - STORAGE_KEY_FLUENTUI: $(STORAGE-KEY-BLOB-FLUENTUI) - STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - GITHUB_REPO_OWNER: 'microsoft' - GITHUB_REPO_NAME: 'fluentui' - # VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) - VR_APP_API_URL: 'https://vrapprovalfunction-prod.azurewebsites.net/api/' + STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APP_CLIENT_ID: '288a69b6-760d-4c1f-ad6d-0183b5e5740f' + VR_APP_API_URL: 'https://vrapprovalfunction-prod.azurewebsites.net/api/' + # VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) condition: eq(variables['vrTestSkip'], 'no') - job: VisualRegressionTest_V8 @@ -142,21 +133,12 @@ jobs: displayName: 'Run fluentui-screenshotdiff' env: - API_URL: $(System.CollectionUri) API_TOKEN: $(fabric-public-pipeline-access-PAT) - API_REPOSITORY: $(Build.Repository.Name) - API_PROJECT: $(System.TeamProject) - SCREENSHOT_ARTIFACT_FOLDER: vrscreenshotv8 - GITHUB_API_TOKEN: $(githubRepoStatusPAT) - STORAGE_ACCOUNT_FLUENTUI: $(STORAGE-ACCOUNT-FLUENTUI) - STORAGE_KEY_FLUENTUI: $(STORAGE-KEY-BLOB-FLUENTUI) STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - GITHUB_REPO_OWNER: 'microsoft' - GITHUB_REPO_NAME: 'fluentui' - # VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) - VR_APP_API_URL: 'https://vrapprovalfunction-prod.azurewebsites.net/api/' VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APP_CLIENT_ID: '288a69b6-760d-4c1f-ad6d-0183b5e5740f' + VR_APP_API_URL: 'https://vrapprovalfunction-prod.azurewebsites.net/api/' + # VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) condition: eq(variables['vrTestSkip'], 'no') - job: VisualRegressionTest_V0 @@ -213,19 +195,10 @@ jobs: - bash: vr-app run-diff --buildType pr --screenshotsDirectory ./screenshots/ --clientType "FLUENTUI" --ciDefinitionId 205 --groupName 'E2E Tests-v0' --locationPrefix 'FluentUI-v0' --locationPostfix 'vrscreenshotv0' --pipelineId $(pipelineId) --clientName 'FluentUIV0' --threshold '0.04' --cumThreshold '1' displayName: 'Run fluentui-screenshotdiff' env: - API_URL: $(System.CollectionUri) API_TOKEN: $(fabric-public-pipeline-access-PAT) - API_REPOSITORY: $(Build.Repository.Name) - API_PROJECT: $(System.TeamProject) - SCREENSHOT_ARTIFACT_FOLDER: vrscreenshotv9 - GITHUB_API_TOKEN: $(githubRepoStatusPAT) - STORAGE_ACCOUNT_FLUENTUI: $(STORAGE-ACCOUNT-FLUENTUI) - STORAGE_KEY_FLUENTUI: $(STORAGE-KEY-BLOB-FLUENTUI) - STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) - GITHUB_REPO_OWNER: 'microsoft' - GITHUB_REPO_NAME: 'fluentui' - # VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) - VR_APP_API_URL: 'https://vrapprovalfunction-prod.azurewebsites.net/api/' + STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) VR_APP_CLIENT_ID: '288a69b6-760d-4c1f-ad6d-0183b5e5740f' + VR_APP_API_URL: 'https://vrapprovalfunction-prod.azurewebsites.net/api/' + # VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) condition: eq(variables['vrTestSkip'], 'no') From da05eab40dda1626a4efdeab117f9201e215fe8f Mon Sep 17 00:00:00 2001 From: Devjoyti Barman <53661347+Devjoyti-Barman@users.noreply.github.com> Date: Wed, 21 Jun 2023 08:58:40 +0000 Subject: [PATCH 06/13] Added the Github api token --- azure-pipelines.vrt-pr.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index 24a38648b93082..9ae6822887d927 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -71,6 +71,7 @@ jobs: 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: '288a69b6-760d-4c1f-ad6d-0183b5e5740f' @@ -134,6 +135,7 @@ jobs: 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: '288a69b6-760d-4c1f-ad6d-0183b5e5740f' @@ -196,6 +198,7 @@ jobs: 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: '288a69b6-760d-4c1f-ad6d-0183b5e5740f' From d22bbef37dd42cd52acb7858d5e489fb22d87a7f Mon Sep 17 00:00:00 2001 From: Devjoyti Barman <53661347+Devjoyti-Barman@users.noreply.github.com> Date: Thu, 22 Jun 2023 10:18:01 +0000 Subject: [PATCH 07/13] removed the vr-approval-cli download file --- azure-pipelines.vrt-pr.yml | 1 - download-vr-cli.yml | 6 ------ 2 files changed, 7 deletions(-) delete mode 100644 download-vr-cli.yml diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index 9ae6822887d927..d09f3cac355033 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -131,7 +131,6 @@ jobs: vrTestPackagePath: 'apps/vr-tests' - bash: vr-app run-diff --screenshotsDirectory ./screenshots --buildType pr --clientType "FLUENTUI" --ciDefinitionId 205 --groupName 'E2E Tests-v8' --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) diff --git a/download-vr-cli.yml b/download-vr-cli.yml deleted file mode 100644 index 33ef950ea20481..00000000000000 --- a/download-vr-cli.yml +++ /dev/null @@ -1,6 +0,0 @@ -steps: - - bash: | - set -exuo pipefail - npm install -g vr-approval-cli - displayName: Download VR App CLI - retryCountOnTaskFailure: 3 From fd22cefdb1cdfbb83391290277965d4525d7a47f Mon Sep 17 00:00:00 2001 From: Devjoyti Barman <53661347+Devjoyti-Barman@users.noreply.github.com> Date: Thu, 22 Jun 2023 10:37:25 +0000 Subject: [PATCH 08/13] Fixed the pipeline name --- 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 d09f3cac355033..071ac59b8dda96 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -50,7 +50,7 @@ jobs: "nonBlockingPipeline":{ "$(pipelineId)": { "pipelineStatus": "PENDING", - "pipelineName": "E2E Tests-v9" + "pipelineName": "$(pipelineName)" } }, "postPolicy": '${postPolicy}', @@ -113,7 +113,7 @@ jobs: "nonBlockingPipeline":{ "$(pipelineId)": { "pipelineStatus": "PENDING", - "pipelineName": "E2E Tests-v8" + "pipelineName": "$(pipelineName)" } }, "postPolicy": '${postPolicy}', @@ -177,7 +177,7 @@ jobs: "nonBlockingPipeline":{ "$(pipelineId)": { "pipelineStatus": "PENDING", - "pipelineName": "E2E Tests-v0" + "pipelineName": "$(pipelineName)" } }, "postPolicy": '${postPolicy}', From 21d7f8d7d87a055073df09b6b46adeb19780562b Mon Sep 17 00:00:00 2001 From: Devjoyti Barman <53661347+Devjoyti-Barman@users.noreply.github.com> Date: Thu, 22 Jun 2023 13:14:55 +0000 Subject: [PATCH 09/13] removed the slash --- azure-pipelines.vrt-pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index 071ac59b8dda96..8a3b71ecab1815 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -67,7 +67,7 @@ jobs: 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 'E2E Tests-v9' --locationPrefix 'fluentuiv9' --locationPostfix 'vrscreenshotv9' --pipelineId $(pipelineId) --clientName 'fluentuiv9' --threshold '0.04' --cumThreshold '1' + - bash: vr-app run-diff --buildType pr --screenshotsDirectory ./screenshots --clientType "FLUENTUI" --ciDefinitionId 205 --groupName 'E2E Tests-v9' --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) @@ -193,7 +193,7 @@ jobs: vrTestPackageName: '@fluentui/docs' vrTestPackagePath: 'packages/fluentui/docs' - - bash: vr-app run-diff --buildType pr --screenshotsDirectory ./screenshots/ --clientType "FLUENTUI" --ciDefinitionId 205 --groupName 'E2E Tests-v0' --locationPrefix 'FluentUI-v0' --locationPostfix 'vrscreenshotv0' --pipelineId $(pipelineId) --clientName 'FluentUIV0' --threshold '0.04' --cumThreshold '1' + - bash: vr-app run-diff --buildType pr --screenshotsDirectory ./screenshots --clientType "FLUENTUI" --ciDefinitionId 205 --groupName 'E2E Tests-v0' --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) From 71cb1ca54b8b874a9a757391d01e17316c84e120 Mon Sep 17 00:00:00 2001 From: Devjoyti Barman <53661347+Devjoyti-Barman@users.noreply.github.com> Date: Thu, 22 Jun 2023 13:18:13 +0000 Subject: [PATCH 10/13] fixed the groupName --- 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 8a3b71ecab1815..1be7003cb8ee59 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -67,7 +67,7 @@ jobs: 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 'E2E Tests-v9' --locationPrefix 'fluentuiv9' --locationPostfix 'vrscreenshotv9' --pipelineId $(pipelineId) --clientName 'fluentuiv9' --threshold '0.04' --cumThreshold '1' + - 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) @@ -130,7 +130,7 @@ jobs: vrTestPackageName: '@fluentui/vr-tests' vrTestPackagePath: 'apps/vr-tests' - - bash: vr-app run-diff --screenshotsDirectory ./screenshots --buildType pr --clientType "FLUENTUI" --ciDefinitionId 205 --groupName 'E2E Tests-v8' --locationPrefix 'fluentuiv8' --locationPostfix 'vrscreenshotv8' --pipelineId $(pipelineId) --clientName 'fluentuiv8' --threshold '0.04' --cumThreshold '1' + - 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) @@ -193,7 +193,7 @@ jobs: vrTestPackageName: '@fluentui/docs' vrTestPackagePath: 'packages/fluentui/docs' - - bash: vr-app run-diff --buildType pr --screenshotsDirectory ./screenshots --clientType "FLUENTUI" --ciDefinitionId 205 --groupName 'E2E Tests-v0' --locationPrefix 'FluentUI-v0' --locationPostfix 'vrscreenshotv0' --pipelineId $(pipelineId) --clientName 'FluentUIV0' --threshold '0.04' --cumThreshold '1' + - 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) From fd9169d1fef32bd12d4bcee05110c47d528bad52 Mon Sep 17 00:00:00 2001 From: Devjoyti Barman <53661347+Devjoyti-Barman@users.noreply.github.com> Date: Mon, 3 Jul 2023 17:40:40 +0000 Subject: [PATCH 11/13] Updated the clientId and API url --- azure-pipelines.vrt-pr.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml index 1be7003cb8ee59..290c76f393ded2 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -74,9 +74,8 @@ jobs: GITHUB_API_TOKEN: $(githubRepoStatusPAT) STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) - VR_APP_CLIENT_ID: '288a69b6-760d-4c1f-ad6d-0183b5e5740f' - VR_APP_API_URL: 'https://vrapprovalfunction-prod.azurewebsites.net/api/' - # VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) + VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) + VR_APP_API_URL: $(VR_APP_API_URL) condition: eq(variables['vrTestSkip'], 'no') - job: VisualRegressionTest_V8 @@ -137,9 +136,8 @@ jobs: GITHUB_API_TOKEN: $(githubRepoStatusPAT) STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) - VR_APP_CLIENT_ID: '288a69b6-760d-4c1f-ad6d-0183b5e5740f' - VR_APP_API_URL: 'https://vrapprovalfunction-prod.azurewebsites.net/api/' - # VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) + VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) + VR_APP_API_URL: $(VR_APP_API_URL) condition: eq(variables['vrTestSkip'], 'no') - job: VisualRegressionTest_V0 @@ -200,7 +198,6 @@ jobs: GITHUB_API_TOKEN: $(githubRepoStatusPAT) STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) VR_APP_CLIENT_SECRET: $(VR-APPROVAL-CLIENT-SECRET) - VR_APP_CLIENT_ID: '288a69b6-760d-4c1f-ad6d-0183b5e5740f' - VR_APP_API_URL: 'https://vrapprovalfunction-prod.azurewebsites.net/api/' - # VR_APPROVAL_HOST: $(VR_APPROVAL_HOST) + VR_APP_CLIENT_ID: $(VR_APP_CLIENT_ID) + VR_APP_API_URL: $(VR_APP_API_URL) condition: eq(variables['vrTestSkip'], 'no') From 6b898c2e9948cebe4b9509359e2837867f84bfd1 Mon Sep 17 00:00:00 2001 From: Devjoyti Barman <53661347+Devjoyti-Barman@users.noreply.github.com> Date: Wed, 5 Jul 2023 07:01:26 +0000 Subject: [PATCH 12/13] Removed the space from pipelineName --- 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 290c76f393ded2..5cc6996820d380 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -18,7 +18,7 @@ jobs: - job: VisualRegressionTest_V9 variables: pipelineId: '311' - pipelineName: 'fluent-ui VRT Pipeline v9' + pipelineName: 'fluent-ui_VRT_Pipeline_v9' workspace: clean: all @@ -81,7 +81,7 @@ jobs: - job: VisualRegressionTest_V8 variables: pipelineId: '312' - pipelineName: 'fluent-ui VRT Pipeline v8' + pipelineName: 'fluent-ui_VRT_Pipeline_v8' workspace: clean: all steps: @@ -143,7 +143,7 @@ jobs: - job: VisualRegressionTest_V0 variables: pipelineId: '313' - pipelineName: 'fluent-ui VRT Pipeline v0' + pipelineName: 'fluent-ui_VRT_Pipeline_v0' workspace: clean: all From 17194033965a95a79020a2549c38af8bb1f51dad Mon Sep 17 00:00:00 2001 From: Devjoyti Barman <53661347+Devjoyti-Barman@users.noreply.github.com> Date: Thu, 6 Jul 2023 15:04:56 +0000 Subject: [PATCH 13/13] Run the prettier --- 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 5cc6996820d380..a23040c915ee01 100644 --- a/azure-pipelines.vrt-pr.yml +++ b/azure-pipelines.vrt-pr.yml @@ -72,7 +72,7 @@ jobs: env: API_TOKEN: $(fabric-public-pipeline-access-PAT) GITHUB_API_TOKEN: $(githubRepoStatusPAT) - STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) + 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) @@ -134,7 +134,7 @@ jobs: env: API_TOKEN: $(fabric-public-pipeline-access-PAT) GITHUB_API_TOKEN: $(githubRepoStatusPAT) - STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) + 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) @@ -196,7 +196,7 @@ jobs: env: API_TOKEN: $(fabric-public-pipeline-access-PAT) GITHUB_API_TOKEN: $(githubRepoStatusPAT) - STORAGE_CONNECTION_STRING: $(BLOB-CONNECTION-STRING) + 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)