Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

testsys: Update testsys commit to 07b9ae8 #2392

Merged
merged 3 commits into from
Aug 31, 2022

Conversation

ecpullen
Copy link
Contributor

Issue number:

Closes #N/A

Description of changes:

This PR updates the checkout of testsys to the later version of testsys.
Updating testsys includes:

  • Improved status checking with testsys status
  • Enable the use of conflicting resources
  • Sonobuoy test in China partition

This pr will precede a declarative testing pr that introduces Test.toml

Testing done:

cargo make test and other targets work as expected.

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

@@ -10,19 +10,19 @@ publish = false
anyhow = "1.0"
aws-config = "0.46"
aws-sdk-ec2 = "0.16"
bottlerocket-types = { git = "https://github.com/bottlerocket-os/bottlerocket-test-system", rev = "021e8d6", version = "0.1"}
bottlerocket-types = { git = "https://github.com/bottlerocket-os/bottlerocket-test-system", rev = "07b9ae8", version = "0.0.1"}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What needs to be done to track the latest commit/release?

Copy link
Contributor

@bcressey bcressey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No blockers, just a couple suggestions for future releases that jumped out at me during review.

@@ -493,6 +496,7 @@ impl AwsEcs {
},
spec: ResourceSpec {
depends_on: None,
conflicts_with: None,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd like for ResourceSpec to implement the Default trait so we can populate these None fields automatically via ..Default::default().

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 = "021e8d6", version = "0.1"}
model = { git = "https://github.com/bottlerocket-os/bottlerocket-test-system", rev = "07b9ae8", version = "0.0.1"}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably want to rename model to something like bottlerocket-test-model that doesn't clash with a published crate. bottlerocket-types could be bottlerocket-test-types also.

@ecpullen ecpullen merged commit 63365f6 into bottlerocket-os:develop Aug 31, 2022
@ecpullen ecpullen deleted the update-testsys branch August 31, 2022 19:46
ecpullen added a commit to ecpullen/bottlerocket that referenced this pull request Oct 25, 2022
This update was partially completed in bottlerocket-os#2392. Image locations have been
updated and e2e repo config for sonobuoy agents has been added.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants