Skip to content
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

chore(ci): Test lowering of non-persistent ebs provisions #8360

Merged
merged 22 commits into from
Sep 4, 2024
Merged

chore(ci): Test lowering of non-persistent ebs provisions #8360

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
b0357d2
Test lowering of ebs sizes
ludamad Sep 3, 2024
4f73fe1
Merge branch 'master' into ad/test-lower-ebs
ludamad Sep 3, 2024
d26e424
print run/log.out to diagnose
ludamad Sep 3, 2024
4b52ad9
Merge remote-tracking branch 'origin/ad/test-lower-ebs' into ad/test-…
ludamad Sep 3, 2024
76a8146
Update README.md
ludamad Sep 3, 2024
ca6d986
Merge branch 'master' into ad/test-lower-ebs
ludamad Sep 3, 2024
3aab0c3
more tries
ludamad Sep 3, 2024
65d9533
Merge remote-tracking branch 'origin/ad/test-lower-ebs' into ad/test-…
ludamad Sep 3, 2024
3d8c5c5
add wait to Print Startup Log (may fix issues)
ludamad Sep 3, 2024
c76d24b
Merge branch 'master' into ad/test-lower-ebs
ludamad Sep 3, 2024
335f0e0
Merge github.com:AztecProtocol/aztec-packages into ad/test-lower-ebs
ludamad Sep 3, 2024
6cbbdea
Merge branch 'ad/test-lower-ebs' of github.com:AztecProtocol/aztec-pa…
ludamad Sep 3, 2024
9c75da2
Update action.yml
ludamad Sep 3, 2024
ff79ac6
try fix
ludamad Sep 3, 2024
2765492
Merge remote-tracking branch 'origin/ad/test-lower-ebs' into ad/test-…
ludamad Sep 3, 2024
fe5597d
Update README.md
ludamad Sep 3, 2024
5f7f7a1
Update userdata.ts
ludamad Sep 3, 2024
ef34e6f
build
ludamad Sep 4, 2024
faf2dbe
Merge branch 'master' into ad/test-lower-ebs
ludamad Sep 4, 2024
df5fbf4
Merge branch 'master' into ad/test-lower-ebs
ludamad Sep 4, 2024
4980c3b
Update action.yml
ludamad Sep 4, 2024
c9c794a
Update action.yml
ludamad Sep 4, 2024
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
5 changes: 4 additions & 1 deletion .github/ensure-tester/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@ runs:

- name: Print Startup Log
shell: bash
run: cat /run/log.out || true # don't fail
run:
# Try 6 times to see if .user-data-finished has been written to
for i in {0..6} ; do scripts/run_on_tester "cat /home/ubuntu/.user-data-finished" && break ; sleep 5 ; done ;
scripts/run_on_tester "cat /home/ubuntu/.user-data-finished ; cat /run/log.out" || true # don't fail
Copy link
Collaborator

Choose a reason for hiding this comment

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

Nit: I don't know off the top of my head whether ; or || takes precedence in bash, so I don't know what's allowed to fail here.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Just removed the || true - we should find the run/log.out


# Set up a context for this run
- name: Copy Repo to Tester
Expand Down
13 changes: 10 additions & 3 deletions .github/spot-runner-action/dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,8 @@ class Ec2Instance {
Ebs: {
VolumeSize: 64,
VolumeType: 'gp3',
Throughput: 1000,
Iops: 5000
Throughput: 250,
Iops: 3000
},
},
],
Expand Down Expand Up @@ -1040,7 +1040,14 @@ class UserData {
`sudo service docker restart`,
"sudo wget -q https://github.com/earthly/earthly/releases/download/v0.8.10/earthly-linux-$(dpkg --print-architecture) -O /usr/local/bin/earthly",
"sudo chmod +x /usr/local/bin/earthly",
`sudo bash -c 'echo \'Acquire::Retries "3"; Acquire::https::Timeout "240"; Acquire::http::Timeout "240"; APT::Get::Assume-Yes "true"; APT::Install-Recommends "false"; APT::Install-Suggests "false";\' > /etc/apt/apt.conf.d/99-aztec-build'`,
`sudo bash -c 'cat <<EOF > /etc/apt/apt.conf.d/99-aztec-build
Acquire::Retries "3";
Acquire::https::Timeout "240";
Acquire::http::Timeout "240";
APT::Get::Assume-Yes "true";
APT::Install-Recommends "false";
APT::Install-Suggests "false";
EOF'`,
"sudo apt install -y brotli",
'echo "MaxStartups 1000" >> /etc/ssh/sshd_config',
'echo "ClientAliveInterval=30" >> /etc/ssh/sshd_config',
Expand Down
4 changes: 2 additions & 2 deletions .github/spot-runner-action/src/ec2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ export class Ec2Instance {
Ebs: {
VolumeSize: 64,
VolumeType: 'gp3',
Throughput: 1000,
Iops: 5000
Throughput: 250,
Iops: 3000
},
},
],
Expand Down
9 changes: 8 additions & 1 deletion .github/spot-runner-action/src/userdata.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,14 @@ export class UserData {
`sudo service docker restart`,
"sudo wget -q https://github.com/earthly/earthly/releases/download/v0.8.10/earthly-linux-$(dpkg --print-architecture) -O /usr/local/bin/earthly",
"sudo chmod +x /usr/local/bin/earthly",
`sudo bash -c 'echo \'Acquire::Retries "3"; Acquire::https::Timeout "240"; Acquire::http::Timeout "240"; APT::Get::Assume-Yes "true"; APT::Install-Recommends "false"; APT::Install-Suggests "false";\' > /etc/apt/apt.conf.d/99-aztec-build'`,
`sudo bash -c 'cat <<EOF > /etc/apt/apt.conf.d/99-aztec-build
Acquire::Retries "3";
Acquire::https::Timeout "240";
Acquire::http::Timeout "240";
APT::Get::Assume-Yes "true";
APT::Install-Recommends "false";
APT::Install-Suggests "false";
EOF'`,
"sudo apt install -y brotli",
'echo "MaxStartups 1000" >> /etc/ssh/sshd_config',
'echo "ClientAliveInterval=30" >> /etc/ssh/sshd_config',
Expand Down
Loading