Skip to content

Commit 300a7e3

Browse files
authored
Merge pull request #3605 from manics/ubuntu-arm
Use GitHub hosted Ubuntu arm64 runners instead of CircleCI
2 parents 84e22d6 + 892dd0b commit 300a7e3

File tree

3 files changed

+9
-114
lines changed

3 files changed

+9
-114
lines changed

.circleci/config.yml

Lines changed: 0 additions & 109 deletions
This file was deleted.

.github/workflows/test-chart.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ jobs:
114114
continue-on-error: true
115115

116116
test:
117-
runs-on: ubuntu-24.04
118117
timeout-minutes: 20
119118

120119
strategy:
@@ -131,12 +130,15 @@ jobs:
131130
include:
132131
- k3s-channel: latest
133132
test: install
133+
# Also test arm64
134+
os: ubuntu-24.04-arm
134135
- k3s-channel: stable # also test hub-slim, and prePuller.hook
135136
test: install
136137
local-chart-extra-args: >-
137138
--set hub.image.name=quay.io/jupyterhub/k8s-hub-slim
138139
--set prePuller.hook.enabled=true
139140
--set prePuller.hook.pullOnlyOnChanges=true
141+
os: ubuntu-24.04
140142
- k3s-channel: v1.31 # also test hub.existingSecret and subdomain_host
141143
test: install
142144
local-chart-extra-args: >-
@@ -146,6 +148,7 @@ jobs:
146148
--set hub.config.CryptKeeper.keys[0]=cccc3333
147149
--set hub.config.JupyterHub.subdomain_host=jupyterhub.example.org
148150
create-k8s-test-resources: true
151+
os: ubuntu-24.04
149152

150153
# We run three upgrade tests where we first install an already released
151154
# Helm chart version and then upgrade to the version we are now
@@ -174,6 +177,7 @@ jobs:
174177
--set hub.db.type=sqlite-pvc
175178
--set singleuser.storage.type=dynamic
176179
create-k8s-test-resources: true
180+
os: ubuntu-24.04
177181
- k3s-channel: v1.29
178182
test: upgrade
179183
upgrade-from: dev
@@ -184,6 +188,7 @@ jobs:
184188
local-chart-extra-args: >-
185189
--set hub.db.type=sqlite-pvc
186190
--set singleuser.storage.type=dynamic
191+
os: ubuntu-24.04
187192
- k3s-channel: v1.28
188193
test: upgrade
189194
# We're testing hub.db.upgrade with PostgreSQL so this version must be old
@@ -212,6 +217,9 @@ jobs:
212217
--set audit.logConnections=true
213218
--set audit.logDisconnections=true
214219
--set audit.clientMinMessages=debug
220+
os: ubuntu-24.04
221+
222+
runs-on: ${{ matrix.os }}
215223

216224
steps:
217225
- uses: actions/checkout@v4

dev-config-arm.yaml

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)