diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 06faa04..c54719d 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -33,10 +33,14 @@ jobs: - name: Install Helm Chart run: ./testdata/e2e/bin/install-chart.sh ${{ matrix.build.mode }} + - name: Wait for pod to start + run: ./testdata/e2e/bin/wait-for-start.sh ${{ matrix.build.protocol }} + - name: Show origin pre Logs + run: ./testdata/e2e/bin/show-origin-logs.sh pre - name: Wait for sync to finish run: ./testdata/e2e/bin/wait-for-sync.sh ${{ matrix.build.protocol }} - - name: Show origin Logs - run: ./testdata/e2e/bin/show-origin-logs.sh + - name: Show origin post Logs + run: ./testdata/e2e/bin/show-origin-logs.sh post - name: Show Replica Logs run: ./testdata/e2e/bin/show-replica-logs.sh - name: Show Sync Logs diff --git a/testdata/e2e/bin/show-origin-logs.sh b/testdata/e2e/bin/show-origin-logs.sh index 148f5e2..9afa862 100755 --- a/testdata/e2e/bin/show-origin-logs.sh +++ b/testdata/e2e/bin/show-origin-logs.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -echo "## Pod adguardhome-origin logs" >> $GITHUB_STEP_SUMMARY +echo "## Pod adguardhome-origin ${1} logs" >> $GITHUB_STEP_SUMMARY echo '```' >> $GITHUB_STEP_SUMMARY kubectl logs adguardhome-origin >> $GITHUB_STEP_SUMMARY echo '```' >> $GITHUB_STEP_SUMMARY diff --git a/testdata/e2e/bin/wait-for-start.sh b/testdata/e2e/bin/wait-for-start.sh new file mode 100755 index 0000000..d5ba6c3 --- /dev/null +++ b/testdata/e2e/bin/wait-for-start.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +kubectl wait --for=jsonpath='{.status.phase}'=Running pod/adguardhome-sync --timeout=1m diff --git a/testdata/e2e/bin/wait-for-sync.sh b/testdata/e2e/bin/wait-for-sync.sh index f5c4602..8e317a7 100755 --- a/testdata/e2e/bin/wait-for-sync.sh +++ b/testdata/e2e/bin/wait-for-sync.sh @@ -1,7 +1,5 @@ #!/bin/bash -kubectl wait --for=jsonpath='{.status.phase}'=Running pod/adguardhome-sync --timeout=1m - kubectl port-forward pod/adguardhome-sync 9090:9090 & for i in {1..6}; do