diff --git a/.github/workflows/pr-checker.yml b/.github/workflows/pr-checker.yml index 86f3e6854..079a71e55 100644 --- a/.github/workflows/pr-checker.yml +++ b/.github/workflows/pr-checker.yml @@ -51,7 +51,8 @@ jobs: AGENT_ACCESS_KEY: ${{ secrets.AGENT_ACCESS_KEY }} COLLECTOR_URL: ${{ secrets.COLLECTOR_URL }} COLLECTOR_PORT: ${{ secrets.COLLECTOR_PORT }} - INSTANCE_TYPE: ${{ secrets.INSTANCE_TYPE }} + INSTANCE_TYPE_AARCH: ${{ secrets.INSTANCE_TYPE_AARCH }} + INSTANCE_TYPE_X86: ${{ secrets.INSTANCE_TYPE_X86 }} REGION: ${{ secrets.REGION }} VPC_SUBNET_ID: ${{ secrets.VPC_SUBNET_ID }} SHOW_USAGE: false diff --git a/molecule/agent-smoke-ebpf/molecule.yml.template b/molecule/agent-smoke-ebpf/molecule.yml.template index e5b582d35..5ffdf27bb 100644 --- a/molecule/agent-smoke-ebpf/molecule.yml.template +++ b/molecule/agent-smoke-ebpf/molecule.yml.template @@ -10,7 +10,7 @@ lint: | platforms: - name: alma8 image: ami-017cf0c1f7146f117 - instance_type: ${INSTANCE_TYPE} + instance_type: ${INSTANCE_TYPE_X86} region: ${REGION} vpc_subnet_id: ${VPC_SUBNET_ID} volumes: @@ -20,58 +20,69 @@ platforms: delete_on_termination: true # - name: alma9 # image: ami-06bc84fafec254e1d -# instance_type: ${INSTANCE_TYPE} +# instance_type: ${INSTANCE_TYPE_X86} # region: ${REGION} # vpc_subnet_id: ${VPC_SUBNET_ID} - name: debian-10 image: ami-09c5dc3046df4741f - instance_type: ${INSTANCE_TYPE} + instance_type: ${INSTANCE_TYPE_X86} region: ${REGION} vpc_subnet_id: ${VPC_SUBNET_ID} - name: debian-11 image: ami-01e5ff16fd6e8c542 - instance_type: ${INSTANCE_TYPE} + instance_type: ${INSTANCE_TYPE_X86} region: ${REGION} vpc_subnet_id: ${VPC_SUBNET_ID} - name: ubuntu-1804 image: ami-092d086e9437633d7 - instance_type: ${INSTANCE_TYPE} + instance_type: ${INSTANCE_TYPE_X86} region: ${REGION} vpc_subnet_id: ${VPC_SUBNET_ID} - name: ubuntu-2004 image: ami-0f57ffe8bd04fa66d - instance_type: ${INSTANCE_TYPE} + instance_type: ${INSTANCE_TYPE_X86} region: ${REGION} vpc_subnet_id: ${VPC_SUBNET_ID} - - name: ubuntu-2204 + - name: ubuntu-2204-x86 image: ami-053b0d53c279acc90 - instance_type: ${INSTANCE_TYPE} + instance_type: ${INSTANCE_TYPE_X86} + region: ${REGION} + vpc_subnet_id: ${VPC_SUBNET_ID} + - name: ubuntu-2204-aarch + image: ami-02dd4bca4caaab354 + instance_type: ${INSTANCE_TYPE_AARCH} region: ${REGION} vpc_subnet_id: ${VPC_SUBNET_ID} - name: amzn2 image: ami-0bef6cc322bfff646 - instance_type: ${INSTANCE_TYPE} + instance_type: ${INSTANCE_TYPE_X86} region: ${REGION} vpc_subnet_id: ${VPC_SUBNET_ID} - name: al2023 image: ami-0715c1897453cabd1 - instance_type: ${INSTANCE_TYPE} + instance_type: ${INSTANCE_TYPE_X86} region: ${REGION} vpc_subnet_id: ${VPC_SUBNET_ID} - - name: centos8 + - name: centos8-x86 boot_wait_seconds: 180 image: ami-03dbb661dc3a9b6a5 - instance_type: ${INSTANCE_TYPE} + instance_type: ${INSTANCE_TYPE_X86} + region: ${REGION} + vpc_subnet_id: ${VPC_SUBNET_ID} + - name: centos8-aarch + boot_wait_seconds: 180 + image: ami-0fbdd12bd5a9c2e6f + instance_type: ${INSTANCE_TYPE_AARCH} region: ${REGION} vpc_subnet_id: ${VPC_SUBNET_ID} - name: rocky8 image: ami-0e63078428ec6a2e1 - instance_type: ${INSTANCE_TYPE} + instance_type: ${INSTANCE_TYPE_X86} region: ${REGION} vpc_subnet_id: ${VPC_SUBNET_ID} # - name: rocky9 # image: ami-032d067e7f73e7519 -# instance_type: ${INSTANCE_TYPE} +# instance_type: ${INSTANCE_TYPE_X86} # region: ${REGION} # vpc_subnet_id: ${VPC_SUBNET_ID} provisioner: diff --git a/molecule/agent-smoke-kmodule/molecule.yml.template b/molecule/agent-smoke-kmodule/molecule.yml.template index bd59862bd..64a07fa9e 100644 --- a/molecule/agent-smoke-kmodule/molecule.yml.template +++ b/molecule/agent-smoke-kmodule/molecule.yml.template @@ -10,68 +10,79 @@ lint: | platforms: - name: alma8 image: ami-017cf0c1f7146f117 - instance_type: ${INSTANCE_TYPE} + instance_type: ${INSTANCE_TYPE_X86} region: ${REGION} vpc_subnet_id: ${VPC_SUBNET_ID} - name: alma9 image: ami-06bc84fafec254e1d - instance_type: ${INSTANCE_TYPE} + instance_type: ${INSTANCE_TYPE_X86} region: ${REGION} vpc_subnet_id: ${VPC_SUBNET_ID} - name: debian-10 image: ami-09c5dc3046df4741f - instance_type: ${INSTANCE_TYPE} + instance_type: ${INSTANCE_TYPE_X86} region: ${REGION} vpc_subnet_id: ${VPC_SUBNET_ID} - name: debian-11 image: ami-01e5ff16fd6e8c542 - instance_type: ${INSTANCE_TYPE} + instance_type: ${INSTANCE_TYPE_X86} region: ${REGION} vpc_subnet_id: ${VPC_SUBNET_ID} - name: ubuntu-1804 image: ami-092d086e9437633d7 - instance_type: ${INSTANCE_TYPE} + instance_type: ${INSTANCE_TYPE_X86} region: ${REGION} vpc_subnet_id: ${VPC_SUBNET_ID} - name: ubuntu-2004 image: ami-0f57ffe8bd04fa66d - instance_type: ${INSTANCE_TYPE} + instance_type: ${INSTANCE_TYPE_X86} region: ${REGION} vpc_subnet_id: ${VPC_SUBNET_ID} - - name: ubuntu-2204 + - name: ubuntu-2204-x86 image: ami-053b0d53c279acc90 - instance_type: ${INSTANCE_TYPE} + instance_type: ${INSTANCE_TYPE_X86} + region: ${REGION} + vpc_subnet_id: ${VPC_SUBNET_ID} + - name: ubuntu-2204-aarch + image: ami-02dd4bca4caaab354 + instance_type: ${INSTANCE_TYPE_AARCH} region: ${REGION} vpc_subnet_id: ${VPC_SUBNET_ID} - name: amzn2 image: ami-0bef6cc322bfff646 - instance_type: ${INSTANCE_TYPE} + instance_type: ${INSTANCE_TYPE_X86} region: ${REGION} vpc_subnet_id: ${VPC_SUBNET_ID} - name: al2023 image: ami-0715c1897453cabd1 - instance_type: ${INSTANCE_TYPE} + instance_type: ${INSTANCE_TYPE_X86} region: ${REGION} vpc_subnet_id: ${VPC_SUBNET_ID} - name: centos7 image: ami-0aedf6b1cb669b4c7 - instance_type: ${INSTANCE_TYPE} + instance_type: ${INSTANCE_TYPE_X86} region: ${REGION} vpc_subnet_id: ${VPC_SUBNET_ID} - - name: centos8 + - name: centos8-x86 boot_wait_seconds: 180 image: ami-03dbb661dc3a9b6a5 - instance_type: ${INSTANCE_TYPE} + instance_type: ${INSTANCE_TYPE_X86} + region: ${REGION} + vpc_subnet_id: ${VPC_SUBNET_ID} + - name: centos8-aarch + boot_wait_seconds: 180 + image: ami-0fbdd12bd5a9c2e6f + instance_type: ${INSTANCE_TYPE_AARCH} region: ${REGION} vpc_subnet_id: ${VPC_SUBNET_ID} - name: rocky8 image: ami-0e63078428ec6a2e1 - instance_type: ${INSTANCE_TYPE} + instance_type: ${INSTANCE_TYPE_X86} region: ${REGION} vpc_subnet_id: ${VPC_SUBNET_ID} - name: rocky9 image: ami-032d067e7f73e7519 - instance_type: ${INSTANCE_TYPE} + instance_type: ${INSTANCE_TYPE_X86} region: ${REGION} vpc_subnet_id: ${VPC_SUBNET_ID} provisioner: