Skip to content

Commit f599777

Browse files
committed
Migrates remaining tests to github runners
Signed-off-by: Mohamed L. Karaoui <[email protected]>
1 parent 3de16e7 commit f599777

File tree

7 files changed

+49
-10
lines changed

7 files changed

+49
-10
lines changed

.github/workflows/cri_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
env:
1717
GITHUB_RUN_ID: ${{ github.run_id }}
1818
GITHUB_VHIVE_ARGS: "-dbg"
19-
runs-on: ${{ fromJSON(format('["self-hosted", "{0}-cri"]', inputs.sandbox)) }}
19+
runs-on: ubuntu-24.04
2020

2121
steps:
2222
- name: Host Info
@@ -51,7 +51,7 @@ jobs:
5151

5252
- name: Run sandbox specific tests
5353
if: ${{ inputs.sandbox == 'firecracker' }}
54-
run: source /etc/profile && go clean -testcache && go test ./cri/${{ inputs.sandbox }} -v -race -cover
54+
run: source /etc/profile && go clean -testcache && sudo go test ./cri/${{ inputs.sandbox }} -v -race -cover
5555

5656
- name: Archive log artifacts
5757
if: ${{ always() }}

.github/workflows/integration_tests.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,14 @@ jobs:
5353
run: |
5454
sudo apt update
5555
sudo apt install rsync -y
56+
57+
- name: Start Minikube
58+
uses: medyagh/setup-minikube@latest
59+
with:
60+
minikube-start-args: '--force'
61+
62+
- name: Check cluster status
63+
run: kubectl get nodes
5664

5765
- name: Build setup scripts
5866
run: pushd scripts && go build -o setup_tool && popd

.github/workflows/unit_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
7070
profile-unit-test:
7171
name: "Unit test: profile unit test"
72-
runs-on: [self-hosted, profile]
72+
runs-on: ubuntu-24.04
7373
strategy:
7474
fail-fast: false
7575
matrix:

configs/knative_workloads/gvisor/helloworld.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ spec:
66
template:
77
spec:
88
containers:
9-
- image: ghcr.io/ease-lab/helloworld:var_workload
9+
- image: ghcr.io/ease-lab/helloworld@sha256:12dc6715ed1a8306f246ceaf7742c09e38a52a79d17421e4a50d7e0e09fdbc25
1010
ports:
1111
- name: h2c # For GRPC support
1212
containerPort: 50051
1313
env:
1414
- name: GUEST_PORT # Port on which the firecracker-containerd container is accepting requests
1515
value: "50051"
1616
- name: GUEST_IMAGE # Container image to use for firecracker-containerd container
17-
value: "ghcr.io/ease-lab/helloworld:var_workload"
17+
value: "ghcr.io/ease-lab/helloworld@sha256:12dc6715ed1a8306f246ceaf7742c09e38a52a79d17421e4a50d7e0e09fdbc25"

scripts/github_runner/setup_cri_test_env.sh

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,39 @@ fi
3535
SANDBOX=$1
3636
VHIVE_ROOT="$(git rev-parse --show-toplevel)"
3737

38+
echo "=== Setting-Up node ==="
39+
# Set up the node with proper firecracker-containerd installation
40+
$VHIVE_ROOT/scripts/setup_tool -vhive-repo-dir $VHIVE_ROOT setup_node $SANDBOX
41+
42+
echo "=== Setting-Up onenode-vhive ==="
3843
$VHIVE_ROOT/scripts/setup_tool -vhive-repo-dir $VHIVE_ROOT start_onenode_vhive_cluster $SANDBOX
3944
# $VHIVE_ROOT/scripts/cloudlab/start_onenode_vhive_cluster.sh "$SANDBOX"
4045
sleep 30s
4146

47+
echo "=== Setting-Up zipkin ==="
4248
# KUBECONFIG=/etc/kubernetes/admin.conf sudo $VHIVE_ROOT/scripts/setup_zipkin.sh
43-
$VHIVE_ROOT/scripts/setup_tool -vhive-repo-dir $VHIVE_ROOT setup_zipkin
49+
#$VHIVE_ROOT/scripts/setup_tool -vhive-repo-dir $VHIVE_ROOT setup_zipkin
4450

4551
# FIXME (gh-709)
4652
#source etc/profile && go run $VHIVE_ROOT/examples/registry/populate_registry.go -imageFile $VHIVE_ROOT/examples/registry/images.txt
4753

54+
echo "=== Kubernetes Status ==="
55+
sudo KUBECONFIG=/etc/kubernetes/admin.conf kubectl get nodes -o wide
56+
sudo KUBECONFIG=/etc/kubernetes/admin.conf kubectl get pods --all-namespaces
57+
echo "=== Knative Components ==="
58+
sudo KUBECONFIG=/etc/kubernetes/admin.conf kubectl get pods -n knative-serving
59+
sudo KUBECONFIG=/etc/kubernetes/admin.conf kubectl get ksvc --all-namespaces
60+
61+
sudo kubectl get deployment -n knative-serving autoscaler
62+
sudo kubectl get svc -n knative-serving autoscaler
63+
sudo kubectl get pods -n kube-system -l k8s-app=kube-dns
64+
65+
66+
67+
68+
echo "=== Activator Status ===" && sudo KUBECONFIG=/etc/kubernetes/admin.conf kubectl describe pod -n knative-serving -l app=activator
69+
echo "=== Activator Logs ===" && sudo KUBECONFIG=/etc/kubernetes/admin.conf kubectl logs -n knative-serving -l app=activator
70+
4871
sudo KUBECONFIG=/etc/kubernetes/admin.conf kn service apply helloworld -f $VHIVE_ROOT/configs/knative_workloads/$SANDBOX/helloworld.yaml
4972
sudo KUBECONFIG=/etc/kubernetes/admin.conf kn service apply helloworldserial -f $VHIVE_ROOT/configs/knative_workloads/$SANDBOX/helloworldSerial.yaml
5073
sudo KUBECONFIG=/etc/kubernetes/admin.conf kn service apply pyaes -f $VHIVE_ROOT/configs/knative_workloads/$SANDBOX/pyaes.yaml

scripts/setup_firecracker_containerd.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,7 @@ if [ 64 -eq ${#CONTAINERID} ]; then
6161
fi
6262

6363
sudo cp $CONFIGS/firecracker-runtime.json /etc/containerd/
64+
65+
# Create directory and symlink for CRI socket
66+
sudo mkdir -p /etc/vhive-cri
67+
sudo ln -sf /run/firecracker-containerd/containerd.sock /etc/vhive-cri/vhive-cri.sock

snapshotting/manager.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,19 @@ type SnapshotManager struct {
4141
}
4242

4343
// Snapshot identified by VM id
44-
4544
func NewSnapshotManager(baseFolder string) *SnapshotManager {
4645
manager := new(SnapshotManager)
4746
manager.snapshots = make(map[string]*Snapshot)
4847
manager.baseFolder = baseFolder
4948

50-
// Clean & init basefolder
51-
_ = os.RemoveAll(manager.baseFolder)
52-
_ = os.MkdirAll(manager.baseFolder, os.ModePerm)
49+
if err := os.RemoveAll(manager.baseFolder); err != nil {
50+
log.Printf("Failed to clean base folder: %v", err)
51+
return nil
52+
}
53+
if err := os.MkdirAll(manager.baseFolder, 0755); err != nil {
54+
log.Printf("Failed to create base folder: %v", err)
55+
return nil
56+
}
5357

5458
return manager
5559
}

0 commit comments

Comments
 (0)