From 0bb10b725e562ec604c889532c442c34aa0ef2c9 Mon Sep 17 00:00:00 2001 From: ecpullen Date: Tue, 20 Sep 2022 16:39:58 +0000 Subject: [PATCH] testsys: Update to v0.0.2 This update was partially completed in #2392. Image locations have been updated and e2e repo config for sonobuoy agents has been added. --- tools/Cargo.lock | 8 ++++---- tools/testsys/Cargo.toml | 4 ++-- tools/testsys/src/install.rs | 2 +- tools/testsys/src/run.rs | 12 ++++++------ tools/testsys/src/status.rs | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/Cargo.lock b/tools/Cargo.lock index 481f33ff3bf..d852cd7c55d 100644 --- a/tools/Cargo.lock +++ b/tools/Cargo.lock @@ -608,8 +608,8 @@ dependencies = [ [[package]] name = "bottlerocket-types" -version = "0.0.1" -source = "git+https://github.com/bottlerocket-os/bottlerocket-test-system?rev=07b9ae8#07b9ae8e902623842c334889517973d0c9d82691" +version = "0.0.2" +source = "git+https://github.com/bottlerocket-os/bottlerocket-test-system?tag=v0.0.2#dfd5bc90a481beb05e7a64ac4b20c86fd2491d9d" dependencies = [ "model", "serde", @@ -1734,8 +1734,8 @@ dependencies = [ [[package]] name = "model" -version = "0.0.1" -source = "git+https://github.com/bottlerocket-os/bottlerocket-test-system?rev=07b9ae8#07b9ae8e902623842c334889517973d0c9d82691" +version = "0.0.2" +source = "git+https://github.com/bottlerocket-os/bottlerocket-test-system?tag=v0.0.2#dfd5bc90a481beb05e7a64ac4b20c86fd2491d9d" dependencies = [ "async-recursion", "async-trait", diff --git a/tools/testsys/Cargo.toml b/tools/testsys/Cargo.toml index a02b2636303..bdda2145c68 100644 --- a/tools/testsys/Cargo.toml +++ b/tools/testsys/Cargo.toml @@ -10,7 +10,7 @@ publish = false anyhow = "1.0" aws-config = "0.48" aws-sdk-ec2 = "0.18" -bottlerocket-types = { git = "https://github.com/bottlerocket-os/bottlerocket-test-system", rev = "07b9ae8", version = "0.0.1"} +bottlerocket-types = { git = "https://github.com/bottlerocket-os/bottlerocket-test-system", version = "0.0.2", tag = "v0.0.2"} bottlerocket-variant = { version = "0.1", path = "../../sources/bottlerocket-variant" } clap = { version = "3", features = ["derive", "env"] } env_logger = "0.9" @@ -18,7 +18,7 @@ futures = "0.3.8" k8s-openapi = { version = "0.15", features = ["v1_20", "api"], default-features = false } log = "0.4" maplit = "1.0.2" -model = { git = "https://github.com/bottlerocket-os/bottlerocket-test-system", rev = "07b9ae8", version = "0.0.1"} +model = { git = "https://github.com/bottlerocket-os/bottlerocket-test-system", version = "0.0.2", tag = "v0.0.2"} pubsys-config = { path = "../pubsys-config/", version = "0.1.0" } serde = { version = "1", features = ["derive"] } serde_json = "1" diff --git a/tools/testsys/src/install.rs b/tools/testsys/src/install.rs index 11e7de59c0f..b87ef3f2bb6 100644 --- a/tools/testsys/src/install.rs +++ b/tools/testsys/src/install.rs @@ -21,7 +21,7 @@ pub(crate) struct Install { #[clap( long = "controller-uri", env = "TESTSYS_CONTROLLER_IMAGE", - default_value = "public.ecr.aws/bottlerocket-test-system/controller:v0.0.1" + default_value = "public.ecr.aws/bottlerocket-test-system/controller:v0.0.2" )] controller_uri: String, } diff --git a/tools/testsys/src/run.rs b/tools/testsys/src/run.rs index e40e1a0acc0..3e2aedddcf8 100644 --- a/tools/testsys/src/run.rs +++ b/tools/testsys/src/run.rs @@ -272,7 +272,7 @@ pub(crate) struct TestsysImages { #[clap( long = "eks-resource-agent-image", env = "TESTSYS_EKS_RESOURCE_AGENT_IMAGE", - default_value = "public.ecr.aws/bottlerocket-test-system/eks-resource-agent:v0.0.1" + default_value = "public.ecr.aws/bottlerocket-test-system/eks-resource-agent:v0.0.2" )] pub(crate) eks_resource: String, @@ -280,7 +280,7 @@ pub(crate) struct TestsysImages { #[clap( long = "ecs-resource-agent-image", env = "TESTSYS_ECS_RESOURCE_AGENT_IMAGE", - default_value = "public.ecr.aws/bottlerocket-test-system/ecs-resource-agent:v0.0.1" + default_value = "public.ecr.aws/bottlerocket-test-system/ecs-resource-agent:v0.0.2" )] pub(crate) ecs_resource: String, @@ -288,7 +288,7 @@ pub(crate) struct TestsysImages { #[clap( long = "ec2-resource-agent-image", env = "TESTSYS_EC2_RESOURCE_AGENT_IMAGE", - default_value = "public.ecr.aws/bottlerocket-test-system/ec2-resource-agent:v0.0.1" + default_value = "public.ecr.aws/bottlerocket-test-system/ec2-resource-agent:v0.0.2" )] pub(crate) ec2_resource: String, @@ -296,7 +296,7 @@ pub(crate) struct TestsysImages { #[clap( long = "sonobuoy-test-agent-image", env = "TESTSYS_SONOBUOY_TEST_AGENT_IMAGE", - default_value = "public.ecr.aws/bottlerocket-test-system/sonobuoy-test-agent:v0.0.1" + default_value = "public.ecr.aws/bottlerocket-test-system/sonobuoy-test-agent:v0.0.2" )] pub(crate) sonobuoy_test: String, @@ -304,7 +304,7 @@ pub(crate) struct TestsysImages { #[clap( long = "ecs-test-agent-image", env = "TESTSYS_ECS_TEST_AGENT_IMAGE", - default_value = "public.ecr.aws/bottlerocket-test-system/ecs-test-agent:v0.0.1" + default_value = "public.ecr.aws/bottlerocket-test-system/ecs-test-agent:v0.0.2" )] pub(crate) ecs_test: String, @@ -312,7 +312,7 @@ pub(crate) struct TestsysImages { #[clap( long = "migration-test-agent-image", env = "TESTSYS_MIGRATION_TEST_AGENT_IMAGE", - default_value = "public.ecr.aws/bottlerocket-test-system/migration-test-agent:v0.0.1" + default_value = "public.ecr.aws/bottlerocket-test-system/migration-test-agent:v0.0.2" )] pub(crate) migration_test: String, diff --git a/tools/testsys/src/status.rs b/tools/testsys/src/status.rs index bdf27765918..fe5f3b94a04 100644 --- a/tools/testsys/src/status.rs +++ b/tools/testsys/src/status.rs @@ -46,7 +46,7 @@ impl Status { } else { let (width, _) = term_size::dimensions().unwrap_or((80, 0)); debug!("Window width '{}'", width); - println!("{:width$}", status.to_string()); + println!("{:width$}", status); } Ok(()) }