Skip to content

Commit 4e25ac7

Browse files
committed
fix(ci): stabilize rootless and kube e2e setup
Signed-off-by: Alexander Watson <zredlined@gmail.com>
1 parent 8302377 commit 4e25ac7

2 files changed

Lines changed: 24 additions & 3 deletions

File tree

.github/workflows/e2e-test.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ jobs:
8989
chown openshell-test: "/run/user/$(id -u openshell-test)"
9090
chmod 700 "/run/user/$(id -u openshell-test)"
9191
chown -R openshell-test: .
92+
mkdir -p /home/openshell-test/.cache/mise /home/openshell-test/.local/state/mise
93+
chown -R openshell-test: /home/openshell-test/.cache /home/openshell-test/.local
9294
install -m 0755 "$(command -v mise)" /usr/local/bin/mise
9395
chmod a+x /root /root/.local /root/.local/bin
9496
for dir in /root/.cargo /root/.rustup /root/.local/share/mise /opt/mise; do
@@ -112,6 +114,9 @@ jobs:
112114
PATH="/usr/local/bin:/root/.cargo/bin:/opt/mise/shims:/root/.local/bin:${PATH}" \
113115
CARGO_HOME="/root/.cargo" \
114116
RUSTUP_HOME="/root/.rustup" \
117+
MISE_DATA_DIR="/opt/mise" \
118+
MISE_CACHE_DIR="/home/openshell-test/.cache/mise" \
119+
MISE_STATE_DIR="/home/openshell-test/.local/state/mise" \
115120
OPENSHELL_SUPERVISOR_IMAGE="${OPENSHELL_SUPERVISOR_IMAGE}" \
116121
OPENSHELL_REGISTRY="${OPENSHELL_REGISTRY}" \
117122
OPENSHELL_REGISTRY_HOST="${OPENSHELL_REGISTRY_HOST}" \

e2e/with-kube-gateway.sh

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,21 @@ helmctl() {
7272
helm --kube-context "${KUBE_CONTEXT}" "$@"
7373
}
7474

75+
chart_without_dependencies() {
76+
local src="${ROOT}/deploy/helm/openshell"
77+
local dst="${WORKDIR}/helm-chart-no-deps"
78+
79+
rm -rf "${dst}"
80+
cp -a "${src}" "${dst}"
81+
rm -rf "${dst}/charts" "${dst}/Chart.lock"
82+
awk '
83+
/^dependencies:[[:space:]]*$/ { skip = 1; next }
84+
skip && /^[^[:space:]-]/ { skip = 0 }
85+
!skip { print }
86+
' "${src}/Chart.yaml" >"${dst}/Chart.yaml"
87+
printf '%s\n' "${dst}"
88+
}
89+
7590
cleanup() {
7691
local exit_code=$?
7792

@@ -520,9 +535,9 @@ if [ -n "${HOST_GATEWAY_IP}" ]; then
520535
helm_extra_args+=(--set "server.hostGatewayIP=${HOST_GATEWAY_IP}")
521536
fi
522537

523-
helm dependency build "${ROOT}/deploy/helm/openshell"
524-
525538
if [ "${OPENSHELL_E2E_KUBE_DB_SCENARIOS:-0}" = "1" ]; then
539+
helm dependency build "${ROOT}/deploy/helm/openshell"
540+
526541
# --- Multi-scenario mode: test all database backends ---
527542
DB_PASSED=0
528543
DB_FAILED=0
@@ -558,8 +573,9 @@ if [ "${OPENSHELL_E2E_KUBE_DB_SCENARIOS:-0}" = "1" ]; then
558573
fi
559574
else
560575
# --- Single-install mode (default, existing behavior) ---
576+
chart_dir="$(chart_without_dependencies)"
561577
echo "Installing Helm chart (release=${RELEASE_NAME}, namespace=${NAMESPACE}, tag=${IMAGE_TAG_VALUE})..."
562-
helmctl install "${RELEASE_NAME}" "${ROOT}/deploy/helm/openshell" \
578+
helmctl install "${RELEASE_NAME}" "${chart_dir}" \
563579
--namespace "${NAMESPACE}" --create-namespace \
564580
--values "${ROOT}/deploy/helm/openshell/ci/values-skaffold.yaml" \
565581
--set "fullnameOverride=openshell" \

0 commit comments

Comments
 (0)