From 7442b8a236820e457bc02414ff56a504522e3965 Mon Sep 17 00:00:00 2001 From: Denis Rumyantsev Date: Mon, 28 Aug 2023 20:34:53 +0400 Subject: [PATCH] Enable CI for Alpine (x64) (#4404) --- .azure-pipelines/pipeline.yml | 4 +-- .vsts.ci.yml | 2 +- releaseNote.md | 40 ++++++++++++++++------- src/Misc/InstallAgentPackage.template.xml | 5 +++ src/Misc/Publish.template.ps1 | 2 ++ src/Misc/PublishVSTSAgent.template.ps1 | 15 --------- src/Misc/UnpublishVSTSAgent.template.ps1 | 15 --------- 7 files changed, 38 insertions(+), 45 deletions(-) delete mode 100644 src/Misc/PublishVSTSAgent.template.ps1 delete mode 100644 src/Misc/UnpublishVSTSAgent.template.ps1 diff --git a/.azure-pipelines/pipeline.yml b/.azure-pipelines/pipeline.yml index c5c52e3ccc..6299ae7555 100644 --- a/.azure-pipelines/pipeline.yml +++ b/.azure-pipelines/pipeline.yml @@ -51,7 +51,7 @@ parameters: default: true - name: alpine_x64 type: boolean - default: false + default: true - name: rhel7_x64 type: boolean default: true @@ -214,7 +214,7 @@ stages: functionalTests: ${{ parameters.test }} sign: false publishArtifacts: ${{ parameters.publishArtifacts }} - buildAlternatePackage: ${{ parameters.buildAlternatePackage }} + buildAlternatePackage: false # RHEL7 (x64) - ${{ if parameters.rhel7_x64 }}: diff --git a/.vsts.ci.yml b/.vsts.ci.yml index e81ba943b4..160ba5f21c 100644 --- a/.vsts.ci.yml +++ b/.vsts.ci.yml @@ -22,7 +22,7 @@ parameters: - name: alpine_x64 type: boolean displayName: Alpine (x64) - default: false + default: true - name: rhel7_x64 type: boolean displayName: RHEL 7 (x64) diff --git a/releaseNote.md b/releaseNote.md index 54b6427bba..c8957303a0 100644 --- a/releaseNote.md +++ b/releaseNote.md @@ -1,15 +1,16 @@ ## Agent Downloads -| | Package | SHA-256 | -| ----------- | ------- | ------- | -| Windows x64 | [vsts-agent-win-x64-.zip](https://vstsagentpackage.azureedge.net/agent//vsts-agent-win-x64-.zip) | | -| Windows x86 | [vsts-agent-win-x86-.zip](https://vstsagentpackage.azureedge.net/agent//vsts-agent-win-x86-.zip) | | -| macOS x64 | [vsts-agent-osx-x64-.tar.gz](https://vstsagentpackage.azureedge.net/agent//vsts-agent-osx-x64-.tar.gz) | | -| macOS arm64 | [vsts-agent-osx-arm64-.tar.gz](https://vstsagentpackage.azureedge.net/agent//vsts-agent-osx-arm64-.tar.gz) | | -| Linux x64 | [vsts-agent-linux-x64-.tar.gz](https://vstsagentpackage.azureedge.net/agent//vsts-agent-linux-x64-.tar.gz) | | -| Linux ARM | [vsts-agent-linux-arm-.tar.gz](https://vstsagentpackage.azureedge.net/agent//vsts-agent-linux-arm-.tar.gz) | | -| Linux ARM64 | [vsts-agent-linux-arm64-.tar.gz](https://vstsagentpackage.azureedge.net/agent//vsts-agent-linux-arm64-.tar.gz) | | +| | Package | SHA-256 | +| -------------- | ------- | ------- | +| Windows x64 | [vsts-agent-win-x64-.zip](https://vstsagentpackage.azureedge.net/agent//vsts-agent-win-x64-.zip) | | +| Windows x86 | [vsts-agent-win-x86-.zip](https://vstsagentpackage.azureedge.net/agent//vsts-agent-win-x86-.zip) | | +| macOS x64 | [vsts-agent-osx-x64-.tar.gz](https://vstsagentpackage.azureedge.net/agent//vsts-agent-osx-x64-.tar.gz) | | +| macOS arm64 | [vsts-agent-osx-arm64-.tar.gz](https://vstsagentpackage.azureedge.net/agent//vsts-agent-osx-arm64-.tar.gz) | | +| Linux x64 | [vsts-agent-linux-x64-.tar.gz](https://vstsagentpackage.azureedge.net/agent//vsts-agent-linux-x64-.tar.gz) | | +| Linux ARM | [vsts-agent-linux-arm-.tar.gz](https://vstsagentpackage.azureedge.net/agent//vsts-agent-linux-arm-.tar.gz) | | +| Linux ARM64 | [vsts-agent-linux-arm64-.tar.gz](https://vstsagentpackage.azureedge.net/agent//vsts-agent-linux-arm64-.tar.gz) | | +| Linux musl x64 | [vsts-agent-linux-musl-x64-.tar.gz](https://vstsagentpackage.azureedge.net/agent//vsts-agent-linux-musl-x64-.tar.gz) | | After Download: @@ -27,13 +28,20 @@ C:\> mkdir myagent && cd myagent C:\myagent> Add-Type -AssemblyName System.IO.Compression.FileSystem ; [System.IO.Compression.ZipFile]::ExtractToDirectory("$HOME\Downloads\vsts-agent-win-x86-.zip", "$PWD") ``` -## macOS +## macOS x64 ``` bash ~/$ mkdir myagent && cd myagent ~/myagent$ tar xzf ~/Downloads/vsts-agent-osx-x64-.tar.gz ``` +## macOS arm64 + +``` bash +~/$ mkdir myagent && cd myagent +~/myagent$ tar xzf ~/Downloads/vsts-agent-osx-arm64-.tar.gz +``` + ## Linux x64 ``` bash @@ -55,10 +63,18 @@ C:\myagent> Add-Type -AssemblyName System.IO.Compression.FileSystem ; [System.IO ~/myagent$ tar xzf ~/Downloads/vsts-agent-linux-arm64-.tar.gz ``` +## Alpine x64 + +``` bash +~/$ mkdir myagent && cd myagent +~/myagent$ tar xzf ~/Downloads/vsts-agent-linux-musl-x64-.tar.gz +``` + +***Note:*** Node 6 does not exist for Alpine. ## Alternate Agent Downloads -This following alternate packages do not include Node 6 and are only suitable for users who do not use Node 6 dependent tasks. +Alternate packages below do not include Node 6 and are only suitable for users who do not use Node 6 dependent tasks. See [notes](docs/node6.md) on Node version support for more details. | | Package | SHA-256 | @@ -69,4 +85,4 @@ See [notes](docs/node6.md) on Node version support for more details. | macOS arm64 | [pipelines-agent-osx-arm64-.tar.gz](https://vstsagentpackage.azureedge.net/agent//pipelines-agent-osx-x64-.tar.gz) | | | Linux x64 | [pipelines-agent-linux-x64-.tar.gz](https://vstsagentpackage.azureedge.net/agent//pipelines-agent-linux-x64-.tar.gz) | | | Linux ARM | [pipelines-agent-linux-arm-.tar.gz](https://vstsagentpackage.azureedge.net/agent//pipelines-agent-linux-arm-.tar.gz) | | -| Linux ARM64 | [pipelines-agent-linux-arm64-.tar.gz](https://vstsagentpackage.azureedge.net/agent//pipelines-agent-linux-arm64-.tar.gz) | | \ No newline at end of file +| Linux ARM64 | [pipelines-agent-linux-arm64-.tar.gz](https://vstsagentpackage.azureedge.net/agent//pipelines-agent-linux-arm64-.tar.gz) | | diff --git a/src/Misc/InstallAgentPackage.template.xml b/src/Misc/InstallAgentPackage.template.xml index 3782a552a3..574ae727c3 100644 --- a/src/Misc/InstallAgentPackage.template.xml +++ b/src/Misc/InstallAgentPackage.template.xml @@ -44,6 +44,11 @@ + + + + + diff --git a/src/Misc/Publish.template.ps1 b/src/Misc/Publish.template.ps1 index dc406d2b0a..45f554bdd6 100644 --- a/src/Misc/Publish.template.ps1 +++ b/src/Misc/Publish.template.ps1 @@ -16,6 +16,8 @@ if ($pwd -notlike '*tfsgheus20' ) { Add-DistributedTaskPackage -PackageType agent -Platform linux-arm64 -Version -DownloadUrl https://vstsagentpackage.azureedge.net/agent//vsts-agent-linux-arm64-.tar.gz -HashValue -InfoUrl https://go.microsoft.com/fwlink/?LinkId=798199 -Filename vsts-agent-linux-arm64-.tar.gz + Add-DistributedTaskPackage -PackageType agent -Platform linux-musl-x64 -Version -DownloadUrl https://vstsagentpackage.azureedge.net/agent//vsts-agent-linux-musl-x64-.tar.gz -HashValue -InfoUrl https://go.microsoft.com/fwlink/?LinkId=798199 -Filename vsts-agent-linux-musl-x64-.tar.gz + Add-DistributedTaskPackage -PackageType agent -Platform osx-arm64 -Version -DownloadUrl https://vstsagentpackage.azureedge.net/agent//vsts-agent-osx-arm64-.tar.gz -HashValue -InfoUrl https://go.microsoft.com/fwlink/?LinkId=798199 -Filename vsts-agent-osx-arm64-.tar.gz # alternate packages diff --git a/src/Misc/PublishVSTSAgent.template.ps1 b/src/Misc/PublishVSTSAgent.template.ps1 deleted file mode 100644 index cda35b7af8..0000000000 --- a/src/Misc/PublishVSTSAgent.template.ps1 +++ /dev/null @@ -1,15 +0,0 @@ -$ErrorActionPreference = 'Stop' - -if ($pwd -notlike '*tfsgheus20' ) { - Add-DistributedTaskPackage -PackageType agent -Platform win-x64 -Version -DownloadUrl https://vstsagentpackage.azureedge.net/agent//vsts-agent-win-x64-.zip -InfoUrl https://go.microsoft.com/fwlink/?LinkId=798199 -Filename vsts-agent-win-x64-.zip - - Add-DistributedTaskPackage -PackageType agent -Platform win-x86 -Version -DownloadUrl https://vstsagentpackage.azureedge.net/agent//vsts-agent-win-x86-.zip -InfoUrl https://go.microsoft.com/fwlink/?LinkId=798199 -Filename vsts-agent-win-x86-.zip - - Add-DistributedTaskPackage -PackageType agent -Platform osx-x64 -Version -DownloadUrl https://vstsagentpackage.azureedge.net/agent//vsts-agent-osx-x64-.tar.gz -InfoUrl https://go.microsoft.com/fwlink/?LinkId=798199 -Filename vsts-agent-osx-x64-.tar.gz - - Add-DistributedTaskPackage -PackageType agent -Platform linux-x64 -Version -DownloadUrl https://vstsagentpackage.azureedge.net/agent//vsts-agent-linux-x64-.tar.gz -InfoUrl https://go.microsoft.com/fwlink/?LinkId=798199 -Filename vsts-agent-linux-x64-.tar.gz - - Add-DistributedTaskPackage -PackageType agent -Platform linux-arm -Version -DownloadUrl https://vstsagentpackage.azureedge.net/agent//vsts-agent-linux-arm-.tar.gz -InfoUrl https://go.microsoft.com/fwlink/?LinkId=798199 -Filename vsts-agent-linux-arm-.tar.gz - - Add-DistributedTaskPackage -PackageType agent -Platform osx-arm64 -Version -DownloadUrl https://vstsagentpackage.azureedge.net/agent//vsts-agent-osx-arm64-.tar.gz -InfoUrl https://go.microsoft.com/fwlink/?LinkId=798199 -Filename vsts-agent-osx-arm64-.tar.gz -} \ No newline at end of file diff --git a/src/Misc/UnpublishVSTSAgent.template.ps1 b/src/Misc/UnpublishVSTSAgent.template.ps1 deleted file mode 100644 index b1c6afe50c..0000000000 --- a/src/Misc/UnpublishVSTSAgent.template.ps1 +++ /dev/null @@ -1,15 +0,0 @@ -$ErrorActionPreference = 'Stop' - -if ($pwd -notlike '*tfsgheus20' ) { - Remove-DistributedTaskPackage -PackageType agent -Platform win-x64 -Version - - Remove-DistributedTaskPackage -PackageType agent -Platform win-x86 -Version - - Remove-DistributedTaskPackage -PackageType agent -Platform osx-x64 -Version - - Remove-DistributedTaskPackage -PackageType agent -Platform linux-x64 -Version - - Remove-DistributedTaskPackage -PackageType agent -Platform linux-arm -Version - - Remove-DistributedTaskPackage -PackageType agent -Platform osx-arm64 -Version -} \ No newline at end of file