From 8d073b88149e518e3581c3431a09c56e9f75a64a Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Tue, 4 Dec 2018 14:27:35 -0800 Subject: [PATCH 1/9] Add unified release build (without windows) --- .../releaseBuild/azureDevOps/releaseBuild.yml | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 tools/releaseBuild/azureDevOps/releaseBuild.yml diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml new file mode 100644 index 00000000000..3f2e2cba72c --- /dev/null +++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml @@ -0,0 +1,40 @@ +name: UnifiedPackageBuild-$(Build.BuildId) +trigger: + branches: + include: + - master + - release* +pr: + branches: + include: + - master + - release* + + +variables: + DOTNET_CLI_TELEMETRY_OPTOUT: 1 + POWERSHELL_TELEMETRY_OPTOUT: 1 + +resources: +- repo: self + clean: true +jobs: +- template: templates/linux.yml + parameters: + jobName: DEB + buildName: ubuntu.14.04-no-appimage + pool: Hosted Ubuntu 1604 + +- template: templates/linux.yml + parameters: + jobName: RPM + buildName: centos.7 + pool: Hosted Ubuntu 1604 + +- template: templates/linux.yml + parameters: + jobName: fxdependent + buildName: fxdependent + pool: Hosted Ubuntu 1604 + +- template: templates/mac.yml From 74b8c315b0925456feaf6f74b2551698cb3bcd27 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Tue, 4 Dec 2018 15:34:37 -0800 Subject: [PATCH 2/9] convert builds to template --- .../azureDevOps/templates/linux.yml | 113 ++++++++++++++++++ .../azureDevOps/templates/mac.yml | 41 +++++++ 2 files changed, 154 insertions(+) create mode 100644 tools/releaseBuild/azureDevOps/templates/linux.yml create mode 100644 tools/releaseBuild/azureDevOps/templates/mac.yml diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml new file mode 100644 index 00000000000..cd92dc82c78 --- /dev/null +++ b/tools/releaseBuild/azureDevOps/templates/linux.yml @@ -0,0 +1,113 @@ +parameters: + jobName: 'none' + buildName: '' + +jobs: +- job: build_${{ parameters.jobName }} + displayName: Build ${{ parameters.jobName }} + condition: succeeded() + pool: Hosted Ubuntu 1604 + variables: + build: ${{ parameters.buildName }} + steps: + + - powershell: | + tools/releaseBuild/setReleaseTag.ps1 -ReleaseTag $(ReleaseTagVar) -Variable "ReleaseTagVar" + displayName: 'Run setReleaseTag.ps1' + + - powershell: | + Write-Verbose -Verbose "$(build)" + + if ('$(build)' -in 'alpine.3', 'fxdependent' -and '$(ReleaseTagVar)' -match '6.0.*') + { + $vstsCommandString = "vso[task.setvariable variable=SkipBuild]true" + } + else + { + $vstsCommandString = "vso[task.setvariable variable=SkipBuild]false" + } + displayName: 'Skip Alpine or fxdependent for PS v6.0.*' + + - powershell: | + Import-Module $(Build.SourcesDirectory)/build.psm1 -Force + New-NugetConfigFile -NugetFeedUrl $(AzDevOpsFeed) -UserName $(AzDevOpsFeedUserName) -ClearTextPAT $(AzDevOpsFeedPAT) -FeedName AzDevOpsFeed -Destination $(Build.SourcesDirectory)/src/Modules + + if(-not (Test-Path "$(Build.SourcesDirectory)/src/Modules/nuget.config")) + { + throw "nuget.config is not created" + } + displayName: 'Add nuget.config for AzDevOps feed for PSGallery modules ' + condition: ne(Variables['SkipBuild'],'true') + + - powershell: | + import-module ./build.psm1 + Sync-PSTags -AddRemoteIfMissing + displayName: SyncTags + condition: and(succeeded(), ne(variables['SkipBuild'], 'true')) + + - powershell: | + tools/releaseBuild/vstsbuild.ps1 -ReleaseTag $(ReleaseTagVar) -Name '$(build)' + displayName: 'Build and package' + condition: and(succeeded(), ne(variables['SkipBuild'], 'true')) + +- job: upload_${{ parameters.jobName }} + displayName: Upload ${{ parameters.jobName }} + dependsOn: build_${{ parameters.jobName }} + condition: succeeded() + pool: Package ES CodeHub Lab E + variables: + jobName: ${{ parameters.jobName }} + steps: + + - powershell: | + tools/releaseBuild/setReleaseTag.ps1 -ReleaseTag $(ReleaseTagVar) -Variable "ReleaseTagVar" + displayName: 'Set ReleaseTag' + + - powershell: | + $azureVersion = $env:ReleaseTagVar.ToLowerInvariant() -replace '\.', '-' + $vstsCommandString = "vso[task.setvariable variable=AzureVersion]$azureVersion" + Write-Host "sending " + $vstsCommandString + Write-Host "##$vstsCommandString" + displayName: 'Set Version for Blob Storage' + + - task: DownloadBuildArtifacts@0 + displayName: 'Download Deb Artifacts' + inputs: + downloadType: specific + itemPattern: '**/*.deb' + downloadPath: '$(System.ArtifactsDirectory)\finished' + condition: and(eq(variables['jobName'], 'DEB'),succeeded()) + + - task: DownloadBuildArtifacts@0 + displayName: 'Download tar.gz Artifacts copy' + inputs: + downloadType: specific + itemPattern: '**/*.tar.gz' + downloadPath: '$(System.ArtifactsDirectory)\finished' + + - task: DownloadBuildArtifacts@0 + displayName: 'Download rpm Artifacts copy' + inputs: + downloadType: specific + itemPattern: '**/*.rpm' + downloadPath: '$(System.ArtifactsDirectory)\rpm' + condition: and(eq(variables['jobName'], 'RPM'),succeeded()) + + - task: AzureFileCopy@1 + displayName: 'Upload to azure deb and tar.gz' + inputs: + SourcePath: '$(System.ArtifactsDirectory)\finished\release' + azureSubscription: '$(AzureFileCopySubscription)' + Destination: AzureBlob + storage: '$(StorageAccount)' + ContainerName: '$(AzureVersion)' + + - task: AzureFileCopy@1 + displayName: 'Upload to azure rpm' + inputs: + SourcePath: '$(System.ArtifactsDirectory)\rpm\release' + azureSubscription: '$(AzureFileCopySubscription)' + Destination: AzureBlob + storage: '$(StorageAccount)' + ContainerName: '$(AzureVersion)-unsigned' + condition: and(eq(variables['jobName'], 'RPM'),succeeded()) diff --git a/tools/releaseBuild/azureDevOps/templates/mac.yml b/tools/releaseBuild/azureDevOps/templates/mac.yml new file mode 100644 index 00000000000..7a3d711fcca --- /dev/null +++ b/tools/releaseBuild/azureDevOps/templates/mac.yml @@ -0,0 +1,41 @@ +parameters: + jobName: 'build_macOS' + +jobs: +- job: ${{ parameters.jobName }} + displayName: Build macOS + condition: succeeded() + pool: Hosted macOS Preview + steps: + #- task: @ + # inputs: + # + # displayName: '' + - powershell: | + tools/releaseBuild/setReleaseTag.ps1 -ReleaseTag $(ReleaseTagVar) -Variable "ReleaseTagVar" + displayName: 'Calculate Release Tag' + - task: ShellScript@2 + inputs: + scriptPath: 'tools/releaseBuild/macOS/createPowerShell.sh' + displayName: 'Create /PowerShell' + - powershell: | + Write-Host "##vso[task.setvariable variable=PowerShellRoot]/PowerShell" + git clone $env:BUILD_REPOSITORY_LOCALPATH /PowerShell + displayName: Clone PowerShell Repo to /PowerShell + - powershell: | + tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -location $(PowerShellRoot) -BootStrap + displayName: 'Bootstrap VM' + - powershell: | + Import-Module $(Build.SourcesDirectory)/build.psm1 -Force + New-NugetConfigFile -NugetFeedUrl $(AzDevOpsFeed) -UserName $(AzDevOpsFeedUserName) -ClearTextPAT $(AzDevOpsFeedPAT) -FeedName AzDevOpsFeed -Destination "$(PowerShellRoot)/src/Modules" + + if(-not (Test-Path "$(PowerShellRoot)/src/Modules/nuget.config")) + { + throw "nuget.config is not created" + } + displayName: 'Add nuget.config for AzDevOps feed for PSGallery modules ' + - powershell: | + $env:AZDEVOPSFEEDPAT = '$(AzDevOpsFeedPAT)' + $(Build.SourcesDirectory)/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -ReleaseTag $(ReleaseTagVar) -Destination $(System.ArtifactsDirectory) -ExtraPackage "tar" -location $(PowerShellRoot) -Build + $env:AZDEVOPSFEEDPAT = $null + displayName: 'Build and Package' From 2b8cbf48816e767a0b4f9e6e2a4a33a80406269e Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Tue, 4 Dec 2018 15:54:26 -0800 Subject: [PATCH 3/9] remove unused linux yml --- tools/releaseBuild/azureDevOps/LinuxBuild.yml | 115 ------------------ 1 file changed, 115 deletions(-) delete mode 100644 tools/releaseBuild/azureDevOps/LinuxBuild.yml diff --git a/tools/releaseBuild/azureDevOps/LinuxBuild.yml b/tools/releaseBuild/azureDevOps/LinuxBuild.yml deleted file mode 100644 index 10761d771f2..00000000000 --- a/tools/releaseBuild/azureDevOps/LinuxBuild.yml +++ /dev/null @@ -1,115 +0,0 @@ -resources: -- repo: self - clean: true -jobs: - -- job: BuildJob - displayName: Build - condition: succeeded() - pool: Hosted Ubuntu 1604 - strategy: - matrix: - deb packages: - build: ubuntu.14.04-no-appimage - rpm packages: - build: centos.7 - fxdependent package: - build: fxdependent - steps: - - - powershell: | - tools/releaseBuild/setReleaseTag.ps1 -ReleaseTag $(ReleaseTag) - displayName: 'Run setReleaseTag.ps1' - - - powershell: | - Write-Verbose -Verbose "$(build)" - - if ('$(build)' -eq 'fxdependent' -and '$(ReleaseTag)' -match '6.0.*') - { - $vstsCommandString = "vso[task.setvariable variable=SkipFxDependent]true" - } - else - { - $vstsCommandString = "vso[task.setvariable variable=SkipFxDependent]false" - } - - Write-Verbose -Message "$vstsCommandString " -Verbose - Write-Host -Object "##$vstsCommandString" - displayName: 'Skip FxDependent for PS v6.0.*' - - - powershell: | - import-module ./build.psm1 - Sync-PSTags -AddRemoteIfMissing - displayName: SyncTags - condition: and(succeeded(), ne(variables['SkipFxDependent'], 'true')) - - - powershell: | - tools/releaseBuild/vstsbuild.ps1 -ReleaseTag $(ReleaseTag) -Name '$(build)' - displayName: 'Build and package' - condition: and(succeeded(), ne(variables['SkipFxDependent'], 'true')) - - -- job: UploadJob - displayName: Upload to Azure - dependsOn: BuildJob - condition: succeeded() - pool: Package ES CodeHub Lab E - steps: - - - powershell: | - ./tools/releaseBuild/setReleaseTag.ps1 -ReleaseTag $(ReleaseTag) - displayName: 'Set ReleaseTag' - - - powershell: | - if ($env:build -eq 'fxdependent' -and $env:ReleaseTag -match '6.0.*') - { - $vstsCommandString = "vso[task.setvariable variable=SkipFxDependent]true" - Write-Host -Object $vstsCommandString - } - displayName: 'Check if multiplier is applicable ' - - - powershell: | - $azureVersion = $env:ReleaseTag.ToLowerInvariant() -replace '\.', '-' - $vstsCommandString = "vso[task.setvariable variable=AzureVersion]$azureVersion" - Write-Host "sending " + $vstsCommandString - Write-Host "##$vstsCommandString" - displayName: 'Set Version for Blob Storage' - - - task: DownloadBuildArtifacts@0 - displayName: 'Download Deb Artifacts' - inputs: - downloadType: specific - itemPattern: '**/*.deb' - downloadPath: '$(System.ArtifactsDirectory)\finished' - - - task: DownloadBuildArtifacts@0 - displayName: 'Download tar.gz Artifacts copy' - inputs: - downloadType: specific - itemPattern: '**/*.tar.gz' - downloadPath: '$(System.ArtifactsDirectory)\finished' - - - task: DownloadBuildArtifacts@0 - displayName: 'Download rpm Artifacts copy' - inputs: - downloadType: specific - itemPattern: '**/*.rpm' - downloadPath: '$(System.ArtifactsDirectory)\rpm' - - - task: AzureFileCopy@1 - displayName: 'Upload to azure deb and tar.gz' - inputs: - SourcePath: '$(System.ArtifactsDirectory)\finished\release' - azureSubscription: '$(AzureFileCopySubscription)' - Destination: AzureBlob - storage: '$(StorageAccount)' - ContainerName: '$(AzureVersion)' - - - task: AzureFileCopy@1 - displayName: 'Upload to azure rpm' - inputs: - SourcePath: '$(System.ArtifactsDirectory)\rpm\release' - azureSubscription: '$(AzureFileCopySubscription)' - Destination: AzureBlob - storage: '$(StorageAccount)' - ContainerName: '$(AzureVersion)-unsigned' From f677617fe0c21dba30323b4a1667fc2909d57e47 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Tue, 4 Dec 2018 16:19:54 -0800 Subject: [PATCH 4/9] Address PR feedback --- tools/releaseBuild/azureDevOps/releaseBuild.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml index 3f2e2cba72c..57b8a7d53e9 100644 --- a/tools/releaseBuild/azureDevOps/releaseBuild.yml +++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml @@ -10,14 +10,15 @@ pr: - master - release* - variables: DOTNET_CLI_TELEMETRY_OPTOUT: 1 POWERSHELL_TELEMETRY_OPTOUT: 1 +# Set AzDevOps Agent to clean the machine after the end of the build resources: - repo: self clean: true + jobs: - template: templates/linux.yml parameters: From d6dc58941b260e4288e7cb399ab0f587cd24f5dd Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Tue, 4 Dec 2018 17:28:10 -0800 Subject: [PATCH 5/9] move createPowerShell.sh into a inline script --- tools/releaseBuild/azureDevOps/templates/mac.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/releaseBuild/azureDevOps/templates/mac.yml b/tools/releaseBuild/azureDevOps/templates/mac.yml index 7a3d711fcca..ba2cd4bdbb0 100644 --- a/tools/releaseBuild/azureDevOps/templates/mac.yml +++ b/tools/releaseBuild/azureDevOps/templates/mac.yml @@ -14,9 +14,12 @@ jobs: - powershell: | tools/releaseBuild/setReleaseTag.ps1 -ReleaseTag $(ReleaseTagVar) -Variable "ReleaseTagVar" displayName: 'Calculate Release Tag' - - task: ShellScript@2 - inputs: - scriptPath: 'tools/releaseBuild/macOS/createPowerShell.sh' + - powershell: | + # create folder + sudo mkdir /PowerShell + + # make the current user the owner + sudo chown $env:USER /PowerShell displayName: 'Create /PowerShell' - powershell: | Write-Host "##vso[task.setvariable variable=PowerShellRoot]/PowerShell" From 77a7523e05e90fb5661154633c6e8cf4d3ca4cfe Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Tue, 4 Dec 2018 17:15:25 -0800 Subject: [PATCH 6/9] add alpine --- tools/releaseBuild/azureDevOps/releaseBuild.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml index 57b8a7d53e9..7a867a4fa01 100644 --- a/tools/releaseBuild/azureDevOps/releaseBuild.yml +++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml @@ -38,4 +38,11 @@ jobs: buildName: fxdependent pool: Hosted Ubuntu 1604 +- template: templates/linux.yml + parameters: + jobName: Alpine + buildName: alpine.3 + pool: Hosted Ubuntu 1604 + + - template: templates/mac.yml From 60a58c465d389a2a2d20ae71456e2baf2aca082d Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Tue, 4 Dec 2018 17:23:37 -0800 Subject: [PATCH 7/9] simplify linux release build template for simpler buildNames --- .../azureDevOps/templates/linux.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml index cd92dc82c78..58cad5badab 100644 --- a/tools/releaseBuild/azureDevOps/templates/linux.yml +++ b/tools/releaseBuild/azureDevOps/templates/linux.yml @@ -1,10 +1,9 @@ parameters: - jobName: 'none' buildName: '' jobs: -- job: build_${{ parameters.jobName }} - displayName: Build ${{ parameters.jobName }} +- job: build_${{ parameters.buildName }} + displayName: Build ${{ parameters.buildName }} condition: succeeded() pool: Hosted Ubuntu 1604 variables: @@ -50,13 +49,13 @@ jobs: displayName: 'Build and package' condition: and(succeeded(), ne(variables['SkipBuild'], 'true')) -- job: upload_${{ parameters.jobName }} - displayName: Upload ${{ parameters.jobName }} - dependsOn: build_${{ parameters.jobName }} +- job: upload_${{ parameters.buildName }} + displayName: Upload ${{ parameters.buildName }} + dependsOn: build_${{ parameters.buildName }} condition: succeeded() pool: Package ES CodeHub Lab E variables: - jobName: ${{ parameters.jobName }} + buildName: ${{ parameters.buildName }} steps: - powershell: | @@ -76,7 +75,7 @@ jobs: downloadType: specific itemPattern: '**/*.deb' downloadPath: '$(System.ArtifactsDirectory)\finished' - condition: and(eq(variables['jobName'], 'DEB'),succeeded()) + condition: and(eq(variables['buildName'], 'DEB'),succeeded()) - task: DownloadBuildArtifacts@0 displayName: 'Download tar.gz Artifacts copy' @@ -91,7 +90,7 @@ jobs: downloadType: specific itemPattern: '**/*.rpm' downloadPath: '$(System.ArtifactsDirectory)\rpm' - condition: and(eq(variables['jobName'], 'RPM'),succeeded()) + condition: and(eq(variables['buildName'], 'RPM'),succeeded()) - task: AzureFileCopy@1 displayName: 'Upload to azure deb and tar.gz' @@ -110,4 +109,4 @@ jobs: Destination: AzureBlob storage: '$(StorageAccount)' ContainerName: '$(AzureVersion)-unsigned' - condition: and(eq(variables['jobName'], 'RPM'),succeeded()) + condition: and(eq(variables['buildName'], 'RPM'),succeeded()) From d160b276d20ba1178491317cf4940f97c56e38fc Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Tue, 4 Dec 2018 17:27:18 -0800 Subject: [PATCH 8/9] simplify Linux build names --- tools/releaseBuild/azureDevOps/releaseBuild.yml | 11 +++-------- .../azureDevOps/templates/linux.yml | 2 +- tools/releaseBuild/build.json | 17 ++++------------- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml index 7a867a4fa01..9fafb1cd00c 100644 --- a/tools/releaseBuild/azureDevOps/releaseBuild.yml +++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml @@ -22,27 +22,22 @@ resources: jobs: - template: templates/linux.yml parameters: - jobName: DEB - buildName: ubuntu.14.04-no-appimage + buildName: deb pool: Hosted Ubuntu 1604 - template: templates/linux.yml parameters: - jobName: RPM - buildName: centos.7 + buildName: rpm pool: Hosted Ubuntu 1604 - template: templates/linux.yml parameters: - jobName: fxdependent buildName: fxdependent pool: Hosted Ubuntu 1604 - template: templates/linux.yml parameters: - jobName: Alpine - buildName: alpine.3 + buildName: alpine pool: Hosted Ubuntu 1604 - - template: templates/mac.yml diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml index 58cad5badab..bf12a981df5 100644 --- a/tools/releaseBuild/azureDevOps/templates/linux.yml +++ b/tools/releaseBuild/azureDevOps/templates/linux.yml @@ -17,7 +17,7 @@ jobs: - powershell: | Write-Verbose -Verbose "$(build)" - if ('$(build)' -in 'alpine.3', 'fxdependent' -and '$(ReleaseTagVar)' -match '6.0.*') + if ('$(build)' -in 'alpine', 'fxdependent' -and '$(ReleaseTagVar)' -match '6.0.*') { $vstsCommandString = "vso[task.setvariable variable=SkipBuild]true" } diff --git a/tools/releaseBuild/build.json b/tools/releaseBuild/build.json index ca7f57f9aa7..4801821c8cd 100644 --- a/tools/releaseBuild/build.json +++ b/tools/releaseBuild/build.json @@ -241,7 +241,7 @@ ], "Linux": [ { - "Name": "ubuntu.14.04", + "Name": "ubuntu.14.04-unused", "RepoDestinationPath": "/PowerShell", "BuildCommand": "/PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -ReleaseTag _ReleaseTag_ -AppImage -TarX64 -TarArm", "BuildDockerOptions": [ @@ -259,7 +259,7 @@ "BinaryBucket": "release" }, { - "Name": "ubuntu.14.04-no-appimage", + "Name": "deb", "RepoDestinationPath": "/PowerShell", "BuildCommand": "/PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -ReleaseTag _ReleaseTag_ -TarX64 -TarArm -TarArm64", "DockerFile": "./tools/releaseBuild/Images/microsoft_powershell_ubuntu14.04/Dockerfile", @@ -268,16 +268,7 @@ "BinaryBucket": "release" }, { - "Name": "ubuntu.16.04", - "RepoDestinationPath": "/PowerShell", - "BuildCommand": "/PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -ReleaseTag _ReleaseTag_", - "AdditionalContextFiles" :[ "./tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1"], - "DockerFile": "./tools/releaseBuild/Images/microsoft_powershell_ubuntu16.04/Dockerfile", - "DockerImageName": "ps-ubunutu-16-04", - "BinaryBucket": "release" - }, - { - "Name": "centos.7", + "Name": "rpm", "RepoDestinationPath": "/PowerShell", "BuildCommand": "/PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -ReleaseTag _ReleaseTag_", "AdditionalContextFiles" :[ "./tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1"], @@ -286,7 +277,7 @@ "BinaryBucket": "release" }, { - "Name": "alpine.3", + "Name": "alpine", "RepoDestinationPath": "/PowerShell", "BuildCommand": "/PowerShellPackage.ps1 -location _RepoDestinationPath_ -destination _DockerVolume_ -ReleaseTag _ReleaseTag_ -Alpine", "AdditionalContextFiles" :[ "./tools/releaseBuild/Images/GenericLinuxFiles/PowerShellPackage.ps1"], From 685bea5ccaff580ad38221ee29385389b09a4b2a Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Tue, 4 Dec 2018 17:24:55 -0800 Subject: [PATCH 9/9] remove unused pool parameter from Linux builds --- tools/releaseBuild/azureDevOps/releaseBuild.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml index 9fafb1cd00c..bf3f3f235c4 100644 --- a/tools/releaseBuild/azureDevOps/releaseBuild.yml +++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml @@ -23,21 +23,17 @@ jobs: - template: templates/linux.yml parameters: buildName: deb - pool: Hosted Ubuntu 1604 - template: templates/linux.yml parameters: buildName: rpm - pool: Hosted Ubuntu 1604 - template: templates/linux.yml parameters: buildName: fxdependent - pool: Hosted Ubuntu 1604 - template: templates/linux.yml parameters: buildName: alpine - pool: Hosted Ubuntu 1604 - template: templates/mac.yml