From 201734d4da9f607bd8e3a07dc808695974fe225c Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Mon, 10 Jun 2019 15:17:11 -0700 Subject: [PATCH 01/33] Take multiple targets. --- .../templates/jobs/archetype-sdk-client.yml | 71 ++++++------------- sdk/core/ci.yml | 2 +- 2 files changed, 21 insertions(+), 52 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index f7288ca48f7f..97408ee134a3 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -20,21 +20,12 @@ jobs: node common/scripts/install-run-rush.js install displayName: "Install dependencies" - - ${{ if eq(parameters.PackageName,'')}}: - - script: | - node common/scripts/install-run-rush.js build --verbose - displayName: "Build libraries" - - script: | - node common/scripts/install-run-rush.js pack --verbose - displayName: "Pack libraries" - - - ${{ if ne(parameters.PackageName,'')}}: - - script: | - node common/scripts/install-run-rush.js build --verbose --to ${{parameters.PackageName}} - displayName: "Build libraries" - - script: | - node common/scripts/install-run-rush.js pack --verbose --to ${{parameters.PackageName}} - displayName: "Pack libraries" + - script: | + node common/scripts/install-run-rush.js build --verbose ${{parameters.PackageTargets}} + displayName: "Build libraries" + - script: | + node common/scripts/install-run-rush.js pack --verbose ${{parameters.PackageTargets}} + displayName: "Pack libraries" - task: CopyFiles@2 inputs: @@ -74,19 +65,11 @@ jobs: ward scan -d $(Build.SourcesDirectory) -c $(Build.SourcesDirectory)/.docsettings.yml displayName: "Verify Readmes" - - ${{ if eq(parameters.PackageName,'')}}: - - script: | - node common/scripts/install-run-rush.js install - node common/scripts/install-run-rush.js audit - condition: and(succeeded(), eq(variables['RunNpmAudit'], 'true')) - displayName: "Audit packages" - - - ${{ if ne(parameters.PackageName,'')}}: - - script: | - node common/scripts/install-run-rush.js install - node common/scripts/install-run-rush.js audit --to ${{parameters.PackageName}} - condition: and(succeeded(), eq(variables['RunNpmAudit'], 'true')) - displayName: "Audit packages" + - script: | + node common/scripts/install-run-rush.js install + node common/scripts/install-run-rush.js audit ${{parameters.PackageTargets}} + condition: and(succeeded(), eq(variables['RunNpmAudit'], 'true')) + displayName: "Audit packages" - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 # ComponentGovernance is currently unable to run on pull requests of public projects. Running on non-PR @@ -148,29 +131,15 @@ jobs: node common/scripts/install-run-rush.js install displayName: "Install dependencies" - # If there is no package name, then don't use the --to option. - - ${{ if eq(parameters.PackageName,'')}}: - - script: | - node common/scripts/install-run-rush.js build --verbose - displayName: "Build libraries" - - script: | - node common/scripts/install-run-rush.js build:test --verbose - displayName: "Build test assets" - - script: | - node common/scripts/install-run-rush.js unit-test --verbose - displayName: "Test libraries" - - # On the other hand, if there is a PackageName, supply the --to option. - - ${{ if ne(parameters.PackageName,'')}}: - - script: | - node common/scripts/install-run-rush.js build --verbose --to ${{parameters.PackageName}} - displayName: "Build libraries" - - script: | - node common/scripts/install-run-rush.js build:test --verbose --to ${{parameters.PackageName}} - displayName: "Build test assets" - - script: | - node common/scripts/install-run-rush.js unit-test --verbose --to ${{parameters.PackageName}} - displayName: "Test libraries" + - script: | + node common/scripts/install-run-rush.js build --verbose ${{parameters.PackageTargets}} + displayName: "Build libraries" + - script: | + node common/scripts/install-run-rush.js build:test --verbose ${{parameters.PackageTargets}} + displayName: "Build test assets" + - script: | + node common/scripts/install-run-rush.js unit-test --verbose ${{parameters.PackageTargets}} + displayName: "Test libraries" - task: PublishTestResults@2 inputs: diff --git a/sdk/core/ci.yml b/sdk/core/ci.yml index 0ea91f0e8b99..b61aecb4f3dd 100644 --- a/sdk/core/ci.yml +++ b/sdk/core/ci.yml @@ -20,4 +20,4 @@ pr: jobs: - template: ../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - PackageName: "@azure/core-http" + PackageTargets: '--to "@azure/core-http" --to "@azure/core-aborter" --to "@azure/amqp-common"' From 566970716fd3ff8614c996c35cc30f373c5f6939 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Mon, 10 Jun 2019 15:38:26 -0700 Subject: [PATCH 02/33] Starting to build out package selection script. --- sdk/core/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/core/ci.yml b/sdk/core/ci.yml index b61aecb4f3dd..178fc8c45363 100644 --- a/sdk/core/ci.yml +++ b/sdk/core/ci.yml @@ -20,4 +20,4 @@ pr: jobs: - template: ../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - PackageTargets: '--to "@azure/core-http" --to "@azure/core-aborter" --to "@azure/amqp-common"' + ServiceDirectory: sdk/core From 7764bc79cc411c476b2592942da7e45c3fa52611 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 09:26:40 -0700 Subject: [PATCH 03/33] Added select packages step. --- common/scripts/select-packages.js | 14 ++++++++++++++ .../templates/jobs/archetype-sdk-client.yml | 16 ++++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 common/scripts/select-packages.js diff --git a/common/scripts/select-packages.js b/common/scripts/select-packages.js new file mode 100644 index 000000000000..ca5bfb462fa3 --- /dev/null +++ b/common/scripts/select-packages.js @@ -0,0 +1,14 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. +// See the @microsoft/rush package's LICENSE file for license information. + +// This script searches for package.json files recursively under a given path +// excluding packages under a node_modules folder and opens them to determine +// whether they contain a "sdk-archetype" field with the value of "client". +// +// If they do, then the package name is recorded and then after all package.json files +// have been scanned a single string is output using the Azure Pipelines Commands special +// syntax which creates a variable for use within a later stage of the pipeine. + +console.log( + '##vso[task.setvariable variable=GeneratedPackageTargets;]--to "@azure/core-http" --to "@azure/amqp-common" --to "@azure/core-aborter"' +); diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 97408ee134a3..06ea8e836082 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -21,10 +21,14 @@ jobs: displayName: "Install dependencies" - script: | - node common/scripts/install-run-rush.js build --verbose ${{parameters.PackageTargets}} + node common/scripts/select-packages.js ${{parameters.ServiceDirectory}} + displayName: "Selecting packages to build" + + - script: | + node common/scripts/install-run-rush.js build --verbose ${{parameters.GeneratedPackageTargets}} displayName: "Build libraries" - script: | - node common/scripts/install-run-rush.js pack --verbose ${{parameters.PackageTargets}} + node common/scripts/install-run-rush.js pack --verbose ${{parameters.GeneratedPackageTargets}} displayName: "Pack libraries" - task: CopyFiles@2 @@ -67,7 +71,7 @@ jobs: - script: | node common/scripts/install-run-rush.js install - node common/scripts/install-run-rush.js audit ${{parameters.PackageTargets}} + node common/scripts/install-run-rush.js audit ${{parameters.GeneratedPackageTargets}} condition: and(succeeded(), eq(variables['RunNpmAudit'], 'true')) displayName: "Audit packages" @@ -132,13 +136,13 @@ jobs: displayName: "Install dependencies" - script: | - node common/scripts/install-run-rush.js build --verbose ${{parameters.PackageTargets}} + node common/scripts/install-run-rush.js build --verbose ${{parameters.GeneratedPackageTargets}} displayName: "Build libraries" - script: | - node common/scripts/install-run-rush.js build:test --verbose ${{parameters.PackageTargets}} + node common/scripts/install-run-rush.js build:test --verbose ${{parameters.GeneratedPackageTargets}} displayName: "Build test assets" - script: | - node common/scripts/install-run-rush.js unit-test --verbose ${{parameters.PackageTargets}} + node common/scripts/install-run-rush.js unit-test --verbose ${{parameters.GeneratedPackageTargets}} displayName: "Test libraries" - task: PublishTestResults@2 From ca5c01e27c6dea2b396c02a620ae468eeeccd642 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 09:36:07 -0700 Subject: [PATCH 04/33] Changed to variable syntax for generated package targets. --- .../templates/jobs/archetype-sdk-client.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 06ea8e836082..160b916cfa2a 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -25,10 +25,10 @@ jobs: displayName: "Selecting packages to build" - script: | - node common/scripts/install-run-rush.js build --verbose ${{parameters.GeneratedPackageTargets}} + node common/scripts/install-run-rush.js build --verbose $(GeneratedPackageTargets) displayName: "Build libraries" - script: | - node common/scripts/install-run-rush.js pack --verbose ${{parameters.GeneratedPackageTargets}} + node common/scripts/install-run-rush.js pack --verbose $(GeneratedPackageTargets) displayName: "Pack libraries" - task: CopyFiles@2 @@ -71,7 +71,7 @@ jobs: - script: | node common/scripts/install-run-rush.js install - node common/scripts/install-run-rush.js audit ${{parameters.GeneratedPackageTargets}} + node common/scripts/install-run-rush.js audit $(GeneratedPackageTargets) condition: and(succeeded(), eq(variables['RunNpmAudit'], 'true')) displayName: "Audit packages" @@ -136,13 +136,13 @@ jobs: displayName: "Install dependencies" - script: | - node common/scripts/install-run-rush.js build --verbose ${{parameters.GeneratedPackageTargets}} + node common/scripts/install-run-rush.js build --verbose $(GeneratedPackageTargets) displayName: "Build libraries" - script: | - node common/scripts/install-run-rush.js build:test --verbose ${{parameters.GeneratedPackageTargets}} + node common/scripts/install-run-rush.js build:test --verbose $(GeneratedPackageTargets) displayName: "Build test assets" - script: | - node common/scripts/install-run-rush.js unit-test --verbose ${{parameters.GeneratedPackageTargets}} + node common/scripts/install-run-rush.js unit-test --verbose $(GeneratedPackageTargets) displayName: "Test libraries" - task: PublishTestResults@2 From f2d04bd7b97f7d352f7884abe1cd300d98cd15cd Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 09:48:29 -0700 Subject: [PATCH 05/33] Quick hack to get a clean build. --- common/scripts/select-packages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/scripts/select-packages.js b/common/scripts/select-packages.js index ca5bfb462fa3..a6ea3a6a032b 100644 --- a/common/scripts/select-packages.js +++ b/common/scripts/select-packages.js @@ -10,5 +10,5 @@ // syntax which creates a variable for use within a later stage of the pipeine. console.log( - '##vso[task.setvariable variable=GeneratedPackageTargets;]--to "@azure/core-http" --to "@azure/amqp-common" --to "@azure/core-aborter"' + '##vso[task.setvariable variable=GeneratedPackageTargets;]--to "@azure/core-http" --to "@azure/amqp-common" --to "@azure/abort-controller"' ); From 18e65a4dea09851543dbc5fe9d63895d332d0f30 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 11:12:18 -0700 Subject: [PATCH 06/33] Setting up select-packages tool. --- .../templates/jobs/archetype-sdk-client.yml | 16 +++-- .../templates/steps/select-packages.yml | 6 ++ eng/tools/select-packages/index.js | 58 +++++++++++++++++++ eng/tools/select-packages/package.json | 14 +++++ sdk/core/abort-controller/package.json | 1 + sdk/core/amqp-common/package.json | 1 + sdk/core/core-http/package.json | 1 + 7 files changed, 93 insertions(+), 4 deletions(-) create mode 100644 eng/pipelines/templates/steps/select-packages.yml create mode 100644 eng/tools/select-packages/index.js create mode 100644 eng/tools/select-packages/package.json diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 160b916cfa2a..44a4df172d65 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -16,14 +16,14 @@ jobs: npm install -g npm@6.9.0 displayName: "Install npm version 6.9.0" + - tempate: ../steps/select-packages.yml + parameters: + ServiceDirectory: ${{parameters.ServiceDirectory}} + - script: | node common/scripts/install-run-rush.js install displayName: "Install dependencies" - - script: | - node common/scripts/select-packages.js ${{parameters.ServiceDirectory}} - displayName: "Selecting packages to build" - - script: | node common/scripts/install-run-rush.js build --verbose $(GeneratedPackageTargets) displayName: "Build libraries" @@ -63,6 +63,10 @@ jobs: versionSpec: "$(NodeVersion)" displayName: "Install Node.js $(NodeVersion)" + - tempate: ../steps/select-packages.yml + parameters: + ServiceDirectory: ${{parameters.ServiceDirectory}} + - script: | pip install setuptools wheel pip install doc-warden @@ -131,6 +135,10 @@ jobs: versionSpec: "$(NodeVersion)" displayName: "Install Node.js $(NodeVersion)" + - tempate: ../steps/select-packages.yml + parameters: + ServiceDirectory: ${{parameters.ServiceDirectory}} + - script: | node common/scripts/install-run-rush.js install displayName: "Install dependencies" diff --git a/eng/pipelines/templates/steps/select-packages.yml b/eng/pipelines/templates/steps/select-packages.yml new file mode 100644 index 000000000000..1f0168bdb56b --- /dev/null +++ b/eng/pipelines/templates/steps/select-packages.yml @@ -0,0 +1,6 @@ +steps: + - script: | + npm install + npm run select-packages ${{parameters.ServiceDirectory}} + workingDirectory: $(System.DefaultWorkingDirectory)/eng/tools/select-packages + displayName: "Selecting packages to build" diff --git a/eng/tools/select-packages/index.js b/eng/tools/select-packages/index.js new file mode 100644 index 000000000000..464ab019e972 --- /dev/null +++ b/eng/tools/select-packages/index.js @@ -0,0 +1,58 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. +// See the @microsoft/rush package's LICENSE file for license information. + +// This script searches for package.json files recursively under a given path +// excluding packages under a node_modules folder and opens them to determine +// whether they contain a "sdk-archetype" field with the value of "client". +// +// If they do, then the package name is recorded and then after all package.json files +// have been scanned a single string is output using the Azure Pipelines Commands special +// syntax which creates a variable for use within a later stage of the pipeine. +var glob = require("glob"); + +let logLineCounter = 0; +const log = message => { + console.log(`select-packages(${logLineCounter++}): ${message}`); +}; + +log(`Working directory is "${process.cwd()}".`); + +let serviceDirectory = process.argv[2]; +log(`Specified service directory is "${serviceDirectory}".`); + +// This code assumes that in the service directory, packages that we want to publish +// exist only in directories that are immediate children of the service directory. +glob(`${serviceDirectory}/*/package.json`, (err, files) => { + let packageTargets = ""; + + if (files) { + log(`Found ${files.length} packages under service directory.`); + + for (let fileIndex in files) { + log(`Processing package file ${fileIndex} at "${files[fileIndex]}"`); + let packageContents = require(files[fileIndex]); + + log( + `Package name for package ${fileIndex} is "${packageContents.name}".` + ); + + if (packageContents.isDataPlane) { + log(`Package "${packageContents.name}" is a data-plane library.`); + packageTargets += `--to "${packageContents.name}" `; + } else { + log(`Package "${packageContents.name}" is NOT a data-plane library.`); + } + } + + log( + `Finished processing packages. Emitting variable using: ${packageTargets}` + ); + + // Can't use regular logging here because the pattern for Azure Pipelines requires ##vso to be the first chars. + console.log( + '##vso[task.setvariable variable=GeneratedPackageTargets;]--to "@azure/core-http" --to "@azure/amqp-common" --to "@azure/abort-controller"' + ); + } else { + log("Did not find any packages under service directory."); + } +}); diff --git a/eng/tools/select-packages/package.json b/eng/tools/select-packages/package.json new file mode 100644 index 000000000000..63ee8ed67557 --- /dev/null +++ b/eng/tools/select-packages/package.json @@ -0,0 +1,14 @@ +{ + "name": "select-packages", + "version": "1.0.0", + "description": "", + "main": "index.js", + "scripts": { + "select-packages": "node index.js" + }, + "author": "", + "license": "ISC", + "devDependencies": { + "glob": "^7.1.4" + } +} diff --git a/sdk/core/abort-controller/package.json b/sdk/core/abort-controller/package.json index cd036e132d95..e8365f7303f5 100644 --- a/sdk/core/abort-controller/package.json +++ b/sdk/core/abort-controller/package.json @@ -1,5 +1,6 @@ { "name": "@azure/abort-controller", + "isDataPlane": true, "version": "1.0.0", "description": "Microsoft Azure SDK for JavaScript - Aborter", "main": "./dist/index.js", diff --git a/sdk/core/amqp-common/package.json b/sdk/core/amqp-common/package.json index a3e80954a688..b7fd016f7143 100644 --- a/sdk/core/amqp-common/package.json +++ b/sdk/core/amqp-common/package.json @@ -1,5 +1,6 @@ { "name": "@azure/amqp-common", + "isDataPlane": true, "version": "1.0.0-preview.5", "description": "Common library for amqp based azure sdks like @azure/event-hubs.", "author": "Microsoft Corporation", diff --git a/sdk/core/core-http/package.json b/sdk/core/core-http/package.json index 94ad96b3de02..e0d8f28767c7 100644 --- a/sdk/core/core-http/package.json +++ b/sdk/core/core-http/package.json @@ -1,5 +1,6 @@ { "name": "@azure/core-http", + "isDataPlane": true, "author": { "name": "Microsoft Corporation", "email": "azsdkteam@microsoft.com", From ee69cf2baa31c9b9732fae338d4da5f5d769a9fc Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 11:15:00 -0700 Subject: [PATCH 07/33] Fixed template. --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 44a4df172d65..818753f70821 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -16,7 +16,7 @@ jobs: npm install -g npm@6.9.0 displayName: "Install npm version 6.9.0" - - tempate: ../steps/select-packages.yml + - template: ../steps/select-packages.yml parameters: ServiceDirectory: ${{parameters.ServiceDirectory}} @@ -63,7 +63,7 @@ jobs: versionSpec: "$(NodeVersion)" displayName: "Install Node.js $(NodeVersion)" - - tempate: ../steps/select-packages.yml + - template: ../steps/select-packages.yml parameters: ServiceDirectory: ${{parameters.ServiceDirectory}} @@ -135,7 +135,7 @@ jobs: versionSpec: "$(NodeVersion)" displayName: "Install Node.js $(NodeVersion)" - - tempate: ../steps/select-packages.yml + - template: ../steps/select-packages.yml parameters: ServiceDirectory: ${{parameters.ServiceDirectory}} From 5c3fd0e51d9c5f00911e887c441362a7a452361f Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 11:18:42 -0700 Subject: [PATCH 08/33] Fixed path issue in template. --- eng/pipelines/templates/steps/select-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/steps/select-packages.yml b/eng/pipelines/templates/steps/select-packages.yml index 1f0168bdb56b..59390f89f227 100644 --- a/eng/pipelines/templates/steps/select-packages.yml +++ b/eng/pipelines/templates/steps/select-packages.yml @@ -1,6 +1,6 @@ steps: - script: | npm install - npm run select-packages ${{parameters.ServiceDirectory}} + npm run select-packages $(System.DefaultWorkingDirectory)/${{parameters.ServiceDirectory}} workingDirectory: $(System.DefaultWorkingDirectory)/eng/tools/select-packages displayName: "Selecting packages to build" From 211794b7cb723152cf84e0a5d85b7afa6773b8d8 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 11:44:13 -0700 Subject: [PATCH 09/33] Debugging build failures. --- .docsettings.yml | 3 ++- eng/pipelines/templates/steps/select-packages.yml | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.docsettings.yml b/.docsettings.yml index c51210f29b55..78faa60f7563 100644 --- a/.docsettings.yml +++ b/.docsettings.yml @@ -1,5 +1,6 @@ omitted_paths: - documentation/ServicePrincipal/* + - eng/tools/select-packages - "sdk/*/arm-*" - "sdk/cognitiveservices/*" language: js @@ -62,7 +63,7 @@ known_content_issues: - ["sdk/eventgrid/eventgrid/README.md", "#1583"] - ["sdk/core/abort-controller/README.md", "#1583"] - ["sdk/core/core-http/README.md", "#1583"] - - ['sdk/identity/identity/README.md', '#1583'] + - ["sdk/identity/identity/README.md", "#1583"] - ["sdk/cosmosdb/cosmos/README.md", "#1583"] - ["sdk/cosmosdb/cosmos/src/test/readme.md", "#1583"] - ["sdk/cosmosdb/cosmos/samples/readme.md", "#1583"] diff --git a/eng/pipelines/templates/steps/select-packages.yml b/eng/pipelines/templates/steps/select-packages.yml index 59390f89f227..97144076510a 100644 --- a/eng/pipelines/templates/steps/select-packages.yml +++ b/eng/pipelines/templates/steps/select-packages.yml @@ -1,6 +1,8 @@ steps: - script: | + echo Hello, World! npm install npm run select-packages $(System.DefaultWorkingDirectory)/${{parameters.ServiceDirectory}} + echo Goodbye, World! workingDirectory: $(System.DefaultWorkingDirectory)/eng/tools/select-packages displayName: "Selecting packages to build" From dff14de605be967d47352a08de4985c98a7d2231 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 11:50:08 -0700 Subject: [PATCH 10/33] Actually emit targets instead of hardcoding! --- eng/tools/select-packages/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/tools/select-packages/index.js b/eng/tools/select-packages/index.js index 464ab019e972..b939a1d882b4 100644 --- a/eng/tools/select-packages/index.js +++ b/eng/tools/select-packages/index.js @@ -50,7 +50,7 @@ glob(`${serviceDirectory}/*/package.json`, (err, files) => { // Can't use regular logging here because the pattern for Azure Pipelines requires ##vso to be the first chars. console.log( - '##vso[task.setvariable variable=GeneratedPackageTargets;]--to "@azure/core-http" --to "@azure/amqp-common" --to "@azure/abort-controller"' + `##vso[task.setvariable variable=GeneratedPackageTargets;]${packageTargets}` ); } else { log("Did not find any packages under service directory."); From 003d509cbac752ee65959b0210764908be011fc4 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 11:51:09 -0700 Subject: [PATCH 11/33] Exclude everything under eng/tools/select-packages. --- .docsettings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docsettings.yml b/.docsettings.yml index 78faa60f7563..410ad0235a37 100644 --- a/.docsettings.yml +++ b/.docsettings.yml @@ -1,6 +1,6 @@ omitted_paths: - documentation/ServicePrincipal/* - - eng/tools/select-packages + - eng/tools/select-packages/** - "sdk/*/arm-*" - "sdk/cognitiveservices/*" language: js From ac990f73b2cec17d9d8e84b22d7ead8af3fe1236 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 12:40:57 -0700 Subject: [PATCH 12/33] Flipping to bash. --- eng/pipelines/templates/steps/select-packages.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/eng/pipelines/templates/steps/select-packages.yml b/eng/pipelines/templates/steps/select-packages.yml index 97144076510a..730aa7de4343 100644 --- a/eng/pipelines/templates/steps/select-packages.yml +++ b/eng/pipelines/templates/steps/select-packages.yml @@ -1,8 +1,6 @@ steps: - - script: | - echo Hello, World! + - bash: | npm install npm run select-packages $(System.DefaultWorkingDirectory)/${{parameters.ServiceDirectory}} - echo Goodbye, World! workingDirectory: $(System.DefaultWorkingDirectory)/eng/tools/select-packages displayName: "Selecting packages to build" From 4ff1f07eff55009342e3e9163b2b43c669ef0e0a Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 12:46:30 -0700 Subject: [PATCH 13/33] I hate path differences :) --- eng/pipelines/templates/steps/select-packages.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/steps/select-packages.yml b/eng/pipelines/templates/steps/select-packages.yml index 730aa7de4343..57eb7acb4886 100644 --- a/eng/pipelines/templates/steps/select-packages.yml +++ b/eng/pipelines/templates/steps/select-packages.yml @@ -1,6 +1,6 @@ steps: - - bash: | + - script: | + cd $(System.DefaultWorkingDirectory)/eng/tools/select-packages npm install npm run select-packages $(System.DefaultWorkingDirectory)/${{parameters.ServiceDirectory}} - workingDirectory: $(System.DefaultWorkingDirectory)/eng/tools/select-packages displayName: "Selecting packages to build" From db8f609f7481c86a084f69202fd56b9aae77af30 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 13:00:26 -0700 Subject: [PATCH 14/33] Trying to come up with cleanest path approach. --- eng/pipelines/templates/steps/select-packages.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/steps/select-packages.yml b/eng/pipelines/templates/steps/select-packages.yml index 57eb7acb4886..d9dbd7321e39 100644 --- a/eng/pipelines/templates/steps/select-packages.yml +++ b/eng/pipelines/templates/steps/select-packages.yml @@ -1,6 +1,13 @@ steps: - script: | - cd $(System.DefaultWorkingDirectory)/eng/tools/select-packages npm install npm run select-packages $(System.DefaultWorkingDirectory)/${{parameters.ServiceDirectory}} - displayName: "Selecting packages to build" + workingDirectory: $(System.DefaultWorkingDirectory)/eng/tools/select-packages + displayName: "Selecting packages to build (Linux & macOS)" + condition: ne(variables['Agent.OS'], 'Windows_NT') + - script: | + npm install + npm run select-packages $(System.DefaultWorkingDirectory)\${{parameters.ServiceDirectory}} + workingDirectory: $(System.DefaultWorkingDirectory)\eng\tools\select-packages + displayName: "Selecting packages to build (Windows)" + condition: eq(variables['Agent.OS'], 'Windows_NT') From 281055c32c6fea6d2f56e6dcaf937b65a818c009 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 13:04:51 -0700 Subject: [PATCH 15/33] Just make it work :) --- .../templates/jobs/archetype-sdk-client.yml | 15 +++++++-------- eng/pipelines/templates/steps/select-packages.yml | 7 ------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 818753f70821..b26c7e923dfb 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -46,6 +46,10 @@ jobs: targetPath: $(Build.ArtifactStagingDirectory) - job: "Analyze" + + depends: + - Build + variables: - template: ../variables/globals.yml @@ -63,10 +67,6 @@ jobs: versionSpec: "$(NodeVersion)" displayName: "Install Node.js $(NodeVersion)" - - template: ../steps/select-packages.yml - parameters: - ServiceDirectory: ${{parameters.ServiceDirectory}} - - script: | pip install setuptools wheel pip install doc-warden @@ -87,6 +87,9 @@ jobs: - job: "Test" + depends: + - Build + strategy: matrix: Linux_Node8: @@ -135,10 +138,6 @@ jobs: versionSpec: "$(NodeVersion)" displayName: "Install Node.js $(NodeVersion)" - - template: ../steps/select-packages.yml - parameters: - ServiceDirectory: ${{parameters.ServiceDirectory}} - - script: | node common/scripts/install-run-rush.js install displayName: "Install dependencies" diff --git a/eng/pipelines/templates/steps/select-packages.yml b/eng/pipelines/templates/steps/select-packages.yml index d9dbd7321e39..b1fe7f2a9068 100644 --- a/eng/pipelines/templates/steps/select-packages.yml +++ b/eng/pipelines/templates/steps/select-packages.yml @@ -4,10 +4,3 @@ steps: npm run select-packages $(System.DefaultWorkingDirectory)/${{parameters.ServiceDirectory}} workingDirectory: $(System.DefaultWorkingDirectory)/eng/tools/select-packages displayName: "Selecting packages to build (Linux & macOS)" - condition: ne(variables['Agent.OS'], 'Windows_NT') - - script: | - npm install - npm run select-packages $(System.DefaultWorkingDirectory)\${{parameters.ServiceDirectory}} - workingDirectory: $(System.DefaultWorkingDirectory)\eng\tools\select-packages - displayName: "Selecting packages to build (Windows)" - condition: eq(variables['Agent.OS'], 'Windows_NT') From 293d94c1cd511a818a4197501baad93b0bef96af Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 13:07:06 -0700 Subject: [PATCH 16/33] Incorrect YAML statement. --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index b26c7e923dfb..4a38c1c3643c 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -47,7 +47,7 @@ jobs: - job: "Analyze" - depends: + dependsOn: - Build variables: @@ -87,7 +87,7 @@ jobs: - job: "Test" - depends: + dependsOn: - Build strategy: From 5f198aa96e2f782c4a3115e4d922c5fc6c02974c Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 13:21:03 -0700 Subject: [PATCH 17/33] Trying different approach to get variables. --- .../templates/jobs/archetype-sdk-client.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 4a38c1c3643c..742afcfdde54 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -25,10 +25,10 @@ jobs: displayName: "Install dependencies" - script: | - node common/scripts/install-run-rush.js build --verbose $(GeneratedPackageTargets) + node common/scripts/install-run-rush.js build --verbose $[variables('GeneratedPackageTargets')] displayName: "Build libraries" - script: | - node common/scripts/install-run-rush.js pack --verbose $(GeneratedPackageTargets) + node common/scripts/install-run-rush.js pack --verbose $[variables('GeneratedPackageTargets')] displayName: "Pack libraries" - task: CopyFiles@2 @@ -75,7 +75,7 @@ jobs: - script: | node common/scripts/install-run-rush.js install - node common/scripts/install-run-rush.js audit $(GeneratedPackageTargets) + node common/scripts/install-run-rush.js audit $[variables('GeneratedPackageTargets')] condition: and(succeeded(), eq(variables['RunNpmAudit'], 'true')) displayName: "Audit packages" @@ -143,13 +143,13 @@ jobs: displayName: "Install dependencies" - script: | - node common/scripts/install-run-rush.js build --verbose $(GeneratedPackageTargets) + node common/scripts/install-run-rush.js build --verbose $[variables('GeneratedPackageTargets')] displayName: "Build libraries" - script: | - node common/scripts/install-run-rush.js build:test --verbose $(GeneratedPackageTargets) + node common/scripts/install-run-rush.js build:test --verbose $[variables('GeneratedPackageTargets')] displayName: "Build test assets" - script: | - node common/scripts/install-run-rush.js unit-test --verbose $(GeneratedPackageTargets) + node common/scripts/install-run-rush.js unit-test --verbose $[variables('GeneratedPackageTargets')] displayName: "Test libraries" - task: PublishTestResults@2 From 1dda33ca698c07642003153beff362226b42b2d0 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 13:56:51 -0700 Subject: [PATCH 18/33] Revert variables usage. --- .../templates/jobs/archetype-sdk-client.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 742afcfdde54..4a38c1c3643c 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -25,10 +25,10 @@ jobs: displayName: "Install dependencies" - script: | - node common/scripts/install-run-rush.js build --verbose $[variables('GeneratedPackageTargets')] + node common/scripts/install-run-rush.js build --verbose $(GeneratedPackageTargets) displayName: "Build libraries" - script: | - node common/scripts/install-run-rush.js pack --verbose $[variables('GeneratedPackageTargets')] + node common/scripts/install-run-rush.js pack --verbose $(GeneratedPackageTargets) displayName: "Pack libraries" - task: CopyFiles@2 @@ -75,7 +75,7 @@ jobs: - script: | node common/scripts/install-run-rush.js install - node common/scripts/install-run-rush.js audit $[variables('GeneratedPackageTargets')] + node common/scripts/install-run-rush.js audit $(GeneratedPackageTargets) condition: and(succeeded(), eq(variables['RunNpmAudit'], 'true')) displayName: "Audit packages" @@ -143,13 +143,13 @@ jobs: displayName: "Install dependencies" - script: | - node common/scripts/install-run-rush.js build --verbose $[variables('GeneratedPackageTargets')] + node common/scripts/install-run-rush.js build --verbose $(GeneratedPackageTargets) displayName: "Build libraries" - script: | - node common/scripts/install-run-rush.js build:test --verbose $[variables('GeneratedPackageTargets')] + node common/scripts/install-run-rush.js build:test --verbose $(GeneratedPackageTargets) displayName: "Build test assets" - script: | - node common/scripts/install-run-rush.js unit-test --verbose $[variables('GeneratedPackageTargets')] + node common/scripts/install-run-rush.js unit-test --verbose $(GeneratedPackageTargets) displayName: "Test libraries" - task: PublishTestResults@2 From 803025372fdd505e04fd0b0499a2ad7df971c64a Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 15:13:03 -0700 Subject: [PATCH 19/33] Hoisting variables across jobs. --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 5 +++++ eng/pipelines/templates/steps/select-packages.yml | 1 + eng/tools/select-packages/index.js | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 4a38c1c3643c..d1b0c8446d5b 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -52,6 +52,8 @@ jobs: variables: - template: ../variables/globals.yml + - name: GeneratedPackageTargets + value: $[dependencies.Build.outputs['SelectPackages.GeneratedPackageTargets']] pool: vmImage: "ubuntu-16.04" @@ -132,6 +134,9 @@ jobs: pool: vmImage: "$(OSVmImage)" + variables: + GeneratedPackageTargets: $[dependencies.Build.outputs['SelectPackages.GeneratedPackageTargets']] + steps: - task: NodeTool@0 inputs: diff --git a/eng/pipelines/templates/steps/select-packages.yml b/eng/pipelines/templates/steps/select-packages.yml index b1fe7f2a9068..5c00aad50227 100644 --- a/eng/pipelines/templates/steps/select-packages.yml +++ b/eng/pipelines/templates/steps/select-packages.yml @@ -3,4 +3,5 @@ steps: npm install npm run select-packages $(System.DefaultWorkingDirectory)/${{parameters.ServiceDirectory}} workingDirectory: $(System.DefaultWorkingDirectory)/eng/tools/select-packages + name: SelectPackages displayName: "Selecting packages to build (Linux & macOS)" diff --git a/eng/tools/select-packages/index.js b/eng/tools/select-packages/index.js index b939a1d882b4..066d2b04542b 100644 --- a/eng/tools/select-packages/index.js +++ b/eng/tools/select-packages/index.js @@ -50,7 +50,7 @@ glob(`${serviceDirectory}/*/package.json`, (err, files) => { // Can't use regular logging here because the pattern for Azure Pipelines requires ##vso to be the first chars. console.log( - `##vso[task.setvariable variable=GeneratedPackageTargets;]${packageTargets}` + `##vso[task.setvariable variable=GeneratedPackageTargets;isOutput=true;]${packageTargets}` ); } else { log("Did not find any packages under service directory."); From 25ee3082320422d7610e5fb25a6144cb7e405fde Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 15:30:03 -0700 Subject: [PATCH 20/33] Tweaks to improve logging and debugging. --- eng/pipelines/templates/steps/select-packages.yml | 2 +- eng/tools/select-packages/index.js | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/steps/select-packages.yml b/eng/pipelines/templates/steps/select-packages.yml index 5c00aad50227..860dfa3343fa 100644 --- a/eng/pipelines/templates/steps/select-packages.yml +++ b/eng/pipelines/templates/steps/select-packages.yml @@ -4,4 +4,4 @@ steps: npm run select-packages $(System.DefaultWorkingDirectory)/${{parameters.ServiceDirectory}} workingDirectory: $(System.DefaultWorkingDirectory)/eng/tools/select-packages name: SelectPackages - displayName: "Selecting packages to build (Linux & macOS)" + displayName: "Selecting packages to build" diff --git a/eng/tools/select-packages/index.js b/eng/tools/select-packages/index.js index 066d2b04542b..96e880cc92da 100644 --- a/eng/tools/select-packages/index.js +++ b/eng/tools/select-packages/index.js @@ -23,6 +23,11 @@ log(`Specified service directory is "${serviceDirectory}".`); // This code assumes that in the service directory, packages that we want to publish // exist only in directories that are immediate children of the service directory. glob(`${serviceDirectory}/*/package.json`, (err, files) => { + if (err) { + log(`An error occured: ${err}`); + process.exit(1); + } + let packageTargets = ""; if (files) { @@ -52,7 +57,14 @@ glob(`${serviceDirectory}/*/package.json`, (err, files) => { console.log( `##vso[task.setvariable variable=GeneratedPackageTargets;isOutput=true;]${packageTargets}` ); + + log( + `Emitted variable "GeneratedPackageTargets" with content: ${packageTargets}` + ); } else { log("Did not find any packages under service directory."); + process.exit(2); } + + log("Done!"); }); From 1f6e43456f669cd115ea705f5b2df7a20b3e026e Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 15:36:26 -0700 Subject: [PATCH 21/33] Moving to lock file for select-packages. --- eng/tools/select-packages/package-lock.json | 96 +++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 eng/tools/select-packages/package-lock.json diff --git a/eng/tools/select-packages/package-lock.json b/eng/tools/select-packages/package-lock.json new file mode 100644 index 000000000000..0ecf660e611d --- /dev/null +++ b/eng/tools/select-packages/package-lock.json @@ -0,0 +1,96 @@ +{ + "name": "select-packages", + "version": "1.0.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "glob": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "requires": { + "wrappy": "1" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + } + } +} From ac17b11f682f55b81bc83a121f42756c838bc1be Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 15:46:37 -0700 Subject: [PATCH 22/33] Using CI instead of instal. --- eng/pipelines/templates/steps/select-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/steps/select-packages.yml b/eng/pipelines/templates/steps/select-packages.yml index 860dfa3343fa..7ebcf7635462 100644 --- a/eng/pipelines/templates/steps/select-packages.yml +++ b/eng/pipelines/templates/steps/select-packages.yml @@ -1,6 +1,6 @@ steps: - script: | - npm install + npm ci # This causes us to download packages exclusively based on the lock file, faster and more secure. npm run select-packages $(System.DefaultWorkingDirectory)/${{parameters.ServiceDirectory}} workingDirectory: $(System.DefaultWorkingDirectory)/eng/tools/select-packages name: SelectPackages From 7eac9caa4b89f5f919244507698e89b60353ca46 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 16:03:18 -0700 Subject: [PATCH 23/33] Moved/updated ci.yml files and setup data-plane packages. --- sdk/core/ci.yml | 2 +- sdk/cosmosdb/ci.yml | 2 +- sdk/cosmosdb/cosmos/package.json | 1 + sdk/eventhub/ci.yml | 2 +- sdk/eventhub/event-hubs/package.json | 1 + .../event-processor-host/package.json | 1 + sdk/eventhub/testhub/package.json | 1 + sdk/identity/ci.yml | 23 +++++++++++++++++++ sdk/identity/identity/package.json | 1 + sdk/keyvault/ci.yml | 2 +- .../keyvault-certificates/package.json | 1 + sdk/keyvault/keyvault-keys/package.json | 1 + sdk/keyvault/keyvault-secrets/package.json | 1 + sdk/keyvault/keyvault/package.json | 1 + sdk/servicebus/ci.yml | 2 +- sdk/servicebus/service-bus/package.json | 3 ++- sdk/storage/ci.yml | 2 +- sdk/storage/storage-blob/package.json | 1 + sdk/storage/storage-datalake/package.json | 1 + sdk/storage/storage-file/package.json | 1 + sdk/storage/storage-queue/package.json | 1 + 21 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 sdk/identity/ci.yml diff --git a/sdk/core/ci.yml b/sdk/core/ci.yml index 178fc8c45363..98900401a5a9 100644 --- a/sdk/core/ci.yml +++ b/sdk/core/ci.yml @@ -20,4 +20,4 @@ pr: jobs: - template: ../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - ServiceDirectory: sdk/core + ServiceDirectory: sdk/core/ diff --git a/sdk/cosmosdb/ci.yml b/sdk/cosmosdb/ci.yml index aa07960e0dbf..ac2c25e8ca78 100644 --- a/sdk/cosmosdb/ci.yml +++ b/sdk/cosmosdb/ci.yml @@ -20,7 +20,7 @@ pr: jobs: - template: ../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - PackageName: "@azure/cosmos" + ServiceDirectory: sdk/cosmosdb/ - template: ../../eng/pipelines/templates/jobs/node6-test-sdk-client.yml parameters: diff --git a/sdk/cosmosdb/cosmos/package.json b/sdk/cosmosdb/cosmos/package.json index 26643c21a72a..8daf68621678 100644 --- a/sdk/cosmosdb/cosmos/package.json +++ b/sdk/cosmosdb/cosmos/package.json @@ -1,5 +1,6 @@ { "name": "@azure/cosmos", + "isDataPlane": true, "description": "Azure Cosmos DB Service Node.js SDK for SQL API", "keywords": [ "cosmosdb", diff --git a/sdk/eventhub/ci.yml b/sdk/eventhub/ci.yml index dde96bbd6358..75a2107d5cab 100644 --- a/sdk/eventhub/ci.yml +++ b/sdk/eventhub/ci.yml @@ -20,4 +20,4 @@ pr: jobs: - template: ../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - PackageName: "@azure/event-hubs" + ServiceDirectory: sdk/eventhub/ diff --git a/sdk/eventhub/event-hubs/package.json b/sdk/eventhub/event-hubs/package.json index 3c01577a1b72..2727d3738514 100644 --- a/sdk/eventhub/event-hubs/package.json +++ b/sdk/eventhub/event-hubs/package.json @@ -1,5 +1,6 @@ { "name": "@azure/event-hubs", + "isDataPlane": true, "version": "2.1.0", "description": "Azure Event Hubs SDK for JS.", "author": "Microsoft Corporation", diff --git a/sdk/eventhub/event-processor-host/package.json b/sdk/eventhub/event-processor-host/package.json index eab167869a86..50f83f165c29 100644 --- a/sdk/eventhub/event-processor-host/package.json +++ b/sdk/eventhub/event-processor-host/package.json @@ -1,5 +1,6 @@ { "name": "@azure/event-processor-host", + "isDataPlane": true, "version": "1.0.6", "description": "Azure Event Processor Host (Event Hubs) SDK for JS.", "author": "Microsoft Corporation", diff --git a/sdk/eventhub/testhub/package.json b/sdk/eventhub/testhub/package.json index 01ebc961790a..2d19a3828efb 100644 --- a/sdk/eventhub/testhub/package.json +++ b/sdk/eventhub/testhub/package.json @@ -1,5 +1,6 @@ { "name": "testhub", + "isDataPlane": true, "version": "0.1.0", "license": "MIT", "engine": { diff --git a/sdk/identity/ci.yml b/sdk/identity/ci.yml new file mode 100644 index 000000000000..58bcb0b5a973 --- /dev/null +++ b/sdk/identity/ci.yml @@ -0,0 +1,23 @@ +# DO NOT EDIT THIS FILE +# This file is generated automatically and any changes will be lost. + +trigger: + branches: + include: + - master + paths: + include: + - sdk/identity/ + +pr: + branches: + include: + - master + paths: + include: + - sdk/identity/ + +jobs: + - template: ../../eng/pipelines/templates/jobs/archetype-sdk-client.yml + parameters: + ServiceDirectory: sdk/identity/ diff --git a/sdk/identity/identity/package.json b/sdk/identity/identity/package.json index e6f2734dcc42..3acf34de95d5 100644 --- a/sdk/identity/identity/package.json +++ b/sdk/identity/identity/package.json @@ -1,5 +1,6 @@ { "name": "@azure/identity", + "isDataPlane": true, "version": "0.1.0", "description": "Provides credential implementations for Azure SDK libraries that can authenticate with Azure Active Directory", "main": "dist/index.js", diff --git a/sdk/keyvault/ci.yml b/sdk/keyvault/ci.yml index f18c5a3472c6..7f51f892d665 100644 --- a/sdk/keyvault/ci.yml +++ b/sdk/keyvault/ci.yml @@ -20,4 +20,4 @@ pr: jobs: - template: ../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - PackageName: "@azure/keyvault-secrets" + ServiceDirectory: sdk/keyvault/ diff --git a/sdk/keyvault/keyvault-certificates/package.json b/sdk/keyvault/keyvault-certificates/package.json index e4bfc87a02e8..3c8bb3c8baca 100644 --- a/sdk/keyvault/keyvault-certificates/package.json +++ b/sdk/keyvault/keyvault-certificates/package.json @@ -1,5 +1,6 @@ { "name": "@azure/keyvault-certificates", + "isDataPlane": true, "author": "Microsoft Corporation", "version": "0.0.1", "license": "MIT", diff --git a/sdk/keyvault/keyvault-keys/package.json b/sdk/keyvault/keyvault-keys/package.json index 5a725bad39d5..c97ae63a89fc 100644 --- a/sdk/keyvault/keyvault-keys/package.json +++ b/sdk/keyvault/keyvault-keys/package.json @@ -1,5 +1,6 @@ { "name": "@azure/keyvault-keys", + "isDataPlane": true, "author": "Microsoft Corporation", "version": "0.0.1", "license": "MIT", diff --git a/sdk/keyvault/keyvault-secrets/package.json b/sdk/keyvault/keyvault-secrets/package.json index 83ff334db3c5..d0b0deba15ba 100644 --- a/sdk/keyvault/keyvault-secrets/package.json +++ b/sdk/keyvault/keyvault-secrets/package.json @@ -1,5 +1,6 @@ { "name": "@azure/keyvault-secrets", + "isDataPlane": true, "author": "Microsoft Corporation", "version": "0.0.1", "license": "MIT", diff --git a/sdk/keyvault/keyvault/package.json b/sdk/keyvault/keyvault/package.json index 8ef430e0b2c6..770c4e8cac17 100644 --- a/sdk/keyvault/keyvault/package.json +++ b/sdk/keyvault/keyvault/package.json @@ -1,5 +1,6 @@ { "name": "@azure/keyvault", + "isDataPlane": true, "author": "Microsoft Corporation", "version": "0.1.0", "license": "MIT", diff --git a/sdk/servicebus/ci.yml b/sdk/servicebus/ci.yml index 6de517f2c242..4de31ea0ebce 100644 --- a/sdk/servicebus/ci.yml +++ b/sdk/servicebus/ci.yml @@ -20,4 +20,4 @@ pr: jobs: - template: ../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - PackageName: "@azure/service-bus" + ServiceDirectory: sdk/servicebus/ diff --git a/sdk/servicebus/service-bus/package.json b/sdk/servicebus/service-bus/package.json index 9651efdfa2dc..a2d0cdab0d1c 100644 --- a/sdk/servicebus/service-bus/package.json +++ b/sdk/servicebus/service-bus/package.json @@ -1,5 +1,6 @@ { "name": "@azure/service-bus", + "isDataPlane": true, "author": "Microsoft Corporation", "version": "1.0.2", "license": "MIT", @@ -65,7 +66,7 @@ "eslint-detailed-reporter": "^0.8.0", "eslint-plugin-no-null": "^1.0.2", "eslint-plugin-no-only-tests": "^2.3.0", - "eslint-plugin-promise": "^4.1.1", + "eslint-plugin-promise": "^4.1.1", "https-proxy-agent": "^2.2.1", "karma": "^4.0.1", "karma-chrome-launcher": "^2.2.0", diff --git a/sdk/storage/ci.yml b/sdk/storage/ci.yml index b6e94a14d84b..3c7b3fbc4f99 100644 --- a/sdk/storage/ci.yml +++ b/sdk/storage/ci.yml @@ -20,4 +20,4 @@ pr: jobs: - template: ../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - PackageName: "@azure/storage-blob" + ServiceDirectory: sdk/storage/ diff --git a/sdk/storage/storage-blob/package.json b/sdk/storage/storage-blob/package.json index f176b5721d94..9b770809f4ac 100644 --- a/sdk/storage/storage-blob/package.json +++ b/sdk/storage/storage-blob/package.json @@ -1,5 +1,6 @@ { "name": "@azure/storage-blob", + "isDataPlane": true, "version": "10.3.0", "description": "Microsoft Azure Storage SDK for JavaScript - Blob", "main": "./dist/index.js", diff --git a/sdk/storage/storage-datalake/package.json b/sdk/storage/storage-datalake/package.json index 4fe400fb795c..e8cbb30671ac 100644 --- a/sdk/storage/storage-datalake/package.json +++ b/sdk/storage/storage-datalake/package.json @@ -1,5 +1,6 @@ { "name": "@azure/storage-datalake", + "isDataPlane": true, "author": "Microsoft Corporation", "description": "DataLakeStorageClient Library with typescript type definitions for node.js and browser.", "version": "0.1.1", diff --git a/sdk/storage/storage-file/package.json b/sdk/storage/storage-file/package.json index 925eaa9cb0cb..e9d57e09cc96 100644 --- a/sdk/storage/storage-file/package.json +++ b/sdk/storage/storage-file/package.json @@ -1,5 +1,6 @@ { "name": "@azure/storage-file", + "isDataPlane": true, "version": "10.1.0", "description": "Microsoft Azure Storage SDK for JavaScript - File", "main": "./dist/index.js", diff --git a/sdk/storage/storage-queue/package.json b/sdk/storage/storage-queue/package.json index 0d4df3e8310a..3f9f0c28c647 100644 --- a/sdk/storage/storage-queue/package.json +++ b/sdk/storage/storage-queue/package.json @@ -1,5 +1,6 @@ { "name": "@azure/storage-queue", + "isDataPlane": true, "version": "10.1.0", "description": "Microsoft Azure Storage SDK for JavaScript - Queue", "main": "./dist/index.js", From 7230ac788f43a367174785324abbccefdeb3b984 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 16:32:56 -0700 Subject: [PATCH 24/33] Adds globbing support on the CLI. --- eng/tools/select-packages/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/tools/select-packages/index.js b/eng/tools/select-packages/index.js index 96e880cc92da..e1d580a31987 100644 --- a/eng/tools/select-packages/index.js +++ b/eng/tools/select-packages/index.js @@ -17,12 +17,12 @@ const log = message => { log(`Working directory is "${process.cwd()}".`); -let serviceDirectory = process.argv[2]; -log(`Specified service directory is "${serviceDirectory}".`); +let filter = process.argv[2]; +log(`Specified service directory is "${filter}".`); // This code assumes that in the service directory, packages that we want to publish // exist only in directories that are immediate children of the service directory. -glob(`${serviceDirectory}/*/package.json`, (err, files) => { +glob(filter, (err, files) => { if (err) { log(`An error occured: ${err}`); process.exit(1); From 808f83c0837069f2adc52f0d2a2b6ea8cedb7a44 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 19:57:04 -0700 Subject: [PATCH 25/33] Fixed up glob. --- eng/pipelines/templates/steps/select-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/steps/select-packages.yml b/eng/pipelines/templates/steps/select-packages.yml index 7ebcf7635462..93346ec86676 100644 --- a/eng/pipelines/templates/steps/select-packages.yml +++ b/eng/pipelines/templates/steps/select-packages.yml @@ -1,7 +1,7 @@ steps: - script: | npm ci # This causes us to download packages exclusively based on the lock file, faster and more secure. - npm run select-packages $(System.DefaultWorkingDirectory)/${{parameters.ServiceDirectory}} + npm run select-packages $(System.DefaultWorkingDirectory)/${{parameters.ServiceDirectory}}/*/package.json workingDirectory: $(System.DefaultWorkingDirectory)/eng/tools/select-packages name: SelectPackages displayName: "Selecting packages to build" From 9a9b678fecaf3e1c7a7595328e1167a2eb3ff3a2 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 20:06:49 -0700 Subject: [PATCH 26/33] Refined glob. --- eng/pipelines/templates/steps/select-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/steps/select-packages.yml b/eng/pipelines/templates/steps/select-packages.yml index 93346ec86676..0d07fb40dc81 100644 --- a/eng/pipelines/templates/steps/select-packages.yml +++ b/eng/pipelines/templates/steps/select-packages.yml @@ -1,7 +1,7 @@ steps: - script: | npm ci # This causes us to download packages exclusively based on the lock file, faster and more secure. - npm run select-packages $(System.DefaultWorkingDirectory)/${{parameters.ServiceDirectory}}/*/package.json + npm run select-packages "$(System.DefaultWorkingDirectory)/${{parameters.ServiceDirectory}}/!(arm-*)/package.json" workingDirectory: $(System.DefaultWorkingDirectory)/eng/tools/select-packages name: SelectPackages displayName: "Selecting packages to build" From 352ff9e0899971bd32f01a77d8245b1f8bf1c2b6 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 20:11:55 -0700 Subject: [PATCH 27/33] Added a prepare step to make the test jobs be able to start quicker. --- .../templates/jobs/archetype-sdk-client.yml | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index d1b0c8446d5b..99d04c90f86d 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -1,11 +1,8 @@ jobs: - - job: "Build" + - job: Prepare variables: - template: ../variables/globals.yml - pool: - vmImage: "ubuntu-16.04" - steps: - task: NodeTool@0 inputs: @@ -20,6 +17,28 @@ jobs: parameters: ServiceDirectory: ${{parameters.ServiceDirectory}} + - job: "Build" + variables: + - template: ../variables/globals.yml + - name: GeneratedPackageTargets + value: $[dependencies.Build.outputs['SelectPackages.GeneratedPackageTargets']] + + dependsOn: + - Prepare + + pool: + vmImage: "ubuntu-16.04" + + steps: + - task: NodeTool@0 + inputs: + versionSpec: "$(NodeVersion)" + displayName: "Install Node.js $(NodeVersion)" + + - script: | + npm install -g npm@6.9.0 + displayName: "Install npm version 6.9.0" + - script: | node common/scripts/install-run-rush.js install displayName: "Install dependencies" @@ -48,7 +67,7 @@ jobs: - job: "Analyze" dependsOn: - - Build + - Prepare variables: - template: ../variables/globals.yml @@ -90,7 +109,7 @@ jobs: - job: "Test" dependsOn: - - Build + - Prepare strategy: matrix: From dbdbb24c9e85d00a78d6abac75e95d45cf475fd5 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 20:14:54 -0700 Subject: [PATCH 28/33] Fixing up mislabeled output variables. --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 99d04c90f86d..47a20c6bc752 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -21,7 +21,7 @@ jobs: variables: - template: ../variables/globals.yml - name: GeneratedPackageTargets - value: $[dependencies.Build.outputs['SelectPackages.GeneratedPackageTargets']] + value: $[dependencies.Prepare.outputs['SelectPackages.GeneratedPackageTargets']] dependsOn: - Prepare @@ -72,7 +72,7 @@ jobs: variables: - template: ../variables/globals.yml - name: GeneratedPackageTargets - value: $[dependencies.Build.outputs['SelectPackages.GeneratedPackageTargets']] + value: $[dependencies.Prepare.outputs['SelectPackages.GeneratedPackageTargets']] pool: vmImage: "ubuntu-16.04" @@ -154,7 +154,7 @@ jobs: vmImage: "$(OSVmImage)" variables: - GeneratedPackageTargets: $[dependencies.Build.outputs['SelectPackages.GeneratedPackageTargets']] + GeneratedPackageTargets: $[dependencies.Prepare.outputs['SelectPackages.GeneratedPackageTargets']] steps: - task: NodeTool@0 From 24c02f24bac2362c4cb05189392528ebfd2dd371 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 20:29:25 -0700 Subject: [PATCH 29/33] Explicitly specifying pool on prepare. --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 47a20c6bc752..454c5adf70ab 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -3,6 +3,9 @@ jobs: variables: - template: ../variables/globals.yml + pool: + vmImage: "ubuntu-16.04" + steps: - task: NodeTool@0 inputs: From 6459720c2e3c2c8d7410154a58b9b2a4b6a8d5d3 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Tue, 11 Jun 2019 20:38:22 -0700 Subject: [PATCH 30/33] Changes to existing ci.yml files to make sure we don't break when merging. --- sdk/core/amqp-common/ci.yml | 4 ++-- sdk/core/core-http/ci.yml | 4 ++-- sdk/cosmosdb/cosmos/ci.yml | 6 ++++-- sdk/eventhub/event-hubs/ci.yml | 2 +- sdk/eventhub/event-processor-host/ci.yml | 2 +- sdk/servicebus/service-bus/ci.yml | 4 ++-- sdk/storage/storage-blob/ci.yml | 4 ++-- sdk/storage/storage-file/ci.yml | 4 ++-- sdk/storage/storage-queue/ci.yml | 4 ++-- 9 files changed, 18 insertions(+), 16 deletions(-) diff --git a/sdk/core/amqp-common/ci.yml b/sdk/core/amqp-common/ci.yml index cb46058e468d..d4da4b9a9035 100644 --- a/sdk/core/amqp-common/ci.yml +++ b/sdk/core/amqp-common/ci.yml @@ -9,9 +9,9 @@ pr: - master paths: include: - - sdk/core/amqp-common/ + - sdk/core/ jobs: - template: ../../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - PackageName: "@azure/amqp-common" + ServiceDirectory: sdk/core/ diff --git a/sdk/core/core-http/ci.yml b/sdk/core/core-http/ci.yml index b0b1f9f96ce7..d4da4b9a9035 100644 --- a/sdk/core/core-http/ci.yml +++ b/sdk/core/core-http/ci.yml @@ -9,9 +9,9 @@ pr: - master paths: include: - - sdk/core/http/ + - sdk/core/ jobs: - template: ../../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - PackageName: "@azure/core-http" + ServiceDirectory: sdk/core/ diff --git a/sdk/cosmosdb/cosmos/ci.yml b/sdk/cosmosdb/cosmos/ci.yml index 472fb89c87fe..e8a0f1fd2725 100644 --- a/sdk/cosmosdb/cosmos/ci.yml +++ b/sdk/cosmosdb/cosmos/ci.yml @@ -9,13 +9,15 @@ pr: - master paths: include: - - sdk/cosmosdb/cosmos/ + - sdk/cosmosdb/ jobs: - template: ../../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - PackageName: "@azure/cosmos" + ServiceDirectory: sdk/cosmosdb/ + # HACK: Because Rush doesn't support Node 6.x this is done to use NPM to build + # and test on that version of Node. - template: ../../../eng/pipelines/templates/jobs/node6-test-sdk-client.yml parameters: PackagePath: "sdk/cosmosdb/cosmos/" diff --git a/sdk/eventhub/event-hubs/ci.yml b/sdk/eventhub/event-hubs/ci.yml index 69469b081e61..1d9c55f2b419 100644 --- a/sdk/eventhub/event-hubs/ci.yml +++ b/sdk/eventhub/event-hubs/ci.yml @@ -14,4 +14,4 @@ pr: jobs: - template: ../../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - PackageName: "@azure/event-hubs" + ServiceDirectory: sdk/eventhub/ diff --git a/sdk/eventhub/event-processor-host/ci.yml b/sdk/eventhub/event-processor-host/ci.yml index a887660b7cdb..f789ef4f8ce5 100644 --- a/sdk/eventhub/event-processor-host/ci.yml +++ b/sdk/eventhub/event-processor-host/ci.yml @@ -14,4 +14,4 @@ pr: jobs: - template: ../../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - PackageName: "@azure/event-processor-host" + ServiceDirectory: sdk/eventhub/ diff --git a/sdk/servicebus/service-bus/ci.yml b/sdk/servicebus/service-bus/ci.yml index 46e464884f94..298f4ee0de94 100644 --- a/sdk/servicebus/service-bus/ci.yml +++ b/sdk/servicebus/service-bus/ci.yml @@ -9,9 +9,9 @@ pr: - master paths: include: - - sdk/servicebus/service-bus/ + - sdk/servicebus/ jobs: - template: ../../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - PackageName: "@azure/service-bus" + ServiceDirectory: sdk/servicebus/ diff --git a/sdk/storage/storage-blob/ci.yml b/sdk/storage/storage-blob/ci.yml index 3802af657de2..32c69310057f 100644 --- a/sdk/storage/storage-blob/ci.yml +++ b/sdk/storage/storage-blob/ci.yml @@ -9,9 +9,9 @@ pr: - master paths: include: - - sdk/storage/storage-blob/ + - sdk/storage/ jobs: - template: ../../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - PackageName: "@azure/storage-blob" + ServiceDirectory: sdk/storage/ diff --git a/sdk/storage/storage-file/ci.yml b/sdk/storage/storage-file/ci.yml index 1a056d4164da..32c69310057f 100644 --- a/sdk/storage/storage-file/ci.yml +++ b/sdk/storage/storage-file/ci.yml @@ -9,9 +9,9 @@ pr: - master paths: include: - - sdk/storage/storage-file/ + - sdk/storage/ jobs: - template: ../../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - PackageName: "@azure/storage-file" + ServiceDirectory: sdk/storage/ diff --git a/sdk/storage/storage-queue/ci.yml b/sdk/storage/storage-queue/ci.yml index 8e28011141c2..32c69310057f 100644 --- a/sdk/storage/storage-queue/ci.yml +++ b/sdk/storage/storage-queue/ci.yml @@ -9,9 +9,9 @@ pr: - master paths: include: - - sdk/storage/storage-queue/ + - sdk/storage/ jobs: - template: ../../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - PackageName: "@azure/storage-queue" + ServiceDirectory: sdk/storage/ From 94c2cf10a447fe3d6eb8c0f65290ec3f6d4d7c81 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Wed, 12 Jun 2019 08:15:42 -0700 Subject: [PATCH 31/33] Swap to sdk-type from isDataPlane. --- eng/tools/select-packages/index.js | 2 +- sdk/core/abort-controller/package.json | 2 +- sdk/core/amqp-common/package.json | 2 +- sdk/core/core-http/package.json | 2 +- sdk/cosmosdb/cosmos/package.json | 2 +- sdk/eventhub/event-hubs/package.json | 2 +- sdk/eventhub/event-processor-host/package.json | 2 +- sdk/eventhub/testhub/package.json | 2 +- sdk/identity/identity/package.json | 2 +- sdk/keyvault/keyvault-certificates/package.json | 2 +- sdk/keyvault/keyvault-keys/package.json | 2 +- sdk/keyvault/keyvault-secrets/package.json | 2 +- sdk/keyvault/keyvault/package.json | 2 +- sdk/servicebus/service-bus/package.json | 2 +- sdk/storage/storage-blob/package.json | 2 +- sdk/storage/storage-datalake/package.json | 2 +- sdk/storage/storage-file/package.json | 2 +- sdk/storage/storage-queue/package.json | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/tools/select-packages/index.js b/eng/tools/select-packages/index.js index e1d580a31987..52c983e681fa 100644 --- a/eng/tools/select-packages/index.js +++ b/eng/tools/select-packages/index.js @@ -41,7 +41,7 @@ glob(filter, (err, files) => { `Package name for package ${fileIndex} is "${packageContents.name}".` ); - if (packageContents.isDataPlane) { + if (packageContents["sdk-type"] == "client") { log(`Package "${packageContents.name}" is a data-plane library.`); packageTargets += `--to "${packageContents.name}" `; } else { diff --git a/sdk/core/abort-controller/package.json b/sdk/core/abort-controller/package.json index e8365f7303f5..9d38b643b632 100644 --- a/sdk/core/abort-controller/package.json +++ b/sdk/core/abort-controller/package.json @@ -1,6 +1,6 @@ { "name": "@azure/abort-controller", - "isDataPlane": true, + "sdk-type": "client", "version": "1.0.0", "description": "Microsoft Azure SDK for JavaScript - Aborter", "main": "./dist/index.js", diff --git a/sdk/core/amqp-common/package.json b/sdk/core/amqp-common/package.json index b7fd016f7143..40d437afbaff 100644 --- a/sdk/core/amqp-common/package.json +++ b/sdk/core/amqp-common/package.json @@ -1,6 +1,6 @@ { "name": "@azure/amqp-common", - "isDataPlane": true, + "sdk-type": "client", "version": "1.0.0-preview.5", "description": "Common library for amqp based azure sdks like @azure/event-hubs.", "author": "Microsoft Corporation", diff --git a/sdk/core/core-http/package.json b/sdk/core/core-http/package.json index e0d8f28767c7..d523306b9da4 100644 --- a/sdk/core/core-http/package.json +++ b/sdk/core/core-http/package.json @@ -1,6 +1,6 @@ { "name": "@azure/core-http", - "isDataPlane": true, + "sdk-type": "client", "author": { "name": "Microsoft Corporation", "email": "azsdkteam@microsoft.com", diff --git a/sdk/cosmosdb/cosmos/package.json b/sdk/cosmosdb/cosmos/package.json index 8daf68621678..ee94aa7b92ad 100644 --- a/sdk/cosmosdb/cosmos/package.json +++ b/sdk/cosmosdb/cosmos/package.json @@ -1,6 +1,6 @@ { "name": "@azure/cosmos", - "isDataPlane": true, + "sdk-type": "client", "description": "Azure Cosmos DB Service Node.js SDK for SQL API", "keywords": [ "cosmosdb", diff --git a/sdk/eventhub/event-hubs/package.json b/sdk/eventhub/event-hubs/package.json index 2727d3738514..a5286434c821 100644 --- a/sdk/eventhub/event-hubs/package.json +++ b/sdk/eventhub/event-hubs/package.json @@ -1,6 +1,6 @@ { "name": "@azure/event-hubs", - "isDataPlane": true, + "sdk-type": "client", "version": "2.1.0", "description": "Azure Event Hubs SDK for JS.", "author": "Microsoft Corporation", diff --git a/sdk/eventhub/event-processor-host/package.json b/sdk/eventhub/event-processor-host/package.json index 50f83f165c29..a6c49ab63bab 100644 --- a/sdk/eventhub/event-processor-host/package.json +++ b/sdk/eventhub/event-processor-host/package.json @@ -1,6 +1,6 @@ { "name": "@azure/event-processor-host", - "isDataPlane": true, + "sdk-type": "client", "version": "1.0.6", "description": "Azure Event Processor Host (Event Hubs) SDK for JS.", "author": "Microsoft Corporation", diff --git a/sdk/eventhub/testhub/package.json b/sdk/eventhub/testhub/package.json index 2d19a3828efb..e392ebcbb006 100644 --- a/sdk/eventhub/testhub/package.json +++ b/sdk/eventhub/testhub/package.json @@ -1,6 +1,6 @@ { "name": "testhub", - "isDataPlane": true, + "sdk-type": "client", "version": "0.1.0", "license": "MIT", "engine": { diff --git a/sdk/identity/identity/package.json b/sdk/identity/identity/package.json index 3acf34de95d5..cb98d7bafd0e 100644 --- a/sdk/identity/identity/package.json +++ b/sdk/identity/identity/package.json @@ -1,6 +1,6 @@ { "name": "@azure/identity", - "isDataPlane": true, + "sdk-type": "client", "version": "0.1.0", "description": "Provides credential implementations for Azure SDK libraries that can authenticate with Azure Active Directory", "main": "dist/index.js", diff --git a/sdk/keyvault/keyvault-certificates/package.json b/sdk/keyvault/keyvault-certificates/package.json index 3c8bb3c8baca..e70c28b31d5e 100644 --- a/sdk/keyvault/keyvault-certificates/package.json +++ b/sdk/keyvault/keyvault-certificates/package.json @@ -1,6 +1,6 @@ { "name": "@azure/keyvault-certificates", - "isDataPlane": true, + "sdk-type": "client", "author": "Microsoft Corporation", "version": "0.0.1", "license": "MIT", diff --git a/sdk/keyvault/keyvault-keys/package.json b/sdk/keyvault/keyvault-keys/package.json index c97ae63a89fc..5ac60c4ec950 100644 --- a/sdk/keyvault/keyvault-keys/package.json +++ b/sdk/keyvault/keyvault-keys/package.json @@ -1,6 +1,6 @@ { "name": "@azure/keyvault-keys", - "isDataPlane": true, + "sdk-type": "client", "author": "Microsoft Corporation", "version": "0.0.1", "license": "MIT", diff --git a/sdk/keyvault/keyvault-secrets/package.json b/sdk/keyvault/keyvault-secrets/package.json index d0b0deba15ba..b82be15e2ef6 100644 --- a/sdk/keyvault/keyvault-secrets/package.json +++ b/sdk/keyvault/keyvault-secrets/package.json @@ -1,6 +1,6 @@ { "name": "@azure/keyvault-secrets", - "isDataPlane": true, + "sdk-type": "client", "author": "Microsoft Corporation", "version": "0.0.1", "license": "MIT", diff --git a/sdk/keyvault/keyvault/package.json b/sdk/keyvault/keyvault/package.json index 770c4e8cac17..f53d315962fc 100644 --- a/sdk/keyvault/keyvault/package.json +++ b/sdk/keyvault/keyvault/package.json @@ -1,6 +1,6 @@ { "name": "@azure/keyvault", - "isDataPlane": true, + "sdk-type": "client", "author": "Microsoft Corporation", "version": "0.1.0", "license": "MIT", diff --git a/sdk/servicebus/service-bus/package.json b/sdk/servicebus/service-bus/package.json index a2d0cdab0d1c..9adaa5c35492 100644 --- a/sdk/servicebus/service-bus/package.json +++ b/sdk/servicebus/service-bus/package.json @@ -1,6 +1,6 @@ { "name": "@azure/service-bus", - "isDataPlane": true, + "sdk-type": "client", "author": "Microsoft Corporation", "version": "1.0.2", "license": "MIT", diff --git a/sdk/storage/storage-blob/package.json b/sdk/storage/storage-blob/package.json index 9b770809f4ac..883fa3d346b6 100644 --- a/sdk/storage/storage-blob/package.json +++ b/sdk/storage/storage-blob/package.json @@ -1,6 +1,6 @@ { "name": "@azure/storage-blob", - "isDataPlane": true, + "sdk-type": "client", "version": "10.3.0", "description": "Microsoft Azure Storage SDK for JavaScript - Blob", "main": "./dist/index.js", diff --git a/sdk/storage/storage-datalake/package.json b/sdk/storage/storage-datalake/package.json index e8cbb30671ac..8f14ca89a17b 100644 --- a/sdk/storage/storage-datalake/package.json +++ b/sdk/storage/storage-datalake/package.json @@ -1,6 +1,6 @@ { "name": "@azure/storage-datalake", - "isDataPlane": true, + "sdk-type": "client", "author": "Microsoft Corporation", "description": "DataLakeStorageClient Library with typescript type definitions for node.js and browser.", "version": "0.1.1", diff --git a/sdk/storage/storage-file/package.json b/sdk/storage/storage-file/package.json index e9d57e09cc96..3eb2dbd77dcc 100644 --- a/sdk/storage/storage-file/package.json +++ b/sdk/storage/storage-file/package.json @@ -1,6 +1,6 @@ { "name": "@azure/storage-file", - "isDataPlane": true, + "sdk-type": "client", "version": "10.1.0", "description": "Microsoft Azure Storage SDK for JavaScript - File", "main": "./dist/index.js", diff --git a/sdk/storage/storage-queue/package.json b/sdk/storage/storage-queue/package.json index 3f9f0c28c647..b3924ec0b193 100644 --- a/sdk/storage/storage-queue/package.json +++ b/sdk/storage/storage-queue/package.json @@ -1,6 +1,6 @@ { "name": "@azure/storage-queue", - "isDataPlane": true, + "sdk-type": "client", "version": "10.1.0", "description": "Microsoft Azure Storage SDK for JavaScript - Queue", "main": "./dist/index.js", From bacb20e8643d968197c7702587cbc16338b02908 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Wed, 12 Jun 2019 12:04:15 -0700 Subject: [PATCH 32/33] Updated logging. --- eng/tools/select-packages/index.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/eng/tools/select-packages/index.js b/eng/tools/select-packages/index.js index 52c983e681fa..b19503a3d872 100644 --- a/eng/tools/select-packages/index.js +++ b/eng/tools/select-packages/index.js @@ -18,7 +18,7 @@ const log = message => { log(`Working directory is "${process.cwd()}".`); let filter = process.argv[2]; -log(`Specified service directory is "${filter}".`); +log(`Specified glob filter is "${filter}".`); // This code assumes that in the service directory, packages that we want to publish // exist only in directories that are immediate children of the service directory. @@ -42,10 +42,18 @@ glob(filter, (err, files) => { ); if (packageContents["sdk-type"] == "client") { - log(`Package "${packageContents.name}" is a data-plane library.`); + log( + `Package "${packageContents.name}" has sdk-type of "${ + packageContents["sdk-type"] + }".` + ); packageTargets += `--to "${packageContents.name}" `; } else { - log(`Package "${packageContents.name}" is NOT a data-plane library.`); + log( + `Package "${ + packageContents.name + }" DOES NOT have an sdk-type of "client".` + ); } } From c3bbc43112828f9698d9c8bfacbd03b2be4ce4f2 Mon Sep 17 00:00:00 2001 From: Mitch Denny Date: Wed, 12 Jun 2019 14:02:42 -0700 Subject: [PATCH 33/33] Made it so that service directory excludes sdk/ --- common/scripts/select-packages.js | 14 ----------- .../templates/steps/select-packages.yml | 2 +- sdk/core/amqp-common/ci.yml | 2 +- sdk/core/ci.yml | 2 +- sdk/core/core-http/ci.yml | 2 +- sdk/cosmosdb/ci.yml | 2 +- sdk/cosmosdb/cosmos/ci.yml | 2 +- sdk/eventhub/ci.yml | 2 +- sdk/eventhub/event-hubs/ci.yml | 2 +- sdk/eventhub/event-processor-host/ci.yml | 2 +- sdk/identity/ci.yml | 2 +- sdk/identity/identity/ci.yml | 4 ++-- sdk/keyvault/ci.yml | 2 +- sdk/keyvault/keyvault-keys/ci.yml | 4 ++-- sdk/keyvault/keyvault-secrets/ci.yml | 4 ++-- sdk/servicebus/ci.yml | 2 +- sdk/servicebus/service-bus/ci.yml | 2 +- sdk/storage/ci.yml | 2 +- sdk/storage/storage-blob/ci.yml | 2 +- sdk/storage/storage-datalake/package.json | 1 - sdk/storage/storage-file/ci.yml | 2 +- sdk/storage/storage-queue/ci.yml | 2 +- sdk/template/ci.yml | 23 +++++++++++++++++++ 23 files changed, 46 insertions(+), 38 deletions(-) delete mode 100644 common/scripts/select-packages.js create mode 100644 sdk/template/ci.yml diff --git a/common/scripts/select-packages.js b/common/scripts/select-packages.js deleted file mode 100644 index a6ea3a6a032b..000000000000 --- a/common/scripts/select-packages.js +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. -// See the @microsoft/rush package's LICENSE file for license information. - -// This script searches for package.json files recursively under a given path -// excluding packages under a node_modules folder and opens them to determine -// whether they contain a "sdk-archetype" field with the value of "client". -// -// If they do, then the package name is recorded and then after all package.json files -// have been scanned a single string is output using the Azure Pipelines Commands special -// syntax which creates a variable for use within a later stage of the pipeine. - -console.log( - '##vso[task.setvariable variable=GeneratedPackageTargets;]--to "@azure/core-http" --to "@azure/amqp-common" --to "@azure/abort-controller"' -); diff --git a/eng/pipelines/templates/steps/select-packages.yml b/eng/pipelines/templates/steps/select-packages.yml index 0d07fb40dc81..92387c833526 100644 --- a/eng/pipelines/templates/steps/select-packages.yml +++ b/eng/pipelines/templates/steps/select-packages.yml @@ -1,7 +1,7 @@ steps: - script: | npm ci # This causes us to download packages exclusively based on the lock file, faster and more secure. - npm run select-packages "$(System.DefaultWorkingDirectory)/${{parameters.ServiceDirectory}}/!(arm-*)/package.json" + npm run select-packages "$(System.DefaultWorkingDirectory)/sdk/${{parameters.ServiceDirectory}}/!(arm-*)/package.json" workingDirectory: $(System.DefaultWorkingDirectory)/eng/tools/select-packages name: SelectPackages displayName: "Selecting packages to build" diff --git a/sdk/core/amqp-common/ci.yml b/sdk/core/amqp-common/ci.yml index d4da4b9a9035..923cb36374b5 100644 --- a/sdk/core/amqp-common/ci.yml +++ b/sdk/core/amqp-common/ci.yml @@ -14,4 +14,4 @@ pr: jobs: - template: ../../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - ServiceDirectory: sdk/core/ + ServiceDirectory: core diff --git a/sdk/core/ci.yml b/sdk/core/ci.yml index 98900401a5a9..560448d7b913 100644 --- a/sdk/core/ci.yml +++ b/sdk/core/ci.yml @@ -20,4 +20,4 @@ pr: jobs: - template: ../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - ServiceDirectory: sdk/core/ + ServiceDirectory: core diff --git a/sdk/core/core-http/ci.yml b/sdk/core/core-http/ci.yml index d4da4b9a9035..923cb36374b5 100644 --- a/sdk/core/core-http/ci.yml +++ b/sdk/core/core-http/ci.yml @@ -14,4 +14,4 @@ pr: jobs: - template: ../../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - ServiceDirectory: sdk/core/ + ServiceDirectory: core diff --git a/sdk/cosmosdb/ci.yml b/sdk/cosmosdb/ci.yml index ac2c25e8ca78..ec63133629b4 100644 --- a/sdk/cosmosdb/ci.yml +++ b/sdk/cosmosdb/ci.yml @@ -20,7 +20,7 @@ pr: jobs: - template: ../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - ServiceDirectory: sdk/cosmosdb/ + ServiceDirectory: cosmosdb - template: ../../eng/pipelines/templates/jobs/node6-test-sdk-client.yml parameters: diff --git a/sdk/cosmosdb/cosmos/ci.yml b/sdk/cosmosdb/cosmos/ci.yml index e8a0f1fd2725..30ca671cf4be 100644 --- a/sdk/cosmosdb/cosmos/ci.yml +++ b/sdk/cosmosdb/cosmos/ci.yml @@ -14,7 +14,7 @@ pr: jobs: - template: ../../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - ServiceDirectory: sdk/cosmosdb/ + ServiceDirectory: cosmosdb # HACK: Because Rush doesn't support Node 6.x this is done to use NPM to build # and test on that version of Node. diff --git a/sdk/eventhub/ci.yml b/sdk/eventhub/ci.yml index 75a2107d5cab..800360e93b4d 100644 --- a/sdk/eventhub/ci.yml +++ b/sdk/eventhub/ci.yml @@ -20,4 +20,4 @@ pr: jobs: - template: ../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - ServiceDirectory: sdk/eventhub/ + ServiceDirectory: eventhub diff --git a/sdk/eventhub/event-hubs/ci.yml b/sdk/eventhub/event-hubs/ci.yml index 1d9c55f2b419..fccd8301d310 100644 --- a/sdk/eventhub/event-hubs/ci.yml +++ b/sdk/eventhub/event-hubs/ci.yml @@ -14,4 +14,4 @@ pr: jobs: - template: ../../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - ServiceDirectory: sdk/eventhub/ + ServiceDirectory: eventhub diff --git a/sdk/eventhub/event-processor-host/ci.yml b/sdk/eventhub/event-processor-host/ci.yml index f789ef4f8ce5..afed3d2d0d9b 100644 --- a/sdk/eventhub/event-processor-host/ci.yml +++ b/sdk/eventhub/event-processor-host/ci.yml @@ -14,4 +14,4 @@ pr: jobs: - template: ../../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - ServiceDirectory: sdk/eventhub/ + ServiceDirectory: eventhub diff --git a/sdk/identity/ci.yml b/sdk/identity/ci.yml index 58bcb0b5a973..5cf01afa4447 100644 --- a/sdk/identity/ci.yml +++ b/sdk/identity/ci.yml @@ -20,4 +20,4 @@ pr: jobs: - template: ../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - ServiceDirectory: sdk/identity/ + ServiceDirectory: identity diff --git a/sdk/identity/identity/ci.yml b/sdk/identity/identity/ci.yml index a941749d424c..0daf4e1be47d 100644 --- a/sdk/identity/identity/ci.yml +++ b/sdk/identity/identity/ci.yml @@ -9,9 +9,9 @@ pr: - master paths: include: - - sdk/identity/identity/ + - sdk/identity/ jobs: - template: ../../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - PackageName: "@azure/identity" + ServiceDirectory: identity diff --git a/sdk/keyvault/ci.yml b/sdk/keyvault/ci.yml index 7f51f892d665..d158e16ab014 100644 --- a/sdk/keyvault/ci.yml +++ b/sdk/keyvault/ci.yml @@ -20,4 +20,4 @@ pr: jobs: - template: ../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - ServiceDirectory: sdk/keyvault/ + ServiceDirectory: keyvault diff --git a/sdk/keyvault/keyvault-keys/ci.yml b/sdk/keyvault/keyvault-keys/ci.yml index 1c3405ac2ce6..50efd8d00faf 100644 --- a/sdk/keyvault/keyvault-keys/ci.yml +++ b/sdk/keyvault/keyvault-keys/ci.yml @@ -9,9 +9,9 @@ pr: - master paths: include: - - sdk/keyvault/keyvault-keys/ + - sdk/keyvault/ jobs: - template: ../../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - PackageName: "@azure/keyvault-keys" + ServiceDirectory: keyvault diff --git a/sdk/keyvault/keyvault-secrets/ci.yml b/sdk/keyvault/keyvault-secrets/ci.yml index fea988d8df7a..50efd8d00faf 100644 --- a/sdk/keyvault/keyvault-secrets/ci.yml +++ b/sdk/keyvault/keyvault-secrets/ci.yml @@ -9,9 +9,9 @@ pr: - master paths: include: - - sdk/keyvault/keyvault-secrets/ + - sdk/keyvault/ jobs: - template: ../../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - PackageName: "@azure/keyvault-secrets" + ServiceDirectory: keyvault diff --git a/sdk/servicebus/ci.yml b/sdk/servicebus/ci.yml index 4de31ea0ebce..1464357f8e4b 100644 --- a/sdk/servicebus/ci.yml +++ b/sdk/servicebus/ci.yml @@ -20,4 +20,4 @@ pr: jobs: - template: ../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - ServiceDirectory: sdk/servicebus/ + ServiceDirectory: servicebus diff --git a/sdk/servicebus/service-bus/ci.yml b/sdk/servicebus/service-bus/ci.yml index 298f4ee0de94..b3135d314bc4 100644 --- a/sdk/servicebus/service-bus/ci.yml +++ b/sdk/servicebus/service-bus/ci.yml @@ -14,4 +14,4 @@ pr: jobs: - template: ../../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - ServiceDirectory: sdk/servicebus/ + ServiceDirectory: servicebus diff --git a/sdk/storage/ci.yml b/sdk/storage/ci.yml index 3c7b3fbc4f99..4d461415c8ae 100644 --- a/sdk/storage/ci.yml +++ b/sdk/storage/ci.yml @@ -20,4 +20,4 @@ pr: jobs: - template: ../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - ServiceDirectory: sdk/storage/ + ServiceDirectory: storage diff --git a/sdk/storage/storage-blob/ci.yml b/sdk/storage/storage-blob/ci.yml index 32c69310057f..6d6a2bb7570b 100644 --- a/sdk/storage/storage-blob/ci.yml +++ b/sdk/storage/storage-blob/ci.yml @@ -14,4 +14,4 @@ pr: jobs: - template: ../../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - ServiceDirectory: sdk/storage/ + ServiceDirectory: storage diff --git a/sdk/storage/storage-datalake/package.json b/sdk/storage/storage-datalake/package.json index 8f14ca89a17b..4fe400fb795c 100644 --- a/sdk/storage/storage-datalake/package.json +++ b/sdk/storage/storage-datalake/package.json @@ -1,6 +1,5 @@ { "name": "@azure/storage-datalake", - "sdk-type": "client", "author": "Microsoft Corporation", "description": "DataLakeStorageClient Library with typescript type definitions for node.js and browser.", "version": "0.1.1", diff --git a/sdk/storage/storage-file/ci.yml b/sdk/storage/storage-file/ci.yml index 32c69310057f..6d6a2bb7570b 100644 --- a/sdk/storage/storage-file/ci.yml +++ b/sdk/storage/storage-file/ci.yml @@ -14,4 +14,4 @@ pr: jobs: - template: ../../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - ServiceDirectory: sdk/storage/ + ServiceDirectory: storage diff --git a/sdk/storage/storage-queue/ci.yml b/sdk/storage/storage-queue/ci.yml index 32c69310057f..6d6a2bb7570b 100644 --- a/sdk/storage/storage-queue/ci.yml +++ b/sdk/storage/storage-queue/ci.yml @@ -14,4 +14,4 @@ pr: jobs: - template: ../../../eng/pipelines/templates/jobs/archetype-sdk-client.yml parameters: - ServiceDirectory: sdk/storage/ + ServiceDirectory: storage diff --git a/sdk/template/ci.yml b/sdk/template/ci.yml new file mode 100644 index 000000000000..afc431e05de1 --- /dev/null +++ b/sdk/template/ci.yml @@ -0,0 +1,23 @@ +# DO NOT EDIT THIS FILE +# This file is generated automatically and any changes will be lost. + +trigger: + branches: + include: + - master + paths: + include: + - sdk/template/ + +pr: + branches: + include: + - master + paths: + include: + - sdk/template/ + +jobs: + - template: ../../eng/pipelines/templates/jobs/archetype-sdk-client.yml + parameters: + ServiceDirectory: template