Skip to content

Commit

Permalink
Re-record failing source-to-cloud patch tests (#6984)
Browse files Browse the repository at this point in the history
  • Loading branch information
cormacpayne committed Nov 14, 2023
1 parent 37ca5f0 commit f1ade6d
Show file tree
Hide file tree
Showing 8 changed files with 13,332 additions and 29,956 deletions.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def test_containerapp_patch_list_and_apply_with_resource_group_e2e(self, resourc
app_name = self.create_random_name(prefix='containerapp', length=24)

# Create a Container App using a .NET 7.0 image with an outdated run image that is eligible for patching
create_and_verify_containerapp_up(self, resource_group, source_path=source_path, ingress=ingress, target_port=target_port, app_name=app_name)
create_and_verify_containerapp_up(self, resource_group, source_path=source_path, ingress=ingress, target_port=target_port, app_name=app_name, requires_acr_prerequisite=True)

# Execute and verify patch list command
patchable_images = self.cmd(f'containerapp patch list -g {resource_group}').get_output_in_json()
Expand Down Expand Up @@ -86,7 +86,7 @@ def test_containerapp_patch_list_and_apply_with_environment_e2e(self, resource_g
self.cmd(f'containerapp env create -g {resource_group} -n {env_name}')

# Create a Container App using a .NET 7.0 image with an outdated run image that is eligible for patching
create_and_verify_containerapp_up(self, resource_group, env_name=env_name, source_path=source_path, ingress=ingress, target_port=target_port, app_name=app_name)
create_and_verify_containerapp_up(self, resource_group, env_name=env_name, source_path=source_path, ingress=ingress, target_port=target_port, app_name=app_name, requires_acr_prerequisite=True)

# Execute and verify patch list command
patchable_images = self.cmd(f'containerapp patch list -g {resource_group} --environment {env_name}').get_output_in_json()
Expand Down Expand Up @@ -114,7 +114,7 @@ def test_containerapp_patch_list_and_apply_with_show_all_e2e(self, resource_grou
env_name = self.create_random_name(prefix='env', length=24)
self.cmd(f'containerapp env create -g {resource_group} -n {env_name}')

create_and_verify_containerapp_up(self, resource_group, env_name=env_name, image=image, app_name=app_name)
create_and_verify_containerapp_up(self, resource_group, env_name=env_name, image=image, app_name=app_name, requires_acr_prerequisite=True)

# Execute and verify patch list command
patch_cmd = f'containerapp patch list -g {resource_group} --environment {env_name} --show-all'
Expand Down Expand Up @@ -152,7 +152,7 @@ def test_containerapp_patch_list_and_apply_without_arguments_e2e(self, resource_
app_name = self.create_random_name(prefix='containerapp', length=24)

# Create a Container App using a .NET 7.0 image with an outdated run image that is eligible for patching
create_and_verify_containerapp_up(self, resource_group, source_path=source_path, ingress=ingress, target_port=target_port, app_name=app_name)
create_and_verify_containerapp_up(self, resource_group, source_path=source_path, ingress=ingress, target_port=target_port, app_name=app_name, requires_acr_prerequisite=True)

# Execute and verify patch list command
self.cmd(f'configure --defaults group={resource_group}')
Expand Down Expand Up @@ -192,7 +192,7 @@ def test_containerapp_patch_list_and_apply_with_node18_e2e(self, resource_group)
app_name = self.create_random_name(prefix='containerapp', length=24)

# Create a Container App using a Node 18 image with an outdated run image that is eligible for patching
create_and_verify_containerapp_up(self, resource_group, source_path=source_path, ingress=ingress, target_port=target_port, app_name=app_name)
create_and_verify_containerapp_up(self, resource_group, source_path=source_path, ingress=ingress, target_port=target_port, app_name=app_name, requires_acr_prerequisite=True)

# Execute and verify patch list command
self.cmd(f'configure --defaults group={resource_group}')
Expand Down Expand Up @@ -233,7 +233,7 @@ def test_containerapp_patch_list_and_apply_with_python310_e2e(self, resource_gro
app_name = self.create_random_name(prefix='containerapp', length=24)

# Create a Container App using a Python 3.10 image with an outdated run image that is eligible for patching
create_and_verify_containerapp_up(self, resource_group, source_path=source_path, ingress=ingress, target_port=target_port, app_name=app_name)
create_and_verify_containerapp_up(self, resource_group, source_path=source_path, ingress=ingress, target_port=target_port, app_name=app_name, requires_acr_prerequisite=True)

# Execute and verify patch list command
self.cmd(f'configure --defaults group={resource_group}')
Expand Down
3 changes: 0 additions & 3 deletions src/containerapp/azext_containerapp/tests/latest/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@ def create_and_verify_containerapp_up(
target_port = None,
app_name = None,
requires_acr_prerequisite = False):
# Configure the default location
test_cls.cmd('configure --defaults location={}'.format(TEST_LOCATION))

# Ensure that the Container App environment is created
if env_name is None:
env_name = test_cls.create_random_name(prefix='env', length=24)
Expand Down

0 comments on commit f1ade6d

Please sign in to comment.