From 14e85abefe450c570e7f8cd3985bb710946fb0ac Mon Sep 17 00:00:00 2001 From: navdeepg2021 Date: Thu, 22 Sep 2022 10:31:15 -0400 Subject: [PATCH 1/6] feat: Added the Machine setup info to runner workflows. --- modules/runners/templates/start-runner.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/runners/templates/start-runner.sh b/modules/runners/templates/start-runner.sh index 9dedb6a813..d329b052ab 100644 --- a/modules/runners/templates/start-runner.sh +++ b/modules/runners/templates/start-runner.sh @@ -5,6 +5,8 @@ echo "Retrieving TOKEN from AWS API" token=$(curl -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 180") +ami_id=$(curl -f -H "X-aws-ec2-metadata-token: $token" -v http://169.254.169.254/latest/meta-data/ami-id) + region=$(curl -f -H "X-aws-ec2-metadata-token: $token" -v http://169.254.169.254/latest/dynamic/instance-identity/document | jq -r .region) echo "Retrieved REGION from AWS API ($region)" @@ -60,6 +62,16 @@ chown -R $run_as . echo "Configure GH Runner as user $run_as" sudo --preserve-env=RUNNER_ALLOW_RUNASROOT -u "$run_as" -- ./config.sh --unattended --name "$instance_id" --work "_work" $${config} +tee /opt/actions-runner/.setup_info < Date: Thu, 22 Sep 2022 10:40:18 -0400 Subject: [PATCH 2/6] fix: added to windows image as well. --- modules/runners/templates/start-runner.ps1 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/runners/templates/start-runner.ps1 b/modules/runners/templates/start-runner.ps1 index bdb9f0c851..8c2995a4c9 100644 --- a/modules/runners/templates/start-runner.ps1 +++ b/modules/runners/templates/start-runner.ps1 @@ -4,6 +4,8 @@ Write-Host "Retrieving TOKEN from AWS API" $token=Invoke-RestMethod -Method PUT -Uri "http://169.254.169.254/latest/api/token" -Headers @{"X-aws-ec2-metadata-token-ttl-seconds" = "180"} +$ami_id=Invoke-RestMethod -Uri "http://169.254.169.254/latest/meta-data/ami-id" -Headers @{"X-aws-ec2-metadata-token" = $token} + $metadata=Invoke-RestMethod -Uri "http://169.254.169.254/latest/dynamic/instance-identity/document" -Headers @{"X-aws-ec2-metadata-token" = $token} $Region = $metadata.region @@ -88,6 +90,17 @@ Invoke-Expression $configCmd Write-Host "Starting the runner as user $run_as" +$contentToAdd = @" +[ + { + "group": "", + "detail": "$ami_id" + } +] +"@ + +Add-Content "$pwd\.setup_info" $contentToAdd + Write-Host "Installing the runner as a service" $action = New-ScheduledTaskAction -WorkingDirectory "$pwd" -Execute "run.cmd" From 6b931234c5e4c93f34b89f893e8bc132aad19fd9 Mon Sep 17 00:00:00 2001 From: navdeepg2021 Date: Thu, 6 Oct 2022 16:53:03 -0400 Subject: [PATCH 3/6] fix: updated the comments. --- modules/runners/templates/start-runner.ps1 | 23 ++++++++++------------ modules/runners/templates/start-runner.sh | 2 +- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/modules/runners/templates/start-runner.ps1 b/modules/runners/templates/start-runner.ps1 index 8c2995a4c9..81de7a6b7c 100644 --- a/modules/runners/templates/start-runner.ps1 +++ b/modules/runners/templates/start-runner.ps1 @@ -34,7 +34,7 @@ Write-Host "Retrieved /$environment/runner/agent-mode parameter - ($agent_mode) if ($enable_cloudwatch_agent -eq "true") { - Write-Host "Enabling CloudWatch Agent" + Write-Host "Enabling CloudWatch Agent" & 'C:\Program Files\Amazon\AmazonCloudWatchAgent\amazon-cloudwatch-agent-ctl.ps1' -a fetch-config -m ec2 -s -c "ssm:$environment-cloudwatch_agent_config_runner" } @@ -44,7 +44,7 @@ Write-Host "Get GH Runner config from AWS SSM" $config = $null $i = 0 do { - $config = (aws ssm get-parameters --names "$environment-$InstanceId" --with-decryption --region $Region --query "Parameters[*].{Name:Name,Value:Value}" | ConvertFrom-Json)[0].value + $config = (aws ssm get-parameters --names "$environment-$InstanceId" --with-decryption --region $Region --query "Parameters[*].{Name:Name,Value:Value}" | ConvertFrom-Json)[0].value Write-Host "Waiting for GH Runner config to become available in AWS SSM ($i/30)" Start-Sleep 1 $i++ @@ -90,16 +90,13 @@ Invoke-Expression $configCmd Write-Host "Starting the runner as user $run_as" -$contentToAdd = @" -[ - { - "group": "", - "detail": "$ami_id" - } -] -"@ - -Add-Content "$pwd\.setup_info" $contentToAdd +$jsonBody = @( + @{ + group='Machine AMI Id' + details="$ami_id" + } +) +ConvertTo-Json -InputObject $jsonBody > "$pwd\.setup_info" Write-Host "Installing the runner as a service" @@ -107,4 +104,4 @@ $action = New-ScheduledTaskAction -WorkingDirectory "$pwd" -Execute "run.cmd" $trigger = Get-CimClass "MSFT_TaskRegistrationTrigger" -Namespace "Root/Microsoft/Windows/TaskScheduler" Register-ScheduledTask -TaskName "runnertask" -Action $action -Trigger $trigger -User $username -Password $password -RunLevel Highest -Force Write-Host "Starting the runner in persistent mode" -Write-Host "Starting runner after $(((get-date) - (gcim Win32_OperatingSystem).LastBootUpTime).tostring("hh':'mm':'ss''"))" \ No newline at end of file +Write-Host "Starting runner after $(((get-date) - (gcim Win32_OperatingSystem).LastBootUpTime).tostring("hh':'mm':'ss''"))" diff --git a/modules/runners/templates/start-runner.sh b/modules/runners/templates/start-runner.sh index d329b052ab..a571acfbc8 100644 --- a/modules/runners/templates/start-runner.sh +++ b/modules/runners/templates/start-runner.sh @@ -65,7 +65,7 @@ sudo --preserve-env=RUNNER_ALLOW_RUNASROOT -u "$run_as" -- ./config.sh --unatten tee /opt/actions-runner/.setup_info < Date: Fri, 7 Oct 2022 09:26:53 -0400 Subject: [PATCH 4/6] Update modules/runners/templates/start-runner.ps1 Co-authored-by: Niek Palm --- modules/runners/templates/start-runner.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/runners/templates/start-runner.ps1 b/modules/runners/templates/start-runner.ps1 index 81de7a6b7c..e8314fc414 100644 --- a/modules/runners/templates/start-runner.ps1 +++ b/modules/runners/templates/start-runner.ps1 @@ -92,8 +92,8 @@ Write-Host "Starting the runner as user $run_as" $jsonBody = @( @{ - group='Machine AMI Id' - details="$ami_id" + group='Runner Image' + details="AMI id: $ami_id" } ) ConvertTo-Json -InputObject $jsonBody > "$pwd\.setup_info" From a74886098520a6a2ddd101b21182eb2acde65227 Mon Sep 17 00:00:00 2001 From: GuptaNavdeep1983 Date: Fri, 7 Oct 2022 09:27:22 -0400 Subject: [PATCH 5/6] Update modules/runners/templates/start-runner.sh Co-authored-by: Niek Palm --- modules/runners/templates/start-runner.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/runners/templates/start-runner.sh b/modules/runners/templates/start-runner.sh index a571acfbc8..80cf886db8 100644 --- a/modules/runners/templates/start-runner.sh +++ b/modules/runners/templates/start-runner.sh @@ -62,11 +62,18 @@ chown -R $run_as . echo "Configure GH Runner as user $run_as" sudo --preserve-env=RUNNER_ALLOW_RUNASROOT -u "$run_as" -- ./config.sh --unattended --name "$instance_id" --work "_work" $${config} +info_arch=$(uname -p) +info_os=$(( lsb_release -ds || cat /etc/*release || uname -om ) 2>/dev/null | head -n1 | cut -d "=" -f2- | tr -d '"') + tee /opt/actions-runner/.setup_info < Date: Fri, 7 Oct 2022 12:28:37 -0400 Subject: [PATCH 6/6] Update modules/runners/templates/start-runner.ps1 Co-authored-by: Scott Guymer --- modules/runners/templates/start-runner.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/runners/templates/start-runner.ps1 b/modules/runners/templates/start-runner.ps1 index e8314fc414..3271652a0c 100644 --- a/modules/runners/templates/start-runner.ps1 +++ b/modules/runners/templates/start-runner.ps1 @@ -96,7 +96,7 @@ $jsonBody = @( details="AMI id: $ami_id" } ) -ConvertTo-Json -InputObject $jsonBody > "$pwd\.setup_info" +ConvertTo-Json -InputObject $jsonBody | Set-Content -Path "$pwd\.setup_info" Write-Host "Installing the runner as a service"