chore: add additional tags

Author: darora

.github/workflows/testinfra.yml

@@ -132,3 +132,8 @@ jobs:
         if: ${{ cancelled() }}
         run: |
           aws ec2 --region ap-southeast-1 describe-instances --filters "Name=tag:packerExecutionId,Values=${GITHUB_RUN_ID}" --query "Reservations[].Instances[].InstanceId" --output text | xargs -I {} aws ec2 terminate-instances --instance-ids {}
+
+      # - name: Cleanup resources on build cancellation
+      #   if: ${{ always() }}
+      #   run: |
+      #     aws ec2 --region ap-southeast-1 describe-instances --filters "Name=tag:testinfra-run-id,Values=${GITHUB_RUN_ID}" --query "Reservations[].Instances[].InstanceId" --output text | xargs -I {} aws ec2 terminate-instances --instance-ids {}

testinfra/test_ami.py

@@ -1,13 +1,16 @@
 import base64
 import boto3
 import gzip
+import os
 import pytest
 import requests
 import testinfra
 from ec2instanceconnectcli.EC2InstanceConnectLogger import EC2InstanceConnectLogger
 from ec2instanceconnectcli.EC2InstanceConnectKey import EC2InstanceConnectKey
 from time import sleep
 
+RUN_ID = os.environ["GITHUB_RUN_ID"] if os.environ["GITHUB_RUN_ID"] else "unknown-ci-run"
+
 postgresql_schema_sql_content = """
 ALTER DATABASE postgres SET "app.settings.jwt_secret" TO  'my_jwt_secret_which_is_not_so_secret';
 ALTER DATABASE postgres SET "app.settings.jwt_exp" TO 3600;
@@ -211,7 +214,8 @@ def gzip_then_base64_encode(s: str) -> str:
                     "ResourceType": "instance",
                     "Tags": [
                         {"Key": "Name", "Value": "ci-ami-test"},
-                        {"Key": "creator", "Value": "testinfra-ci"}
+                        {"Key": "creator", "Value": "testinfra-ci"},
+                        {"Key": "testinfra-run-id", "Value": RUN_ID}
                     ],
                 }
             ],