testsys: Update to v0.0.2

This update was partially completed in bottlerocket-os#2392. Image locations have been updated and e2e repo config for sonobuoy agents has been added.
ecpullen · Oct 25, 2022 · 0bb10b7 · 0bb10b7
1 parent 3949354
commit 0bb10b7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/tools/Cargo.lock b/tools/Cargo.lock
diff --git a/tools/testsys/Cargo.toml b/tools/testsys/Cargo.toml
@@ -10,15 +10,15 @@ 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"
 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
@@ -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
@@ -272,47 +272,47 @@ 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,
 
     /// ECS resource agent URI. If not provided the latest released resource agent will be used.
     #[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,
 
     /// EC2 resource agent URI. If not provided the latest released resource agent will be used.
     #[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,
 
     /// Sonobuoy test agent URI. If not provided the latest released test agent will be used.
     #[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,
 
     /// ECS test agent URI. If not provided the latest released test agent will be used.
     #[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,
 
     /// Migration test agent URI. If not provided the latest released test agent will be used.
     #[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
@@ -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(())
     }