resolve merge conflict

vhive-serverless · Feb 17, 2024 · a9fca07 · a9fca07
2 parents 2147320 + a7b5284
commit a9fca07
Show file tree

Hide file tree

Showing 174 changed files with 4,226 additions and 10,179 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,30 +9,6 @@ updates:
       - dependency-name: "*"
         update-types: [ "version-update:semver-patch" ]
 
-  - package-ecosystem: "gomod"
-    directory: "/utils/tracing/go"
-    schedule:
-      interval: "weekly"
-    ignore:
-      - dependency-name: "*"
-        update-types: [ "version-update:semver-patch" ]
-
-  - package-ecosystem: "gomod"
-    directory: "/examples/deployer"
-    schedule:
-      interval: "weekly"
-    ignore:
-      - dependency-name: "*"
-        update-types: [ "version-update:semver-patch" ]
-
-  - package-ecosystem: "gomod"
-    directory: "/examples/invoker"
-    schedule:
-      interval: "weekly"
-    ignore:
-      - dependency-name: "*"
-        update-types: [ "version-update:semver-patch" ]
-
   # Enable version updates for Actions
   - package-ecosystem: "github-actions"
     # Look for `.github/workflows` in the `root` directory

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,12 +2,12 @@ name: vHive build tests
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, legacy-firecracker-v0.24.0-with-upf-support ]
     paths-ignore:
     - 'docs/**'
     - '**.md'
   pull_request:
-    branches: [ main ]
+    branches: [ main, legacy-firecracker-v0.24.0-with-upf-support ]
     paths-ignore:
     - 'docs/**'
     - '**.md'
@@ -31,12 +31,12 @@ jobs:
     steps:
 
     - name: Set up Go ${{ matrix.go }}
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go }}
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         # to add commit DCO checks later
         fetch-depth: 21

diff --git a/.github/workflows/build_docker_images.yml b/.github/workflows/build_docker_images.yml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         image: [grpc, helloworld, chameleon, pyaes, image_rotate_s3, lr_serving, json_serdes_s3, cnn_serving, rnn_serving, lr_training_s3, video_processing_s3, springboot, tests/save_load_minio]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         ref: main
     - name: docker build images
@@ -35,7 +35,7 @@ jobs:
       matrix:
         image: [github_runner, github_runner_cri, cri_dev_env]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         ref: main
     - name: pull binaries

diff --git a/.github/workflows/build_setup.yml b/.github/workflows/build_setup.yml
@@ -2,12 +2,12 @@ name: vHive setup scripts build tests
 
 on:
     push:
-      branches: [ main ]
+      branches: [ main, legacy-firecracker-v0.24.0-with-upf-support ]
       paths-ignore:
       - 'docs/**'
       - '**.md'
     pull_request:
-      branches: [ main ]
+      branches: [ main, legacy-firecracker-v0.24.0-with-upf-support ]
       paths-ignore:
       - 'docs/**'
       - '**.md'
@@ -23,12 +23,12 @@ jobs:
         runs-on: ubuntu-20.04
         steps:
         - name: Set up Go 1.19
-          uses: actions/setup-go@v4
+          uses: actions/setup-go@v5
           with:
             go-version: '1.19'
 
         - name: Check out the code
-          uses: actions/checkout@v3
+          uses: actions/checkout@v4
 
         - name: Build scripts
           run: pushd scripts && go build -o setup_tool && popd

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, legacy-firecracker-v0.24.0-with-upf-support ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ main ]
+    branches: [ main, legacy-firecracker-v0.24.0-with-upf-support ]
   workflow_dispatch:
   schedule:
     - cron: '40 13 * * 2'
@@ -36,11 +36,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -51,7 +51,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -65,4 +65,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/cri_minio_test.yml b/.github/workflows/cri_minio_test.yml
@@ -2,13 +2,13 @@ name: MinIO tests
 
 on:
   # push:
-  #   branches: [ main ]
+  #   branches: [ main, legacy-firecracker-v0.24.0-with-upf-support ]
   #   paths-ignore:
   #   - 'docs/**'
   #   - '**.md'
   #   - 'function-images/**'
   # pull_request:
-  #   branches: [ main ]
+  #   branches: [ main, legacy-firecracker-v0.24.0-with-upf-support ]
   #   paths-ignore:
   #   - 'docs/**'
   #   - '**.md'
@@ -35,12 +35,12 @@ jobs:
       run: mkdir -p $TMPDIR
 
     - name: Set up Go 1.19
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: '1.19'
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Build
       run: go build

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

diff --git a/.github/workflows/cri_tests.yml b/.github/workflows/cri_tests.yml
@@ -26,12 +26,17 @@ jobs:
           echo $GITHUB_RUN_ID
 
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up golang
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: '1.19'
+
+      - name: Add rsync
+        run: |
+          sudo apt update
+          sudo apt install rsync -y
 
       - name: Build setup scripts
         run: pushd scripts && go build -o setup_tool && popd

diff --git a/.github/workflows/firecracker_cri_tests.yml b/.github/workflows/firecracker_cri_tests.yml
@@ -2,13 +2,13 @@ name: vHive firecracker CRI tests
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, legacy-firecracker-v0.24.0-with-upf-support ]
     paths-ignore:
       - 'docs/**'
       - '**.md'
       - 'function-images/**'
   pull_request:
-    branches: [ main ]
+    branches: [ main, legacy-firecracker-v0.24.0-with-upf-support ]
     paths-ignore:
       - 'docs/**'
       - '**.md'

diff --git a/.github/workflows/gvisor_cri_tests.yml b/.github/workflows/gvisor_cri_tests.yml
@@ -2,13 +2,13 @@ name: vHive gVisor CRI tests
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, legacy-firecracker-v0.24.0-with-upf-support ]
     paths-ignore:
     - 'docs/**'
     - '**.md'
     - 'function-images/**'
   pull_request:
-    branches: [ main ]
+    branches: [ main, legacy-firecracker-v0.24.0-with-upf-support ]
     paths-ignore:
     - 'docs/**'
     - '**.md'

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -2,13 +2,13 @@ name: vHive integration tests
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, legacy-firecracker-v0.24.0-with-upf-support ]
     paths-ignore:
     - 'docs/**'
     - '**.md'
     - 'function-images/**'
   pull_request:
-    branches: [ main ]
+    branches: [ main, legacy-firecracker-v0.24.0-with-upf-support ]
     paths-ignore:
     - 'docs/**'
     - '**.md'
@@ -32,12 +32,12 @@ jobs:
     steps:
 
     - name: Set up Go 1.19
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: '1.19'
 
     - name: Set up Python 3.x
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
 
@@ -48,7 +48,7 @@ jobs:
         sudo apt install git -y
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         lfs: true
 

diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -1,28 +1,28 @@
 name: Linters
 on:
   push:
-    branches: [ main ]
+    branches: [ main, legacy-firecracker-v0.24.0-with-upf-support ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, legacy-firecracker-v0.24.0-with-upf-support ]
 
 jobs:
   build:
     name: Spellcheck
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v3
-    - uses: rojopolis/spellcheck-github-actions@0.33.1
+    - uses: actions/checkout@v4
+    - uses: rojopolis/spellcheck-github-actions@0.35.0
       name: Spellcheck
       with:
         config_path: configs/.spellcheck.yml
   commitlint:
     name: Commitlint
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: '14'
 
@@ -39,7 +39,7 @@ jobs:
     name: LinkCheck
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: gaurav-nelson/github-action-markdown-link-check@v1
         with:
           use-quiet-mode: 'yes'

diff --git a/.github/workflows/nightly_tests.yml b/.github/workflows/nightly_tests.yml
@@ -21,7 +21,7 @@ jobs:
       run: mkdir -p $TMPDIR
 
     - name: Set up Go 1.19
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: '1.19'
 
@@ -32,7 +32,7 @@ jobs:
         sudo apt install git -y
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         lfs: true
 
@@ -58,7 +58,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        vhive_args: ["-dbg", "-dbg -snapshots", "-dbg -snapshots -upf"]
+        # User-level page faults are temporarily disabled (gh-807)
+        # vhive_args: ["-dbg", "-dbg -snapshots", "-dbg -snapshots -upf"]
+        vhive_args: [ "-dbg", "-dbg -snapshots" ]
     env:
         GITHUB_RUN_ID: ${{ github.run_id }}
         GITHUB_JOB: ${{ github.job }}
@@ -76,12 +78,12 @@ jobs:
       run: mkdir -p $TMPDIR
 
     - name: Set up Go 1.19
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: '1.19'
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Build setup scripts
       run: pushd scripts && go build -o setup_tool && popd