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

test-e2e: Make KBS opt-in for e2e tests #1722

Merged
merged 2 commits into from
Mar 6, 2024

Conversation

surajssd
Copy link
Member

@surajssd surajssd commented Mar 1, 2024

This change make KBS opt-in for e2e tests. For
Azure provisioner opt-in for KBS installation.

This change make KBS opt-in for e2e tests. For
Azure provisioner opt-in for KBS installation.

Signed-off-by: Suraj Deshmukh <suraj.deshmukh@microsoft.com>
KBS_IMAGE="${KBS_IMAGE}"
KBS_IMAGE_TAG="${KBS_IMAGE_TAG}"
DEPLOY_KBS="true"
Copy link
Contributor

Choose a reason for hiding this comment

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

This is fetched from shell env and not from properties file. Is it required to add it here ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes we can remove this, I confused this as a property coming from the properties file.

shouldDeployKbs = false
shouldDeployKbs := false
if os.Getenv("DEPLOY_KBS") == "true" {
shouldDeployKbs = true
Copy link
Contributor

Choose a reason for hiding this comment

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

Also can we shift L121-L124 under this condition if shouldDeployKbs { on L138 ? It was shifted as part of review but i think we should move this condition down.

Validate kbs image and kbs image tag only when deploy kbs is
enabled.

Signed-off-by: Kartik Joshi <kartikjoshi@microsoft.com>
Copy link
Member

@stevenhorsman stevenhorsman left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks!

@stevenhorsman stevenhorsman linked an issue Mar 6, 2024 that may be closed by this pull request
@mkulke
Copy link
Contributor

mkulke commented Mar 6, 2024

govuln checks are addressed in #1728

@mkulke mkulke merged commit 887b892 into confidential-containers:main Mar 6, 2024
17 of 18 checks passed
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.

tests/e2e: KBS property incorrectly required
4 participants