Skip to content

GEODE-9080: Add new stackdriver agent to Windows compute images #6256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1 commit merged into from
Apr 5, 2021
Merged

GEODE-9080: Add new stackdriver agent to Windows compute images #6256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions ci/images/google-windows-geode-builder/packer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,24 @@
"(Get-Content \"C:\\Program Files\\OpenSSH-Win64\\sshd_config_default\") -replace '(Match Group administrators)', '#$1' -replace '(\\s*AuthorizedKeysFile.*)', '#$1' | Out-File \"C:\\Program Files\\OpenSSH-Win64\\sshd_config_default\" -encoding UTF8"
]
},
{
"type": "powershell",
"inline": [
"$ErrorActionPreference = \"Stop\"",
"Set-ExecutionPolicy Bypass -Scope Process -Force",
"(New-Object Net.WebClient).DownloadFile(\"https://repo.stackdriver.com/windows/StackdriverMonitoring-GCM-46.exe\", \"${env:UserProfile}\\StackdriverMonitoring-GCM-46.exe\")",
"Start-Process -FilePath \"${env:UserProfile}\\StackdriverMonitoring-GCM-46.exe\" -ArgumentList \"/S\"",
"while ($true) {",
" try {",
" Get-Service -Name StackdriverMonitoring",
" break",
" } catch {",
" Write-Warning \"Wating on service StackdriverMonitoring\"",
" Start-Sleep -s 10",
" }",
"}"
]
},
{
"type": "powershell",
"inline": [
Expand Down
1 change: 0 additions & 1 deletion ci/pipelines/meta/deploy_meta.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ YML
echo "Target ${FLY_TARGET} already exists."
fi

FLY=${FLY:-$(which fly)}
Copy link
Contributor

@onichols-pivotal onichols-pivotal Apr 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since deploy_meta.sh is sometimes run by humans, why remove this?

Copy link
Author

@ghost ghost Apr 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because lines 119-120 make it never take effect, and rectifying that logic is beyond the scope of my change here.


set -e
if [[ ${UPSTREAM_FORK} != "apache" ]]; then
Expand Down