Merge branch 'main' into vhive-serverlessgh-683-upgrade-gvisor

CuriousGeorgiy · Apr 18, 2023 · 3ee09d6 · 3ee09d6
2 parents 11d62f1 + ead2d63
commit 3ee09d6
Show file tree

Hide file tree

Showing 76 changed files with 4,227 additions and 1,331 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,16 +22,16 @@ jobs:
   build:
     strategy:
       matrix:
-        go: ['1.16', '1.17', '1.18']
+        go: ['1.18', '1.19']
       # Build all variants regardless of failures
       fail-fast: false
 
     name: Build and check code quality
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
 
     - name: Set up Go ${{ matrix.go }}
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v4
       with:
         go-version: ${{ matrix.go }}
 

diff --git a/.github/workflows/build_docker_images.yml b/.github/workflows/build_docker_images.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   function_images:
     name: Build function docker images
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
@@ -29,7 +29,7 @@ jobs:
         DOCKER_BUILDKIT=1 docker build ./function-images/${{ matrix.image }}
   integ_test_image:
     name: Build integration test docker images
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/cri_minio_test.yml b/.github/workflows/cri_minio_test.yml
@@ -34,10 +34,10 @@ jobs:
     - name: Setup TMPDIR
       run: mkdir -p $TMPDIR
 
-    - name: Set up Go 1.18
-      uses: actions/setup-go@v3
+    - name: Set up Go 1.19
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.18
+        go-version: '1.19'
 
     - name: Check out code into the Go module directory
       uses: actions/checkout@v3

diff --git a/.github/workflows/cri_test.yml b/.github/workflows/cri_test.yml
diff --git a/.github/workflows/cri_tests.yml b/.github/workflows/cri_tests.yml
@@ -0,0 +1,47 @@
+name: vHive CRI tests
+
+on:
+  workflow_call:
+    inputs:
+      sandbox:
+        required: true
+        type: string
+
+env:
+  GO111MODULE: on
+
+jobs:
+  cri-tests:
+    name: CRI tests
+    env:
+      GITHUB_RUN_ID: ${{ github.run_id }}
+      GITHUB_VHIVE_ARGS: "-dbg"
+    runs-on: ${{ fromJSON(format('["self-hosted", "{0}-cri"]', inputs.sandbox)) }}
+
+    steps:
+
+      - name: Host Info
+        run: |
+          echo $HOSTNAME
+          echo $GITHUB_RUN_ID
+
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup vHive CRI test environment
+        run: ./scripts/github_runner/setup_cri_test_env.sh ${{ inputs.sandbox }}
+
+      - name: Run vHive CRI tests
+        run: source /etc/profile && go clean -testcache && go test ./cri -v -race -cover
+
+      - name: Archive log artifacts
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: ctrd-logs
+          path: |
+            /tmp/ctrd-logs/${{ github.run_id }}
+
+      - name: Cleaning
+        if: ${{ always() }}
+        run: ./scripts/github_runner/clean_cri_runner.sh ${{ inputs.sandbox }}
diff --git a/.github/workflows/firecracker_cri_tests.yml b/.github/workflows/firecracker_cri_tests.yml
@@ -0,0 +1,25 @@
+name: vHive firecracker CRI tests
+
+on:
+  push:
+    branches: [ main ]
+    paths-ignore:
+      - 'docs/**'
+      - '**.md'
+      - 'function-images/**'
+  pull_request:
+    branches: [ main ]
+    paths-ignore:
+      - 'docs/**'
+      - '**.md'
+      - 'function-images/**'
+  workflow_dispatch:
+
+env:
+  GO111MODULE: on
+
+jobs:
+  firecracker-cri-tests:
+    uses: ./.github/workflows/cri_tests.yml
+    with:
+      sandbox: firecracker
diff --git a/.github/workflows/gvisor_cri_tests.yml b/.github/workflows/gvisor_cri_tests.yml
@@ -13,59 +13,13 @@ on:
     - 'docs/**'
     - '**.md'
     - 'function-images/**'
-  schedule:
-    - cron:  '0 12 * * *'
   workflow_dispatch:
 
 env:
-  GOOS: linux
   GO111MODULE: on
-  TMPDIR: /tmp/
-  GOCACHE: /tmp/gocache
-  GOPATH: /tmp/gopath
 
 jobs:
   gvisor-cri-tests:
-    name: gVisor CRI tests
-    env:
-        GITHUB_RUN_ID: ${{ github.run_id }}
-        GITHUB_VHIVE_ARGS: "-dbg"
-    runs-on: [self-hosted, gvisor-cri]
-
-    steps:
-
-    - name: Host Info
-      run: |
-        echo $HOSTNAME
-        echo $GITHUB_RUN_ID
-        
-    - name: Setup TMPDIR
-      run: mkdir -p $TMPDIR
-
-    - name: Set up Go 1.18
-      uses: actions/setup-go@v3
-      with:
-        go-version: 1.18
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v3
-
-    - name: Create directory for vHive-CRI
-      run: sudo mkdir -p /etc/vhive-cri
-
-    - name: Build
-      run: go build
-
-    - name: Run vHive gVisor CRI tests
-      run: make test-cri-gvisor
-
-    - name: Archive log artifacts
-      if: ${{ always() }}
-      uses: actions/upload-artifact@v3
-      with:
-        name: ctrd-logs
-        path: |
-          /tmp/ctrd-logs/${{ github.run_id }}
-    - name: Cleaning
-      if: ${{ always() }}
-      run: ./scripts/github_runner/clean_cri_runner.sh gvisor
+    uses: ./.github/workflows/cri_tests.yml
+    with:
+      sandbox: gvisor
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -29,10 +29,10 @@ jobs:
         test-name: [test, test-man-bench]
     steps:
 
-    - name: Set up Go 1.18
-      uses: actions/setup-go@v3
+    - name: Set up Go 1.19
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.18
+        go-version: '1.19'
 
     - name: Set up Python 3.x
       uses: actions/setup-python@v4

diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   build:
     name: Spellcheck
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v3
     - uses: rojopolis/spellcheck-github-actions@0.30.0
@@ -17,7 +17,7 @@ jobs:
         config_path: configs/.spellcheck.yml
   commitlint:
     name: Commitlint
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
         with:
@@ -37,7 +37,7 @@ jobs:
           --verbose
   markdown-link-check:
     name: LinkCheck
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
       - uses: gaurav-nelson/github-action-markdown-link-check@v1

diff --git a/.github/workflows/nightly_tests.yml b/.github/workflows/nightly_tests.yml
@@ -20,10 +20,10 @@ jobs:
     - name: Setup TMPDIR
       run: mkdir -p $TMPDIR
 
-    - name: Set up Go 1.18
-      uses: actions/setup-go@v3
+    - name: Set up Go 1.19
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.18
+        go-version: '1.19'
 
     - name: Upgrade git
       run: |
@@ -72,10 +72,10 @@ jobs:
     - name: Setup TMPDIR
       run: mkdir -p $TMPDIR
 
-    - name: Set up Go 1.18
-      uses: actions/setup-go@v3
+    - name: Set up Go 1.19
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.18
+        go-version: '1.19'
 
     - name: Check out code into the Go module directory
       uses: actions/checkout@v3

diff --git a/.github/workflows/stargz_tests.yml b/.github/workflows/stargz_tests.yml
@@ -43,9 +43,9 @@ jobs:
         run: git lfs checkout
 
       - name: Set up Go 1.19
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.19
+          go-version: '1.19'
 
       - name: Create k8s Kind Cluster
         run: bash ./scripts/stargz/01-kind.sh
@@ -76,4 +76,4 @@ jobs:
         run: kn service apply stargz-test -f ./configs/knative_workloads/stargz-node.yaml --concurrency-target 1 
 
       - name: Curl container
-        run: curl http://stargz-test.default.127.0.0.1.sslip.io | grep "Hello World"
+        run: curl http://stargz-test.default.127.0.0.1.sslip.io | grep "Hello World"
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -29,10 +29,10 @@ jobs:
         module: [taps, misc, profile]
     steps:
 
-    - name: Set up Go 1.18
-      uses: actions/setup-go@v3
+    - name: Set up Go 1.19
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.18
+        go-version: '1.19'
 
     - name: Set up Python 3.x
       uses: actions/setup-python@v4
@@ -65,10 +65,10 @@ jobs:
     runs-on: [self-hosted, integ]
     steps:
 
-    - name: Set up Go 1.18
-      uses: actions/setup-go@v3
+    - name: Set up Go 1.19
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.18
+        go-version: '1.19'
 
     - name: Upgrade git
       run: |