Merge pull request #2240 from thomasferrandiz/fix-test-workflows

test: fix e2e tests in CI workflows and don't run the workflows on "push" events

Author: thomasferrandiz

.github/workflows/build.yaml

@@ -1,6 +1,6 @@
 name: build flannel
 
-on: [push, pull_request]
+on: pull_request
 
 env:
   GO_VERSION: "1.23"

.github/workflows/codeql-analysis.yml

@@ -12,8 +12,6 @@
 name: "CodeQL"
 
 on:
-  push:
-    branches: [ "master" ]
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ "master" ]

.github/workflows/e2eTests.yaml

@@ -1,6 +1,6 @@
 name: e2e tests for flannel
 
-on: [push, pull_request]
+on: pull_request
 
 jobs:
   e2e-test:
@@ -16,6 +16,9 @@ jobs:
     - name: Check out code into the Go module directory
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
 
+    - name: set up modules
+      run: sudo modprobe br_netfilter overlay
+
     - name: Run tests
       id: testing
       continue-on-error: true

.github/workflows/golangci-lint.yaml

@@ -1,6 +1,6 @@
 name: run golangci-lint
 
-on: [push, pull_request]
+on: pull_request
 
 jobs:
   golangci:

.github/workflows/k3s-e2eTests.yml

@@ -1,6 +1,6 @@
-name: e2e tests for flannel
+name: k3s e2e tests for flannel
 
-on: [push, pull_request]
+on: pull_request
 
 env:
   ARCH: amd64
@@ -20,6 +20,9 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
 
+      - name: set up modules
+        run: sudo modprobe br_netfilter overlay
+
       - name: build flannel image
         run: make image
 

.github/workflows/trivy.yml

@@ -6,8 +6,6 @@
 name: Vulnerability scan
 
 on:
-  push:
-    branches: [ "master" ]
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ "master" ]

e2e/e2e-functions.sh

@@ -52,6 +52,12 @@ e2e-wait-for-services() {
 }
 export -f e2e-wait-for-services
 
+e2e-get-flannel-pod() {
+    local node_name=$1
+    kubectl --kubeconfig="${HOME}/.kube/config" get pods --field-selector "spec.nodeName=${node_name}" -n kube-flannel --no-headers
+}
+export -f e2e-get-flannel-pod
+
 e2e-wait-for-test-pods() {
     for pod in ${WAIT_FOR_PODS:="multitool1 multitool2"}; do
         while [[ "$(e2e-pod-ready $pod)" != 'true' ]]; do

e2e/run-e2e-tests.sh

@@ -83,7 +83,10 @@ get_pod_cidr() {
     kubectl --kubeconfig="${HOME}/.kube/config" get node ${node_name} --template '{{.spec.podCIDR}}'
 }
 
-# get_flannel_logs() 
+get_pod_logs() {
+    local pod_name=$1
+    kubectl --kubeconfig="${HOME}/.kube/config" logs $pod_name -n kube-flannel
+}
 
 pings() {
     create_test_pod multitool1 local-worker
@@ -96,6 +99,10 @@ pings() {
     if [ $retVal -ne 0 ]; then
         echo "test pods not ready in time. Checking their status..."
         kubectl --kubeconfig="${HOME}/.kube/config" get events --sort-by='.lastTimestamp' -A
+        echo "*****************************"
+        echo "flannel pod log:"
+        flannel_pod=$(e2e-get-flannel-pod local-worker)
+        echo "$(get_pod_logs $flannel_pod)"
         exit $retVal
     fi
 
@@ -136,8 +143,19 @@ prepare_test() {
     write-flannel-conf ${backend} ${enable_nftables}
 
     install-flannel
+    
     # wait for nodes to be ready
     timeout --foreground 5m bash -c "e2e-wait-for-nodes"
+    retVal=$?
+    if [ $retVal -ne 0 ]; then
+        echo "test nodes not ready in time. Checking their status..."
+        kubectl --kubeconfig="${HOME}/.kube/config" get events --sort-by='.lastTimestamp' -A
+        echo "*****************************"
+        echo "flannel pod log:"
+        flannel_pod=$(e2e-get-flannel-pod local-worker)
+        echo "$(get_pod_logs $flannel_pod)"
+        exit $retVal
+    fi
     # wait for services to be ready
     echo "wait for services to be ready..."
     timeout --foreground 5m bash -c "e2e-wait-for-services"