diff --git a/Composer/packages/integration-tests/package.json b/Composer/packages/integration-tests/package.json index 05ae3e84d1..357381a7f8 100644 --- a/Composer/packages/integration-tests/package.json +++ b/Composer/packages/integration-tests/package.json @@ -8,7 +8,8 @@ "open": "cypress open", "clean": "node scripts/clean-e2e.js", "clean-all": "node scripts/clean-e2e.js --all", - "lint": "eslint --quiet cypress" + "lint": "eslint --quiet cypress", + "cypress": "cypress run" }, "keywords": [], "author": "", diff --git a/Composer/packages/integration-tests/scripts/e2e-ci.sh b/Composer/packages/integration-tests/scripts/e2e-ci.sh index 845af742ae..b97acd22e2 100755 --- a/Composer/packages/integration-tests/scripts/e2e-ci.sh +++ b/Composer/packages/integration-tests/scripts/e2e-ci.sh @@ -10,7 +10,7 @@ yarn start >> e2e.log 2>&1 & SERVER_PID=$! cd packages/integration-tests -npx cypress run "$@" +yarn run cypress -- "$@" EXIT_CODE=$? # kill server process diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 574159b77a..c9fe9d8467 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -88,28 +88,6 @@ jobs: pool: vmImage: ubuntu-latest steps: - - powershell: | - # Gin up imitation v1 yarn.lock files to aid Component Governance Detection analysis. The method: - # Find v3 yarn-berry.lock files. From each, generate a yarn.lock file, deleting all occurrences of 'npm:'. - # This allows CG to work with yarn v3. - $find = 'npm:'; - $replace = ''; - - Get-ChildItem -Recurse -Path '**/yarn-berry.lock' | % { - $source = $_.FullName; - $dest = $_.DirectoryName + "/yarn.lock" - Write-Host $source; - Write-Host $dest; - Copy-Item -Path $source -Destination $dest -Force - - $content = Get-Content -Raw $dest; - $content -Replace "$find", "$replace" | Set-Content $dest; - - '--------------------'; get-content $dest; '===================='; - } - displayName: Generate "yarn.lock" files for CG Detection - continueOnError: true - - task: ComponentGovernanceComponentDetection@0 displayName: Component Detection inputs: @@ -117,4 +95,3 @@ jobs: verbosity: "Verbose" alertWarningLevel: "High" failOnAlert: true -