Skip to content

Commit 354630f

Browse files
committed
PANDARIA: update CI runner
1 parent 2d612a4 commit 354630f

2 files changed

Lines changed: 32 additions & 4 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
os:
33-
- ubuntu-latest
34-
- ubuntu-24.04-arm
33+
- org-cnrancher-runner-dind-x64
34+
- org-cnrancher-runner-dind-arm64
3535
runs-on: ${{ matrix.os }}
3636
steps:
3737
- name : Checkout repository
@@ -68,6 +68,11 @@ jobs:
6868
tar cfz "${{ runner.temp }}/rancher.tgz" -C build/chart/rancher .
6969
popd
7070
71+
- name: "PANDARIA: install make"
72+
run: |
73+
sudo apt update
74+
sudo apt install -y build-essential
75+
7176
- name: Build, Test, and Package
7277
run: make ci
7378

.github/workflows/scripts/integration-test-ci

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,40 @@ echo "Rancher deployed"
2525
webhook_deployment_created() {
2626
kubectl get deployments -n cattle-system | grep rancher-webhook
2727
}
28+
29+
# PANDARIA: Dump detailed info of webhook deployment
30+
webhook_deployment_available() {
31+
set -x
32+
kubectl get pods -A
33+
echo "---------------------------"
34+
webhook_pod=$(kubectl get pods -n cattle-system -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' | grep rancher-webhook)
35+
kubectl describe pod -n cattle-system $webhook_pod
36+
echo "------------------------------------"
37+
kubectl rollout status --watch=true --timeout=10s -n cattle-system deploy/rancher-webhook
38+
echo "------------------------------------"
39+
set +x
40+
}
2841
try --max 48 --delay 5 --waitmsg "Waiting for a rancher-webhook deployment to be created" --failmsg "Deployment creation failed" webhook_deployment_created
2942

30-
try --waitmsg "Waiting for rancher/webhook to be deployed" --failmsg "No rancher/webhook here" kubectl rollout status --watch=true --timeout=10s -n cattle-system deploy/rancher-webhook
43+
try --max 60 --delay 15 --waitmsg "Waiting for rancher/webhook to be deployed" --failmsg "No rancher/webhook here" webhook_deployment_available
3144
echo "Rancher deployed"
3245

3346
webhook_deployed() {
47+
# PANDARIA: Dump detailed info of webhook deployment
48+
set -x
49+
kubectl get pods -A
50+
echo "---------------------------"
51+
webhook_pod=$(kubectl get pods -n cattle-system -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' | grep rancher-webhook)
52+
kubectl describe pod -n cattle-system $webhook_pod
53+
echo "------------------------------------"
54+
kubectl rollout status --watch=true --timeout=10s -n cattle-system deploy/rancher-webhook
55+
echo "------------------------------------"
56+
3457
status=$(kubectl get apps.catalog.cattle.io -n cattle-system rancher-webhook -o jsonpath="{@.status.summary.state}") && [[ "$status" == "deployed" ]]
3558
}
3659

3760
# Wait for Rancher to deploy rancher-webhook.
38-
try --waitmsg "Waiting for webhook to be deployed (2)" webhook_deployed
61+
try --max 60 --delay 15 --waitmsg "Waiting for webhook to be deployed (2)" webhook_deployed
3962
echo "Webhook deployed"
4063

4164
crds_exist() {

0 commit comments

Comments
 (0)