Skip to content

Commit a953199

Browse files
build: use aks backed runners for linux builds (#39838)
* build: use aks backed runners for linux builds (#39403) * build: test aks runner * build: stress test * build: use super-large nodes for publish jobs * build: try using aks for everything... * build: shared host not great * build: clean up * build: apparently tests dont run in kube infra? * build: do not change test size * ci: fixup known hosts for linux publish (#39437) * ci: fixup known hosts for linux publish * build: use 2023 known hosts * build: use rebuilt docker image * Revert "build: use rebuilt docker image" This reverts commit f9506a9. --------- Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> --------- Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
1 parent 056eacf commit a953199

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

.circleci/config/base.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ executors:
4242
size:
4343
description: "Docker executor size"
4444
type: enum
45-
enum: ["medium", "xlarge", "2xlarge"]
45+
# aks-linux-medium === 8 core (32 core host, shared with other builds)
46+
# aks-linux-large === 32 core
47+
enum: ["medium", "xlarge", "electronjs/aks-linux-medium", "electronjs/aks-linux-large"]
4648
docker:
4749
- image: ghcr.io/electron/build:e6bebd08a51a0d78ec23e5b3fd7e7c0846412328
4850
resource_class: << parameters.size >>
@@ -1481,6 +1483,7 @@ commands:
14811483
- *step-minimize-workspace-size-from-checkout
14821484
- *step-fix-sync
14831485
- *step-setup-env-for-build
1486+
- *step-fix-known-hosts-linux
14841487
- *step-setup-goma-for-build
14851488
- *step-wait-for-goma
14861489
- *step-gn-gen-default
@@ -1586,7 +1589,7 @@ jobs:
15861589
linux-x64-testing:
15871590
executor:
15881591
name: linux-docker
1589-
size: xlarge
1592+
size: electronjs/aks-linux-large
15901593
environment:
15911594
<<: *env-global
15921595
<<: *env-testing-build
@@ -1601,7 +1604,7 @@ jobs:
16011604
linux-x64-testing-asan:
16021605
executor:
16031606
name: linux-docker
1604-
size: 2xlarge
1607+
size: electronjs/aks-linux-large
16051608
environment:
16061609
<<: *env-global
16071610
<<: *env-testing-build
@@ -1643,7 +1646,7 @@ jobs:
16431646
linux-x64-publish:
16441647
executor:
16451648
name: linux-docker
1646-
size: 2xlarge
1649+
size: electronjs/aks-linux-large
16471650
environment:
16481651
<<: *env-linux-2xlarge-release
16491652
<<: *env-release-build
@@ -1665,7 +1668,7 @@ jobs:
16651668
linux-arm-testing:
16661669
executor:
16671670
name: linux-docker
1668-
size: 2xlarge
1671+
size: electronjs/aks-linux-large
16691672
environment:
16701673
<<: *env-global
16711674
<<: *env-arm
@@ -1683,7 +1686,7 @@ jobs:
16831686
linux-arm-publish:
16841687
executor:
16851688
name: linux-docker
1686-
size: 2xlarge
1689+
size: electronjs/aks-linux-large
16871690
environment:
16881691
<<: *env-linux-2xlarge-release
16891692
<<: *env-arm
@@ -1707,7 +1710,7 @@ jobs:
17071710
linux-arm64-testing:
17081711
executor:
17091712
name: linux-docker
1710-
size: 2xlarge
1713+
size: electronjs/aks-linux-large
17111714
environment:
17121715
<<: *env-global
17131716
<<: *env-arm64
@@ -1736,7 +1739,7 @@ jobs:
17361739
linux-arm64-publish:
17371740
executor:
17381741
name: linux-docker
1739-
size: 2xlarge
1742+
size: electronjs/aks-linux-large
17401743
environment:
17411744
<<: *env-linux-2xlarge-release
17421745
<<: *env-arm64

.circleci/fix-known-hosts.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
set -e
44

55
mkdir -p ~/.ssh
6-
echo "|1|B3r+7aO0/x90IdefihIjxIoJrrk=|OJddGDfhbuLFc1bUyy84hhIw57M= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
7-
|1|rGlEvW55DtzNZp+pzw9gvyOyKi4=|LLWr+7qlkAlw3YGGVfLHHxB/kR0= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" >> ~/.ssh/known_hosts
6+
echo "github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
7+
github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
8+
github.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=" >> ~/.ssh/known_hosts

0 commit comments

Comments
 (0)