Skip to content

Commit

Permalink
Cirrus: Enable labeling of EC2 VMs
Browse files Browse the repository at this point in the history
In GCP, user specified VM names are required upon creation.  Cirrus-CI
generates helpful names containing the task-ID.  Unfortunately in EC2
the VM ID's are auto-generated, and special permissions are required
to allow secondary setting of a `Name` tag.  Since this permission has
been granted, enable the `experimental` flag on EC2 tasks so that cirrus
can update VM name-tags.  This is especially useful in troubleshooting
orphaned VMs.

Ref:
containers#18065 (comment)

Signed-off-by: Chris Evich <[email protected]>
  • Loading branch information
cevich committed Apr 5, 2023
1 parent 1946373 commit 56e7b51
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,9 @@ build_aarch64_task:
# Multiarch doesn't depend on buildability in this automation context
# Docs: ./contrib/cirrus/CIModes.md
only_if: "$CIRRUS_CRON != 'multiarch'"
# Enable labeling of EC2 VMs with cirrus task ID. TODO: This can be
# removed when the feature goes mainstream.
experimental: true
ec2_instance: &standard_build_ec2_aarch64
image: ${VM_IMAGE_NAME}
type: ${EC2_INST_TYPE}
Expand Down Expand Up @@ -271,7 +274,7 @@ validate_aarch64_task:
only_if: *is_pr
depends_on:
- build_aarch64
# golangci-lint is a very, very hungry beast.
experimental: true # Enable labeling of EC2 VMs with cirrus task ID
ec2_instance: *standard_build_ec2_aarch64
env:
<<: *stdenvars_aarch64
Expand Down Expand Up @@ -547,6 +550,7 @@ windows_smoke_test_task:
$CIRRUS_CHANGE_TITLE !=~ '.*CI:COPR.*'
depends_on:
- alt_build
experimental: true # Enable labeling of EC2 VMs with cirrus task ID
ec2_instance:
image: "${WINDOWS_AMI}"
type: m5zn.metal
Expand Down Expand Up @@ -665,6 +669,7 @@ podman_machine_task:
- remote_integration_test
- container_integration_test
- rootless_integration_test
experimental: true # Enable labeling of EC2 VMs with cirrus task ID
ec2_instance:
image: "${VM_IMAGE_NAME}"
type: "${EC2_INST_TYPE}"
Expand Down Expand Up @@ -696,6 +701,7 @@ podman_machine_aarch64_task:
- remote_integration_test
- container_integration_test
- rootless_integration_test
experimental: true # Enable labeling of EC2 VMs with cirrus task ID
ec2_instance:
<<: *standard_build_ec2_aarch64
env:
Expand Down Expand Up @@ -762,6 +768,7 @@ local_system_test_aarch64_task: &local_system_test_task_aarch64
depends_on:
- build_aarch64
- unit_test
experimental: true # Enable labeling of EC2 VMs with cirrus task ID
ec2_instance: *standard_build_ec2_aarch64
env:
<<: *stdenvars_aarch64
Expand Down

0 comments on commit 56e7b51

Please sign in to comment.