Skip to content

Commit a3817f5

Browse files
arampricearamprice
committed
Clean up remnants of manual OpenSSH installation
As of July 2025 windows stemcells have converted to using Microsofts official OpenSSH installation method[1]. This commit removes the remnants of the prior installation method, and associated CI tooling. [1] https://learn.microsoft.com/en-us/windows-server/administration/openssh/openssh_install_firstuse
1 parent b36c0f7 commit a3817f5

File tree

13 files changed

+2
-45
lines changed

13 files changed

+2
-45
lines changed

‎ci/pipelines/stemcells-windows.yml‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -208,13 +208,6 @@ resources:
208208
password: ((docker.password))
209209

210210
# type: github-release
211-
- name: openssh-release
212-
type: github-release
213-
source:
214-
owner: PowerShell
215-
repository: Win32-OpenSSH
216-
access_token: ((github_public_repo_token))
217-
tag_filter: v([^v].*)
218211
- name: stemcell-builder-github-release
219212
type: github-release
220213
source:
@@ -797,8 +790,6 @@ jobs:
797790
tags: [*worker_tag]
798791
- get: bosh-windows-stemcell-builder-ci-image
799792
tags: [*worker_tag]
800-
- get: open-ssh
801-
resource: openssh-release
802793
- get: stemcell-builder
803794
passed: [build]
804795
tags: [*worker_tag]
@@ -910,8 +901,6 @@ jobs:
910901
tags: [*worker_tag]
911902
- get: bosh-windows-stemcell-builder-ci-image
912903
tags: [*worker_tag]
913-
- get: open-ssh
914-
resource: openssh-release
915904
- get: stemcell-builder
916905
passed: [build]
917906
tags: [*worker_tag]
@@ -1369,8 +1358,6 @@ jobs:
13691358
- get: main-version
13701359
passed: [build]
13711360
tags: [*worker_tag]
1372-
- get: sshd
1373-
resource: openssh-release
13741361
- get: bosh-agent-release
13751362
passed: [build]
13761363
- get: blobstore-dav-cli
@@ -1555,8 +1542,6 @@ jobs:
15551542
- get: main-version
15561543
passed: [wuts-aws]
15571544
tags: [*worker_tag]
1558-
- get: sshd
1559-
resource: openssh-release
15601545
- get: bosh-agent-release
15611546
passed: [wuts-aws]
15621547
- get: blobstore-dav-cli
@@ -1721,8 +1706,6 @@ jobs:
17211706
- get: main-version
17221707
passed: [build]
17231708
tags: [*worker_tag]
1724-
- get: sshd
1725-
resource: openssh-release
17261709
- get: bosh-agent-release
17271710
passed: [build]
17281711
- get: blobstore-dav-cli
@@ -1919,8 +1902,6 @@ jobs:
19191902
- get: main-version
19201903
passed: [build]
19211904
tags: [*worker_tag]
1922-
- get: sshd
1923-
resource: openssh-release
19241905
- get: bosh-agent-release
19251906
passed: [build]
19261907
- get: blobstore-dav-cli

‎ci/tasks/create-aws-stemcell/task.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ inputs:
77
- name: base-amis
88
- name: version
99
- name: lgpo-binary
10-
- name: sshd
1110
- name: packer-ci-private-key
1211
- name: bosh-agent-release
1312
- name: blobstore-dav-cli

‎ci/tasks/create-azure-stemcell/task.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ inputs:
66
- name: version
77
- name: stemcell-builder
88
- name: lgpo-binary
9-
- name: sshd
109
- name: bosh-agent-release
1110
- name: blobstore-dav-cli
1211
- name: blobstore-s3-cli

‎ci/tasks/create-gcp-stemcell/task.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ inputs:
77
- name: base-gcp-image
88
- name: version
99
- name: lgpo-binary
10-
- name: sshd
1110
- name: bosh-agent-release
1211
- name: blobstore-dav-cli
1312
- name: blobstore-s3-cli

‎ci/tasks/generate-deps-file/run.bash‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
#!/usr/bin/env bash
22
set -euo pipefail
33

4-
openssh_win64_sha256="$(shasum -a 256 open-ssh/OpenSSH-Win64.zip | cut -d " " -f 1)"
5-
openssh_win64_version="$(cat open-ssh/version)"
6-
74
psmodules_sha256="$(shasum -a 256 psmodules-zip-output/bosh-psmodules.zip | cut -d " " -f 1)"
85
psmodules_version="$(cat version/version)"
96

@@ -15,10 +12,6 @@ lgpo_version="3"
1512

1613
cat <<EOF > deps-file/deps.json
1714
{
18-
"OpenSSH-Win64.zip": {
19-
"sha": "${openssh_win64_sha256}",
20-
"version": "${openssh_win64_version}"
21-
},
2215
"bosh-psmodules.zip": {
2316
"sha": "${psmodules_sha256}",
2417
"version": "${psmodules_version}"

‎ci/tasks/generate-deps-file/task.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ platform: linux
44
inputs:
55
- name: bosh-windows-stemcell-builder-ci
66
- name: stemcell-builder
7-
- name: open-ssh
87
- name: lgpo-binary
98
- name: version
109
- name: bosh-agent

‎ci/tasks/zip-files/run.bash‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ ROOT_DIR=$(pwd)
66
REPO_ROOT="${REPO_ROOT:-"$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"}"
77
ZIP_FILE_DESTINATION="${ZIP_FILE_DESTINATION:-"${ROOT_DIR}/zip-file/StemcellAutomation-$(date +"%s").zip"}"
88

9-
OPENSSH_ZIP="${OPENSSH_ZIP:-"${ROOT_DIR}/open-ssh/OpenSSH-Win64.zip"}"
109
BOSH_PSMODULES_ZIP="${BOSH_PSMODULES_ZIP:-"${ROOT_DIR}/psmodules-zip-output/bosh-psmodules.zip"}"
1110
AGENT_ZIP="${AGENT_ZIP:-"${ROOT_DIR}/bosh-agent/agent.zip"}"
1211
DEPS_JSON="${DEPS_JSON:-"${ROOT_DIR}/deps-file/deps.json"}"
@@ -20,7 +19,7 @@ mkdir -p "${stemcell_automation_dir}"
2019

2120
declare -a files_to_zip
2221
mapfile -t files_to_zip < <(find "${REPO_ROOT}/stembuild/stemcell-automation" -type f -not -name "*Test*" -name "*.ps*1")
23-
files_to_zip+=("${OPENSSH_ZIP}" "${BOSH_PSMODULES_ZIP}" "${AGENT_ZIP}" "${DEPS_JSON}")
22+
files_to_zip+=("${BOSH_PSMODULES_ZIP}" "${AGENT_ZIP}" "${DEPS_JSON}")
2423

2524
cp "${files_to_zip[@]}" "${stemcell_automation_dir}"
2625

‎ci/tasks/zip-files/task.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ platform: linux
44
inputs:
55
- name: bosh-windows-stemcell-builder-ci
66
- name: stemcell-builder
7-
- name: open-ssh
87
- name: deps-file
98
- name: bosh-agent
109
- name: psmodules-zip-output

‎lib/packer/config/templates/provision_windows2019.json.erb‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,6 @@
137137
"Protect-CFCell -IaaS <%= iaas %>"
138138
]
139139
},
140-
{
141-
"type": "file",
142-
"source": "../sshd/OpenSSH-Win64.zip",
143-
"destination": "C:\\provision\\OpenSSH-Win64.zip"
144-
},
145140
{
146141
"type": "powershell",
147142
"inline": [

‎spec/packer/config/aws_spec.rb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@
189189
{"type" => "file", "source" => "hotfixes.log", "destination" => "hotfixes.log", "direction" => "download"},
190190
{"type" => "powershell", "inline" => ["$ErrorActionPreference = \"Stop\";", "trap { $host.SetShouldExit(1) }", "Remove-Account -User Provisioner"]},
191191
{"type" => "powershell", "inline" => ["$ErrorActionPreference = \"Stop\";", "trap { $host.SetShouldExit(1) }", "Protect-CFCell -IaaS aws"]},
192-
{"type" => "file", "source" => "../sshd/OpenSSH-Win64.zip", "destination" => "C:\\provision\\OpenSSH-Win64.zip"},
193192
{"type" => "powershell", "inline" => ["$ErrorActionPreference = \"Stop\";", "trap { $host.SetShouldExit(1) }", "Install-SSHD"]},
194193
{"type"=>"powershell", "inline"=> ["$ErrorActionPreference = \"Stop\";", "trap { $host.SetShouldExit(1) }", "Enable-SSHD"]},
195194
{"type" => "file", "source" => "build/agent.zip", "destination" => "C:\\provision\\agent.zip"},

0 commit comments

Comments
 (0)