Add hostname suffix to agent name

ayoussef-insight · Jun 17, 2024 · 40fa2b6 · 40fa2b6
1 parent dcf5daf
commit 40fa2b6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/src/images/ado-agent-linux/README.md b/src/images/ado-agent-linux/README.md
@@ -26,6 +26,10 @@ choosing "Show all scopes".
 ```bash
 docker-compose up --build -d --scale agent=2
 ```
+For ARM64 architecture, use the following command:
+```bash
+docker-compose -f docker-compose-arm64.yml up --build -d --scale agent=2
+```
 
 ### Start from docker
 

diff --git a/src/images/ado-agent-linux/start.sh b/src/images/ado-agent-linux/start.sh
@@ -59,7 +59,7 @@ trap 'cleanup; exit 143' TERM
 print_header "1. Configuring Azure Pipelines agent..."
 
 ./config.sh --unattended \
-  --agent "${NAME:-$(hostname)}" \
+  --agent "${NAME:-agent}-${HOSTNAME}" \
   --url "$AZP_URL" \
   --auth PAT \
   --token $(cat "$AZP_TOKEN_FILE") \

diff --git a/src/images/ado-agent-win/start.ps1 b/src/images/ado-agent-win/start.ps1
@@ -27,7 +27,7 @@ try
   Write-Host "1. Configuring Azure Pipelines agent..." -ForegroundColor Cyan
 
   .\config.cmd --unattended `
-    --agent "$(if (Test-Path Env:NAME) { ${Env:NAME} } else { hostname })" `
+    --agent "$(if (Test-Path Env:NAME) { "${Env:NAME}-${Env:HOSTNAME}" } else { "runner-${Env:HOSTNAME}" })" `
     --url "$(${Env:AZP_URL})" `
     --auth PAT `
     --token "$(Get-Content ${Env:AZP_TOKEN_FILE})" `

diff --git a/src/images/github-runner-linux/start.sh b/src/images/github-runner-linux/start.sh
@@ -36,7 +36,7 @@ print_header "2. Configuring github actions runner..."
 
 ./config.sh \
   --unattended \
-  --name $NAME \
+  --name "${NAME:-agent}-${HOSTNAME}" \
   --replace \
   --url https://github.com/$GITHUB_REPOSITORY \
   --token $TOKEN

diff --git a/src/images/github-runner-win/start.ps1 b/src/images/github-runner-win/start.ps1
@@ -17,7 +17,6 @@ Remove-Item Env:GITHUB_TOKEN
 
 $GITHUB_REPOSITORY=$Env:GITHUB_REPOSITORY
 $GITHUB_TOKEN=$(Get-Content $Env:GITHUB_TOKEN_FILE)
-$Name = if ($env:NAME) { $env:NAME } else { "hosted-runner-01" }
 
 try
 {
@@ -28,7 +27,7 @@ try
   Write-Host "2. Configuring github actions runner..." -ForegroundColor Cyan
 
   .\config.cmd --unattended `
-    --name "$Name" `
+    --name "$(if (Test-Path Env:NAME) { "${Env:NAME}-${Env:HOSTNAME}" } else { "runner-${Env:HOSTNAME}" })" `
     --url "https://github.com/$GITHUB_REPOSITORY" `
     --token "$Token" `
     --replace