Skip to content

Commit 4a9b367

Browse files
MarshallOfSoundjkleinsc
MarshallOfSound
and
jkleinsc
authored
build: use aks backed runners for linux builds (#39837)
* 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 0508e25 commit 4a9b367

2 files changed

Lines changed: 14 additions & 10 deletions

File tree

‎.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 >>
@@ -1592,6 +1594,7 @@ commands:
15921594
- *step-minimize-workspace-size-from-checkout
15931595
- *step-fix-sync
15941596
- *step-setup-env-for-build
1597+
- *step-fix-known-hosts-linux
15951598
- *step-setup-goma-for-build
15961599
- *step-wait-for-goma
15971600
- *step-gn-gen-default
@@ -1706,7 +1709,7 @@ jobs:
17061709
linux-x64-testing:
17071710
executor:
17081711
name: linux-docker
1709-
size: xlarge
1712+
size: electronjs/aks-linux-large
17101713
environment:
17111714
<<: *env-global
17121715
<<: *env-testing-build
@@ -1723,7 +1726,7 @@ jobs:
17231726
linux-x64-testing-asan:
17241727
executor:
17251728
name: linux-docker
1726-
size: 2xlarge
1729+
size: electronjs/aks-linux-large
17271730
environment:
17281731
<<: *env-global
17291732
<<: *env-testing-build
@@ -1769,7 +1772,7 @@ jobs:
17691772
linux-x64-publish:
17701773
executor:
17711774
name: linux-docker
1772-
size: 2xlarge
1775+
size: electronjs/aks-linux-large
17731776
environment:
17741777
<<: *env-linux-2xlarge-release
17751778
<<: *env-release-build
@@ -1792,7 +1795,7 @@ jobs:
17921795
linux-arm-testing:
17931796
executor:
17941797
name: linux-docker
1795-
size: 2xlarge
1798+
size: electronjs/aks-linux-large
17961799
environment:
17971800
<<: *env-global
17981801
<<: *env-arm
@@ -1812,7 +1815,7 @@ jobs:
18121815
linux-arm-publish:
18131816
executor:
18141817
name: linux-docker
1815-
size: 2xlarge
1818+
size: electronjs/aks-linux-large
18161819
environment:
18171820
<<: *env-linux-2xlarge-release
18181821
<<: *env-arm
@@ -1837,7 +1840,7 @@ jobs:
18371840
linux-arm64-testing:
18381841
executor:
18391842
name: linux-docker
1840-
size: 2xlarge
1843+
size: electronjs/aks-linux-large
18411844
environment:
18421845
<<: *env-global
18431846
<<: *env-arm64
@@ -1868,7 +1871,7 @@ jobs:
18681871
linux-arm64-publish:
18691872
executor:
18701873
name: linux-docker
1871-
size: 2xlarge
1874+
size: electronjs/aks-linux-large
18721875
environment:
18731876
<<: *env-linux-2xlarge-release
18741877
<<: *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)