chore: bump version to 1.7.0-dev

We are starting 1.7.0 development. Signed-off-by: Jonathan Woollett-Light <jcawl@amazon.co.uk> Co-authored-by: Pablo Barbáchano <pablob@amazon.com>
firecracker-microvm · Dec 18, 2023 · 5adfb16 · 5adfb16
1 parent 036d990
commit 5adfb16
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 38 deletions.
diff --git a/Cargo.lock b/Cargo.lock
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.6/${ARCH}/vmlinux-5.10.198
+wget https://s3.amazonaws.com/spec.ccfc.min/firecracker-ci/v1.7/${ARCH}/vmlinux-5.10.198
 
 # Download a rootfs
-wget https://s3.amazonaws.com/spec.ccfc.min/firecracker-ci/v1.6/${ARCH}/ubuntu-22.04.ext4
+wget https://s3.amazonaws.com/spec.ccfc.min/firecracker-ci/v1.7/${ARCH}/ubuntu-22.04.ext4
 
 # Download the ssh key for the rootfs
-wget https://s3.amazonaws.com/spec.ccfc.min/firecracker-ci/v1.6/${ARCH}/ubuntu-22.04.id_rsa
+wget https://s3.amazonaws.com/spec.ccfc.min/firecracker-ci/v1.7/${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.6.0-dev
+  version: 1.7.0-dev
   termsOfService: ""
   contact:
     email: "compute-capsule@amazon.com"

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.6.0-dev"
+version = "1.7.0-dev"
 authors = ["Amazon Firecracker team <firecracker-devel@amazon.com>"]
 edition = "2021"
 license = "Apache-2.0"

diff --git a/src/firecracker/Cargo.toml b/src/firecracker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "firecracker"
-version = "1.6.0-dev"
+version = "1.7.0-dev"
 authors = ["Amazon Firecracker team <firecracker-devel@amazon.com>"]
 edition = "2021"
 build = "build.rs"

diff --git a/src/jailer/Cargo.toml b/src/jailer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "jailer"
-version = "1.6.0-dev"
+version = "1.7.0-dev"
 authors = ["Amazon Firecracker team <firecracker-devel@amazon.com>"]
 edition = "2021"
 description = "Process for starting Firecracker in production scenarios; applies a cgroup/namespace isolation barrier and then drops privileges."

diff --git a/src/rebase-snap/Cargo.toml b/src/rebase-snap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rebase-snap"
-version = "1.6.0-dev"
+version = "1.7.0-dev"
 authors = ["Amazon Firecracker team <firecracker-devel@amazon.com>"]
 edition = "2021"
 license = "Apache-2.0"

diff --git a/src/seccompiler/Cargo.toml b/src/seccompiler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "seccompiler"
-version = "1.6.0-dev"
+version = "1.7.0-dev"
 authors = ["Amazon Firecracker team <firecracker-devel@amazon.com>"]
 edition = "2021"
 description = "Program that compiles multi-threaded seccomp-bpf filters expressed as JSON into raw BPF programs, serializing them and outputting them to a file."

diff --git a/src/snapshot-editor/Cargo.toml b/src/snapshot-editor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "snapshot-editor"
-version = "1.6.0-dev"
+version = "1.7.0-dev"
 authors = ["Amazon Firecracker team <firecracker-devel@amazon.com>"]
 edition = "2021"
 license = "Apache-2.0"

diff --git a/src/vmm/src/version_map.rs b/src/vmm/src/version_map.rs
@@ -38,6 +38,8 @@ pub const FC_V1_4_SNAP_VERSION: u16 = 8;
 pub const FC_V1_5_SNAP_VERSION: u16 = 9;
 /// Snap version for Firecracker v1.6
 pub const FC_V1_6_SNAP_VERSION: u16 = 10;
+/// Snap version for Firecracker v1.7
+pub const FC_V1_7_SNAP_VERSION: u16 = 11;
 
 lazy_static! {
     // Note: until we have a better design, this needs to be updated when the version changes.
@@ -88,6 +90,9 @@ lazy_static! {
         version_map.set_type_version(VirtioDeviceState::type_id(), 2);
         version_map.set_type_version(DeviceStates::type_id(), 5);
 
+        // v1.7 state change mappings
+        version_map.new_version();
+
         version_map
     };
 
@@ -116,6 +121,7 @@ lazy_static! {
         mapping.insert(Version::new(1, 4, 0), FC_V1_4_SNAP_VERSION);
         mapping.insert(Version::new(1, 5, 0), FC_V1_5_SNAP_VERSION);
         mapping.insert(Version::new(1, 6, 0), FC_V1_6_SNAP_VERSION);
+        mapping.insert(Version::new(1, 7, 0), FC_V1_7_SNAP_VERSION);
 
         mapping
     };

diff --git a/tools/devtool b/tools/devtool
@@ -518,7 +518,7 @@ ensure_ci_artifacts() {
 
     # Fetch all the artifacts so they are local
     say "Fetching CI artifacts from S3"
-    S3_URL=s3://spec.ccfc.min/firecracker-ci/v1.6/$(uname -m)
+    S3_URL=s3://spec.ccfc.min/firecracker-ci/v1.7/$(uname -m)
     ARTIFACTS=$MICROVM_IMAGES_DIR/$(uname -m)
     if [ ! -d "$ARTIFACTS" ]; then
         mkdir -pv $ARTIFACTS