Fixes one more test

Signed-off-by: Mohamed L. Karaoui <[email protected]>

Author: moharaka

.github/workflows/cri_tests.yml

@@ -40,8 +40,35 @@ jobs:
           sudo apt update
           sudo apt install rsync -y
 
-      - name: Build setup scripts
-        run: pushd scripts && go build -o setup_tool && popd
+      - name: Ensure /etc/cni/net.d exists
+        run: sudo mkdir -p /etc/cni/net.d
+
+      - name: Install containerd and iptables
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y containerd iptables
+
+      - name: Install Docker
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y docker.io
+
+      - name: Start Docker Daemon
+        run: |
+          sudo dockerd > /tmp/dockerd.log 2>&1 &
+          sleep 5  # wait for dockerd to be ready
+
+      - name: Start Minikube
+        uses: medyagh/setup-minikube@latest
+        with:
+          driver: docker
+          wait: all
+          start-args: '--force'
+
+      - name: Check cluster status
+        run: kubectl get nodes
+        - name: Build setup scripts
+          run: pushd scripts && go build -o setup_tool && popd
 
       - name: Setup vHive CRI test environment
         run: ./scripts/github_runner/setup_cri_test_env.sh ${{ inputs.sandbox }}

.github/workflows/integration_tests.yml

@@ -81,6 +81,16 @@ jobs:
 
     - name: Check cluster status
       run: kubectl get nodes
+
+    - name: Collect Docker and iptables logs for debug
+      if: failure()
+      run: |
+        tail -50 /tmp/dockerd.log || true
+        sudo iptables -t nat -L -v -n
+
+    - name: Ensure kubeconfig set
+      run: |
+        echo "KUBECONFIG=$HOME/.kube/config" >> $GITHUB_ENV
     
     - name: Build setup scripts
       run: pushd scripts && go build -o setup_tool && popd

.github/workflows/unit_tests.yml

@@ -147,6 +147,34 @@ jobs:
     - name: Cleanup runner disk space
       run: ./scripts/github_runner/gh-actions-disk-cleanup.sh
 
+    - name: Ensure /etc/cni/net.d exists
+      run: sudo mkdir -p /etc/cni/net.d
+
+    - name: Install containerd and iptables
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y containerd iptables
+
+    - name: Install Docker
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y docker.io
+
+    - name: Start Docker Daemon
+      run: |
+        sudo dockerd > /tmp/dockerd.log 2>&1 &
+        sleep 5  # wait for dockerd to be ready
+
+    - name: Start Minikube
+      uses: medyagh/setup-minikube@latest
+      with:
+        driver: docker
+        wait: all
+        start-args: '--force'
+
+    - name: Check cluster status
+      run: kubectl get nodes
+
     - name: Build setup scripts
       run: pushd scripts && go build -o setup_tool && popd
 

scripts/github_runner/setup_cri_test_env.sh

@@ -35,36 +35,18 @@ fi
 SANDBOX=$1
 VHIVE_ROOT="$(git rev-parse --show-toplevel)"
 
-echo "=== Setting-Up node ==="
-# Set up the node with proper firecracker-containerd installation
-$VHIVE_ROOT/scripts/setup_tool -vhive-repo-dir $VHIVE_ROOT setup_node $SANDBOX
-
 echo "=== Setting-Up onenode-vhive ==="
 $VHIVE_ROOT/scripts/setup_tool -vhive-repo-dir $VHIVE_ROOT start_onenode_vhive_cluster $SANDBOX
 # $VHIVE_ROOT/scripts/cloudlab/start_onenode_vhive_cluster.sh "$SANDBOX"
 sleep 30s
 
 echo "=== Setting-Up zipkin ==="
 # KUBECONFIG=/etc/kubernetes/admin.conf sudo $VHIVE_ROOT/scripts/setup_zipkin.sh
-#$VHIVE_ROOT/scripts/setup_tool -vhive-repo-dir $VHIVE_ROOT setup_zipkin
+$VHIVE_ROOT/scripts/setup_tool -vhive-repo-dir $VHIVE_ROOT setup_zipkin
 
 # FIXME (gh-709)
 #source etc/profile && go run $VHIVE_ROOT/examples/registry/populate_registry.go -imageFile $VHIVE_ROOT/examples/registry/images.txt
 
-echo "=== Kubernetes Status ==="
-sudo KUBECONFIG=/etc/kubernetes/admin.conf kubectl get nodes -o wide
-sudo KUBECONFIG=/etc/kubernetes/admin.conf kubectl get pods --all-namespaces
-echo "=== Knative Components ==="
-sudo KUBECONFIG=/etc/kubernetes/admin.conf kubectl get pods -n knative-serving
-sudo KUBECONFIG=/etc/kubernetes/admin.conf kubectl get ksvc --all-namespaces
-
-sudo kubectl get deployment -n knative-serving autoscaler
-sudo kubectl get svc -n knative-serving autoscaler
-sudo kubectl get pods -n kube-system -l k8s-app=kube-dns
-
-
-
-
 echo "=== Activator Status ===" && sudo KUBECONFIG=/etc/kubernetes/admin.conf kubectl describe pod -n knative-serving -l app=activator
 echo "=== Activator Logs ===" && sudo KUBECONFIG=/etc/kubernetes/admin.conf kubectl logs -n knative-serving -l app=activator
 

scripts/setup_firecracker_containerd.sh

@@ -61,7 +61,3 @@ if [ 64 -eq ${#CONTAINERID} ]; then
 fi
 
 sudo cp $CONFIGS/firecracker-runtime.json /etc/containerd/
-
-# Create directory and symlink for CRI socket
-sudo mkdir -p /etc/vhive-cri
-sudo ln -sf /run/firecracker-containerd/containerd.sock /etc/vhive-cri/vhive-cri.sock