Skip to content

fix(CI): temporarily disable ECR tests #10688

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.

Sign up for GitHub

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

Closed
gavin-stackrox wants to merge 2 commits into from
Closed

fix(CI): temporarily disable ECR tests #10688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81a611f
fix(CI): temporarily disable ECR tests
gavin-stackrox Apr 9, 2024
bf1811c
kick
gavin-stackrox Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion qa-tests-backend/scripts/run-compatibility.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ _compatibility_test() {

deploy_default_psp
deploy_webhook_server
get_ECR_docker_pull_password
# get_ECR_docker_pull_password
fi

rm -f FAIL
Expand Down
4 changes: 2 additions & 2 deletions qa-tests-backend/scripts/run-custom-pz.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ config_custom() {

deploy_default_psp
deploy_webhook_server "$ROOT/$DEPLOY_DIR/webhook_server_certs"
get_ECR_docker_pull_password
# get_ECR_docker_pull_password
# TODO(ROX-14759): Re-enable once image pulling is fixed.
#deploy_clair_v4
}
Expand All @@ -67,7 +67,7 @@ reuse_config_part_1() {

create_webhook_server_port_forward
export_webhook_server_certs "$ROOT/$DEPLOY_DIR/webhook_server_certs"
get_ECR_docker_pull_password
# get_ECR_docker_pull_password

wait_for_api
export_central_basic_auth_creds
Expand Down
4 changes: 2 additions & 2 deletions qa-tests-backend/scripts/run-part-1.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ config_part_1() {

deploy_default_psp
deploy_webhook_server "$ROOT/$DEPLOY_DIR/webhook_server_certs"
get_ECR_docker_pull_password
# get_ECR_docker_pull_password
# TODO(ROX-14759): Re-enable once image pulling is fixed.
#deploy_clair_v4
}
Expand All @@ -68,7 +68,7 @@ reuse_config_part_1() {

create_webhook_server_port_forward
export_webhook_server_certs "$ROOT/$DEPLOY_DIR/webhook_server_certs"
get_ECR_docker_pull_password
# get_ECR_docker_pull_password

wait_for_api
export_central_basic_auth_creds
Expand Down
52 changes: 26 additions & 26 deletions qa-tests-backend/src/test/groovy/ImageScanningTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ class ImageScanningTest extends BaseSpecification {
.setImage("us.gcr.io/stackrox-ci/qa/registry-image:0.3")
.addLabel("app", "gcr-image-scanning-test")
.addImagePullSecret("gcr-image-scanning-test"),
"ecr": new Deployment()
.setName("ecr-image-registry-test")
.setNamespace(TEST_NAMESPACE)
.setImage("${Env.mustGetAWSECRRegistryID()}.dkr.ecr.${Env.mustGetAWSECRRegistryRegion()}." +
"amazonaws.com/stackrox-qa-ecr-test:registry-image-no-secrets")
.addLabel("app", "ecr-image-registry-test")
.addImagePullSecret("ecr-image-registry-test"),
// "ecr": new Deployment()
// .setName("ecr-image-registry-test")
// .setNamespace(TEST_NAMESPACE)
// .setImage("${Env.mustGetAWSECRRegistryID()}.dkr.ecr.${Env.mustGetAWSECRRegistryRegion()}." +
// "amazonaws.com/stackrox-qa-ecr-test:registry-image-no-secrets")
// .addLabel("app", "ecr-image-registry-test")
// .addImagePullSecret("ecr-image-registry-test"),
"acr": new Deployment()
.setName("acr-image-registry-test")
.setNamespace(TEST_NAMESPACE)
Expand All @@ -109,13 +109,13 @@ class ImageScanningTest extends BaseSpecification {
username: "_json_key",
password: Env.mustGet("GOOGLE_CREDENTIALS_GCR_SCANNER"),
server: "https://us.gcr.io"),
"ecr": new Secret(
name: "ecr-image-registry-test",
namespace: TEST_NAMESPACE,
username: "AWS",
password: Env.mustGetAWSECRDockerPullPassword(),
server: "https://${Env.mustGetAWSECRRegistryID()}.dkr.ecr."+
"${Env.mustGetAWSECRRegistryRegion()}.amazonaws.com"),
// "ecr": new Secret(
// name: "ecr-image-registry-test",
// namespace: TEST_NAMESPACE,
// username: "AWS",
// password: Env.mustGetAWSECRDockerPullPassword(),
// server: "https://${Env.mustGetAWSECRRegistryID()}.dkr.ecr."+
// "${Env.mustGetAWSECRRegistryRegion()}.amazonaws.com"),
"acr": new Secret(
name: "acr-image-registry-test",
namespace: TEST_NAMESPACE,
Expand Down Expand Up @@ -620,18 +620,18 @@ class ImageScanningTest extends BaseSpecification {
where:
testName | integration | deleteAutoRegistry | source |
imageIntegrationConfig
"ecr-iam" | "ecr" | false | /^ecr$/ |
{ -> ECRRegistryIntegration.createCustomIntegration(useIam: true, endpoint: "") }
"ecr-assume-role" | "ecr" | false | /^ecr$/ |
{ -> ECRRegistryIntegration.createCustomIntegration(useAssumeRole: true, endpoint: "") }
"ecr-assume-role-external-id" | "ecr" | false | /^ecr$/ |
{ -> ECRRegistryIntegration.createCustomIntegration(useAssumeRoleExternalId: true, endpoint: "") }
"ecr-auto" | "ecr" | false | source(".*.amazonaws.com") |
null
"ecr-auto-and-config" | "ecr" | false | /^ecr$/ |
{ -> ECRRegistryIntegration.createDefaultIntegration() }
"ecr-config-only" | "ecr" | true | /^ecr$/ |
{ -> ECRRegistryIntegration.createDefaultIntegration() }
// "ecr-iam" | "ecr" | false | /^ecr$/ |
// { -> ECRRegistryIntegration.createCustomIntegration(useIam: true, endpoint: "") }
// "ecr-assume-role" | "ecr" | false | /^ecr$/ |
// { -> ECRRegistryIntegration.createCustomIntegration(useAssumeRole: true, endpoint: "") }
// "ecr-assume-role-external-id" | "ecr" | false | /^ecr$/ |
// { -> ECRRegistryIntegration.createCustomIntegration(useAssumeRoleExternalId: true, endpoint: "") }
// "ecr-auto" | "ecr" | false | source(".*.amazonaws.com") |
// null
// "ecr-auto-and-config" | "ecr" | false | /^ecr$/ |
// { -> ECRRegistryIntegration.createDefaultIntegration() }
// "ecr-config-only" | "ecr" | true | /^ecr$/ |
// { -> ECRRegistryIntegration.createDefaultIntegration() }
"acr-auto" | "acr" | false | /Autogenerated .*.azurecr.io for cluster remote/ |
null
"acr-auto-and-config" | "acr" | false | /^acr$/ |
Expand Down