Merge branch 'main' into clippy-cast-possible-truncation

firecracker-microvm · Oct 9, 2023 · 225388c · 225388c
2 parents d0deb48 + 9dc52b7
commit 225388c
Show file tree

Hide file tree

Showing 22 changed files with 281 additions and 162 deletions.
diff --git a/.github/workflows/trigger_ab_tests.yml b/.github/workflows/trigger_ab_tests.yml
@@ -2,6 +2,7 @@ on:
   push:
     branches:
       - main
+      - firecracker-v*
 
 jobs:
   trigger_ab_test:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/docs/RELEASE_POLICY.md b/docs/RELEASE_POLICY.md
@@ -85,13 +85,14 @@ also be specifying the supported kernel versions.
 ## Release Status
 
 | Release | Release Date | Latest Patch | Min. end of support | Official end of Support        |
-| ------: | -----------: | -----------: | ------------------: | :----------------------------- |
-| v1.4    |   2023-07-20 | v1.4.1       |          2024-01-20 | Supported                      |
-| v1.3    |   2023-03-02 | v1.3.3       |          2023-09-02 | Supported                      |
-| v1.2    |   2022-11-30 | v1.2.1       |          2023-05-30 | 2023-07-20 (v1.4 released)     |
-| v1.1    |   2022-05-06 | v1.1.4       |          2022-11-06 | 2023-03-02 (v1.3 released)     |
-| v1.0    |   2022-01-31 | v1.0.2       |          2022-07-31 | 2022-11-30 (v1.2 released)     |
-| v0.25   |   2021-03-13 | v0.25.2      |          2021-09-13 | 2022-03-13 (end of 1y support) |
+|--------:|-------------:|-------------:|--------------------:|:-------------------------------|
+|    v1.5 |   2023-10-09 |       v1.5.0 |          2024-04-09 | Supported                      |
+|    v1.4 |   2023-07-20 |       v1.4.1 |          2024-01-20 | Supported                      |
+|    v1.3 |   2023-03-02 |       v1.3.3 |          2023-09-02 | 2023-10-09 (v1.5 released)     |
+|    v1.2 |   2022-11-30 |       v1.2.1 |          2023-05-30 | 2023-07-20 (v1.4 released)     |
+|    v1.1 |   2022-05-06 |       v1.1.4 |          2022-11-06 | 2023-03-02 (v1.3 released)     |
+|    v1.0 |   2022-01-31 |       v1.0.2 |          2022-07-31 | 2022-11-30 (v1.2 released)     |
+|   v0.25 |   2021-03-13 |      v0.25.2 |          2021-09-13 | 2022-03-13 (end of 1y support) |
 
 ## API support
 

diff --git a/docs/getting-started.md b/docs/getting-started.md
@@ -76,13 +76,13 @@ with a Ubuntu 22.04 rootfs from our CI:
 ARCH="$(uname -m)"
 
 # Download a linux kernel binary
-wget https://s3.amazonaws.com/spec.ccfc.min/firecracker-ci/v1.5/${ARCH}/vmlinux-5.10.186
+wget https://s3.amazonaws.com/spec.ccfc.min/firecracker-ci/v1.6/${ARCH}/vmlinux-5.10.186
 
 # Download a rootfs
-wget https://s3.amazonaws.com/spec.ccfc.min/firecracker-ci/v1.5/${ARCH}/ubuntu-22.04.ext4
+wget https://s3.amazonaws.com/spec.ccfc.min/firecracker-ci/v1.6/${ARCH}/ubuntu-22.04.ext4
 
 # Download the ssh key for the rootfs
-wget https://s3.amazonaws.com/spec.ccfc.min/firecracker-ci/v1.5/${ARCH}/ubuntu-22.04.id_rsa
+wget https://s3.amazonaws.com/spec.ccfc.min/firecracker-ci/v1.6/${ARCH}/ubuntu-22.04.id_rsa
 
 # Set user read permission on the ssh key
 chmod 400 ./ubuntu-22.04.id_rsa

diff --git a/src/api_server/swagger/firecracker.yaml b/src/api_server/swagger/firecracker.yaml
@@ -5,7 +5,7 @@ info:
     The API is accessible through HTTP calls on specific URLs
     carrying JSON modeled data.
     The transport medium is a Unix Domain Socket.
-  version: 1.5.0-dev
+  version: 1.6.0-dev
   termsOfService: ""
   contact:
     email: "[email protected]"

diff --git a/src/cpu-template-helper/Cargo.toml b/src/cpu-template-helper/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cpu-template-helper"
-version = "1.5.0-dev"
+version = "1.6.0-dev"
 authors = ["Amazon Firecracker team <[email protected]>"]
 edition = "2021"
 license = "Apache-2.0"
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ on: @@
       push:
         branches:
           - main
+          - firecracker-v*
     jobs:
       trigger_ab_test:
@@ Expand Down @@