ci(vrt): install vr-app as part of standard yarn install and remedy n…

…ecessary duplication (#32048)
microsoft · Jul 22, 2024 · 5333195 · 5333195
1 parent ba0b6c5
commit 5333195
Show file tree

Hide file tree

Showing 5 changed files with 431 additions and 325 deletions.
diff --git a/azure-pipelines.vrt-baseline.yml b/azure-pipelines.vrt-baseline.yml
@@ -22,7 +22,6 @@ jobs:
       clean: all
     steps:
       - template: .devops/templates/tools.yml
-      - template: download-vr-cli.yml
       - template: .devops/templates/runpublishvrscreenshot.yml
         parameters:
           fluentVersion: webcomponents
@@ -47,7 +46,7 @@ jobs:
           scriptType: bash
           scriptLocation: 'inlineScript'
           inlineScript: |
-            vr-app run-diff --buildType release --screenshotsDirectory ./screenshots --clientType "FLUENTUI" --locationPrefix 'FluentUI-web-components' --locationPostfix 'vrscreenshotwebcomponents' --pipelineId $(pipelineId)
+            yarn vr-app run-diff --buildType release --screenshotsDirectory ./screenshots --clientType "FLUENTUI" --locationPrefix 'FluentUI-web-components' --locationPostfix 'vrscreenshotwebcomponents' --pipelineId $(pipelineId)
 
   - job: VRToolUpdateBaseline_V9
     variables:
@@ -56,7 +55,6 @@ jobs:
       clean: all
     steps:
       - template: .devops/templates/tools.yml
-      - template: download-vr-cli.yml
       - template: .devops/templates/runpublishvrscreenshot.yml
         parameters:
           fluentVersion: v9
@@ -81,7 +79,7 @@ jobs:
           scriptType: bash
           scriptLocation: 'inlineScript'
           inlineScript: |
-            vr-app run-diff --buildType release --screenshotsDirectory ./screenshots --clientType "FLUENTUI" --locationPrefix 'fluentuiv9' --locationPostfix 'vrscreenshotv9' --pipelineId $(pipelineId)
+            yarn vr-app run-diff --buildType release --screenshotsDirectory ./screenshots --clientType "FLUENTUI" --locationPrefix 'fluentuiv9' --locationPostfix 'vrscreenshotv9' --pipelineId $(pipelineId)
 
   - job: VRToolUpdateBaseline_V8
     variables:
@@ -90,7 +88,6 @@ jobs:
       clean: all
     steps:
       - template: .devops/templates/tools.yml
-      - template: download-vr-cli.yml
       - template: .devops/templates/runpublishvrscreenshot.yml
         parameters:
           fluentVersion: v8
@@ -115,15 +112,14 @@ jobs:
           scriptType: bash
           scriptLocation: 'inlineScript'
           inlineScript: |
-            vr-app run-diff --screenshotsDirectory ./screenshots --buildType release --clientType "FLUENTUI" --locationPrefix 'fluentuiv8' --locationPostfix 'vrscreenshotv8' --pipelineId $(pipelineId)
+            yarn vr-app run-diff --screenshotsDirectory ./screenshots --buildType release --clientType "FLUENTUI" --locationPrefix 'fluentuiv8' --locationPostfix 'vrscreenshotv8' --pipelineId $(pipelineId)
   - job: VRToolUpdateBaseline_V0
     variables:
       pipelineId: '313'
     workspace:
       clean: all
     steps:
       - template: .devops/templates/tools.yml
-      - template: download-vr-cli.yml
       - template: .devops/templates/runpublishvrscreenshot.yml
         parameters:
           fluentVersion: v0
@@ -148,4 +144,4 @@ jobs:
           scriptType: bash
           scriptLocation: 'inlineScript'
           inlineScript: |
-            vr-app run-diff --buildType release --screenshotsDirectory ./screenshots --clientType "FLUENTUI" --locationPrefix 'FluentUI-v0' --locationPostfix 'vrscreenshotv0' --pipelineId $(pipelineId)
+            yarn vr-app run-diff --buildType release --screenshotsDirectory ./screenshots --clientType "FLUENTUI" --locationPrefix 'FluentUI-v0' --locationPostfix 'vrscreenshotv0' --pipelineId $(pipelineId)
diff --git a/azure-pipelines.vrt-pr.yml b/azure-pipelines.vrt-pr.yml
@@ -26,7 +26,6 @@ jobs:
         fetchDepth: 0
 
       - template: .devops/templates/tools.yml
-      - template: download-vr-cli.yml
 
       - bash: |
           postPolicy="true";
@@ -84,8 +83,9 @@ jobs:
           azureSubscription: $(AzureSubscription)
           scriptType: bash
           scriptLocation: 'inlineScript'
+          # 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
           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'
+            yarn 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')
 
   - job: VisualRegressionTest_V9
@@ -101,8 +101,6 @@ jobs:
 
       - 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} )
@@ -159,8 +157,9 @@ jobs:
           azureSubscription: $(AzureSubscription)
           scriptType: bash
           scriptLocation: 'inlineScript'
+          # 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
           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'
+            yarn 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
@@ -175,8 +174,6 @@ jobs:
 
       - 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})
@@ -233,8 +230,9 @@ jobs:
           azureSubscription: $(AzureSubscription)
           scriptType: bash
           scriptLocation: 'inlineScript'
+          # 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
           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'
+            yarn 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
@@ -250,8 +248,6 @@ jobs:
 
       - 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})
@@ -307,6 +303,7 @@ jobs:
           azureSubscription: $(AzureSubscription)
           scriptType: bash
           scriptLocation: 'inlineScript'
+          # 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
           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'
+            yarn 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')
diff --git a/download-vr-cli.yml b/download-vr-cli.yml
diff --git a/package.json b/package.json
@@ -107,13 +107,13 @@
     "@react-native/babel-preset": "0.73.21",
     "@rnx-kit/eslint-plugin": "0.4.2",
     "@rollup/plugin-node-resolve": "13.3.0",
-    "@storybook/addons": "6.5.15",
     "@storybook/addon-a11y": "6.5.15",
     "@storybook/addon-actions": "6.5.15",
     "@storybook/addon-docs": "6.5.15",
     "@storybook/addon-essentials": "6.5.15",
     "@storybook/addon-knobs": "6.4.0",
     "@storybook/addon-links": "6.5.15",
+    "@storybook/addons": "6.5.15",
     "@storybook/builder-webpack5": "6.5.15",
     "@storybook/client-api": "6.5.15",
     "@storybook/components": "6.5.15",
@@ -303,6 +303,7 @@
     "react-window": "^1.8.6",
     "read-pkg-up": "7.0.1",
     "replace-in-file": "6.1.0",
+    "request": "2.88.2",
     "request-promise-native": "1.0.9",
     "resolve": "1.22.8",
     "riceburn": "1.3.1",
@@ -336,10 +337,10 @@
     "ts-node": "10.9.1",
     "tsconfig-paths": "4.2.0",
     "tsconfig-paths-webpack-plugin": "4.1.0",
-    "tslib": "2.5.0",
+    "tslib": "2.6.3",
     "typescript": "5.0.4",
     "vinyl": "2.2.0",
-    "vrscreenshotdiff": "0.0.17",
+    "vr-approval-cli": "0.4.4",
     "webpack": "5.90.3",
     "webpack-bundle-analyzer": "4.10.1",
     "webpack-cli": "5.1.4",