Skip to content

Commit 6574043

Browse files
feat: log collection changes
1 parent a18aadc commit 6574043

File tree

2 files changed

+22
-14
lines changed

2 files changed

+22
-14
lines changed

.github/workflows/e2e.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
df -h
7474
7575
- name: Run e2e tests
76-
run: devbox run -- make e2e-test E2E_LABEL='provider:${{ inputs.provider }}' E2E_SKIP='${{ inputs.skip }}' E2E_FOCUS='${{ inputs.focus }}' E2E_VERBOSE=true
76+
run: devbox run -- make e2e-test E2E_LABEL='provider:${{ inputs.provider }}' E2E_SKIP='${{ inputs.skip }}' E2E_FOCUS='${{ inputs.focus }}' E2E_VERBOSE=true E2E_SKIP_CLEANUP=true
7777
env:
7878
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7979
DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
@@ -183,6 +183,14 @@ jobs:
183183
path: bootstrap-pod-logs/
184184
if-no-files-found: warn
185185

186+
- name: Cleanup Kind cluster after log collection
187+
if: always()
188+
run: |
189+
echo "Cleaning up Kind cluster..."
190+
devbox run -- kind get clusters || true
191+
devbox run -- kind delete cluster --name caren-e2e || true
192+
echo "Cleanup completed"
193+
186194
- if: success() || failure() # always run even if the previous step fails
187195
name: Publish e2e test report
188196
uses: mikepenz/action-junit-report@v5

test/e2e/config/caren.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -217,16 +217,16 @@ variables:
217217
# DOCKER_HUB_PASSWORD: ""
218218

219219
intervals:
220-
default/wait-controllers: ["3m", "10s"]
221-
default/wait-cluster: ["10m", "10s"]
222-
default/wait-control-plane: ["10m", "10s"]
223-
default/wait-worker-nodes: ["10m", "10s"]
224-
default/wait-delete-cluster: ["30m", "10s"]
225-
default/wait-nodes-ready: ["10m", "10s"]
226-
default/wait-deployment: ["10m", "10s"]
227-
default/wait-daemonset: [ "5m", "10s" ]
228-
default/wait-statefulset: [ "10m", "10s" ]
229-
default/wait-service: [ "10m", "10s" ]
230-
default/wait-clusterresourceset: [ "5m", "10s" ]
231-
default/wait-helmrelease: [ "5m", "10s" ]
232-
default/wait-resource: [ "5m", "10s" ]
220+
default/wait-controllers: ["15m", "10s"]
221+
default/wait-cluster: ["15m", "10s"]
222+
default/wait-control-plane: ["15m", "10s"]
223+
default/wait-worker-nodes: ["15m", "10s"]
224+
default/wait-delete-cluster: ["15m", "10s"]
225+
default/wait-nodes-ready: ["15m", "10s"]
226+
default/wait-deployment: ["15m", "10s"]
227+
default/wait-daemonset: [ "10m", "10s" ]
228+
default/wait-statefulset: [ "15m", "10s" ]
229+
default/wait-service: [ "15m", "10s" ]
230+
default/wait-clusterresourceset: [ "10m", "10s" ]
231+
default/wait-helmrelease: [ "15m", "10s" ]
232+
default/wait-resource: [ "10m", "10s" ]

0 commit comments

Comments
 (0)