Skip to content

Commit

Permalink
Auto merge of #22896 - servo:generic-worker-13, r=jdm
Browse files Browse the repository at this point in the history
Windows AMI for Taskcluster: update generic-worker to 13.0.2

CC: https://bugzilla.mozilla.org/show_bug.cgi?id=1375182#c6

Fixes #22870

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22896)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Feb 15, 2019
2 parents 19495a7 + c39dbb8 commit ea20603
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 10 deletions.
9 changes: 5 additions & 4 deletions etc/taskcluster/decisionlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -431,14 +431,15 @@ def with_repo(self, sparse_checkout=None):
cd repo
"""
if sparse_checkout:
self.with_mounts({
"file": "sparse-checkout",
"content": {"raw": "\n".join(sparse_checkout)},
})
git += """
git config core.sparsecheckout true
echo %SPARSE_CHECKOUT_BASE64% > .git\\info\\sparse.b64
certutil -decode .git\\info\\sparse.b64 .git\\info\\sparse-checkout
copy ..\\sparse-checkout .git\\info\\sparse-checkout
type .git\\info\\sparse-checkout
"""
self.env["SPARSE_CHECKOUT_BASE64"] = base64.b64encode(
"\n".join(sparse_checkout).encode("utf-8"))
git += """
git fetch --depth 1 %GIT_URL% %GIT_REF%
git reset --hard %GIT_SHA%
Expand Down
6 changes: 3 additions & 3 deletions etc/taskcluster/packet.net/tc.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ def check():


def livelog():
win2016 = api("awsProvisioner", "workerType", "servo-win2016")
files = win2016["secrets"]["files"]
win2016 = secret("worker-type:aws-provisioner-v1/servo-win2016")
files = win2016["files"]
assert all(f["encoding"] == "base64" for f in files)
files = {f.get("description"): f["content"] for f in files}
cert = files["SSL certificate for livelog"]
Expand All @@ -33,7 +33,7 @@ def livelog():
"livelog_key_base64": key,
"livelog_cert": base64.b64decode(cert),
"livelog_key": base64.b64decode(key),
"livelog_secret": win2016["secrets"]["generic-worker"]["config"]["livelogSecret"],
"livelog_secret": win2016["config"]["livelogSecret"],
}


Expand Down
12 changes: 9 additions & 3 deletions etc/taskcluster/windows/first-boot.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,24 @@ New-NetFirewallRule -DisplayName "Allow livelog GET requests" `
# Install generic-worker and dependencies
md C:\generic-worker
$client.DownloadFile("https://github.com/taskcluster/generic-worker/releases/download" +
"/v10.11.3/generic-worker-windows-amd64.exe", "C:\generic-worker\generic-worker.exe")
"/v13.0.2/generic-worker-windows-amd64.exe", "C:\generic-worker\generic-worker.exe")
$client.DownloadFile("https://github.com/taskcluster/livelog/releases/download" +
"/v1.1.0/livelog-windows-amd64.exe", "C:\generic-worker\livelog.exe")
Expand-ZIPFile -File "C:\nssm-2.24.zip" -Destination "C:\" `
-Url "https://www.nssm.cc/release/nssm-2.24.zip"
Start-Process C:\generic-worker\generic-worker.exe -ArgumentList `
"new-openpgp-keypair --file C:\generic-worker\generic-worker-gpg-signing-key.key" `
-Wait -NoNewWindow -PassThru `
-RedirectStandardOutput C:\generic-worker\generate-signing-key.log `
-RedirectStandardError C:\generic-worker\generate-signing-key.err
-RedirectStandardOutput C:\generic-worker\generate-gpg-signing-key.log `
-RedirectStandardError C:\generic-worker\generate-gpg-signing-key.err
Start-Process C:\generic-worker\generic-worker.exe -ArgumentList `
"new-ed25519-keypair --file C:\generic-worker\generic-worker-ed25519-signing-key.key" `
-Wait -NoNewWindow -PassThru `
-RedirectStandardOutput C:\generic-worker\generate-ed25519-signing-key.log `
-RedirectStandardError C:\generic-worker\generate-ed25519-signing-key.err
Start-Process C:\generic-worker\generic-worker.exe -ArgumentList (
"install service --nssm C:\nssm-2.24\win64\nssm.exe " +
"--configure-for-aws " +
"--config C:\generic-worker\generic-worker.config"
) -Wait -NoNewWindow -PassThru `
-RedirectStandardOutput C:\generic-worker\install.log `
Expand Down

0 comments on commit ea20603

Please sign in to comment.