Skip to content

Commit 8099fcb

Browse files
mavimomavimo
committed
chore: update default values
1 parent 70caca7 commit 8099fcb

File tree

5 files changed

+46
-149
lines changed

5 files changed

+46
-149
lines changed

‎molecule/agent-smoke-kmodule/molecule.yml.template‎

Lines changed: 13 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,11 @@ platforms:
1313
instance_type: ${INSTANCE_TYPE_X86}
1414
region: ${REGION}
1515
vpc_subnet_id: ${VPC_SUBNET_ID}
16-
volumes:
17-
- device_name: /dev/sda1
18-
ebs:
19-
volume_size: 30
20-
delete_on_termination: true
21-
volume_type: gp3
2216
- name: alma-9-x86_64
2317
image: ami-07bc349330a94a4e3
2418
instance_type: ${INSTANCE_TYPE_X86}
2519
region: ${REGION}
2620
vpc_subnet_id: ${VPC_SUBNET_ID}
27-
volumes:
28-
- device_name: /dev/sda1
29-
ebs:
30-
volume_size: 30
31-
delete_on_termination: true
32-
volume_type: gp3
3321
- name: debian-10-x86_64
3422
image: ami-0e1e938b3f38e7558
3523
instance_type: ${INSTANCE_TYPE_X86}
@@ -70,51 +58,33 @@ platforms:
7058
instance_type: ${INSTANCE_TYPE_X86}
7159
region: ${REGION}
7260
vpc_subnet_id: ${VPC_SUBNET_ID}
73-
volumes:
74-
- device_name: /dev/xvda
75-
ebs:
76-
volume_size: 5
77-
delete_on_termination: true
78-
volume_type: gp3
7961
- name: amazon-2023-x86_64
8062
image: ami-0d4d826d70d17642f
8163
instance_type: ${INSTANCE_TYPE_X86}
8264
region: ${REGION}
8365
vpc_subnet_id: ${VPC_SUBNET_ID}
84-
# - name: centos8-x86
85-
# boot_wait_seconds: 180
86-
# image: ami-03dbb661dc3a9b6a5
87-
# instance_type: ${INSTANCE_TYPE_X86}
88-
# region: ${REGION}
89-
# vpc_subnet_id: ${VPC_SUBNET_ID}
90-
# - name: centos8-aarch
91-
# boot_wait_seconds: 180
92-
# image: ami-0fbdd12bd5a9c2e6f
93-
# instance_type: ${INSTANCE_TYPE_AARCH}
94-
# region: ${REGION}
95-
# vpc_subnet_id: ${VPC_SUBNET_ID}
96-
- name: rocky8
66+
- name: centos8-x86_64
67+
boot_wait_seconds: 180
68+
image: ami-03dbb661dc3a9b6a5
69+
instance_type: ${INSTANCE_TYPE_X86}
70+
region: ${REGION}
71+
vpc_subnet_id: ${VPC_SUBNET_ID}
72+
- name: centos8-arm64
73+
boot_wait_seconds: 180
74+
image: ami-0fbdd12bd5a9c2e6f
75+
instance_type: ${INSTANCE_TYPE_AARCH}
76+
region: ${REGION}
77+
vpc_subnet_id: ${VPC_SUBNET_ID}
78+
- name: rocky8-x86_64
9779
image: ami-093bfdaaa5ea85b41
9880
instance_type: ${INSTANCE_TYPE_X86}
9981
region: ${REGION}
10082
vpc_subnet_id: ${VPC_SUBNET_ID}
101-
volumes:
102-
- device_name: /dev/sda1
103-
ebs:
104-
volume_size: 30
105-
delete_on_termination: true
106-
volume_type: gp3
10783
- name: rocky-9-x86_64
10884
image: ami-021a1f96fec61f4e9
10985
instance_type: ${INSTANCE_TYPE_X86}
11086
region: ${REGION}
11187
vpc_subnet_id: ${VPC_SUBNET_ID}
112-
volumes:
113-
- device_name: /dev/sda1
114-
ebs:
115-
volume_size: 30
116-
delete_on_termination: true
117-
volume_type: gp3
11888
- name: centos-7-x86_64
11989
image: ami-0aedf6b1cb669b4c7
12090
instance_type: ${INSTANCE_TYPE_X86}

‎molecule/agent-smoke-legacy-ebpf/molecule.yml.template‎

Lines changed: 14 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,11 @@ platforms:
1313
instance_type: ${INSTANCE_TYPE_X86}
1414
region: ${REGION}
1515
vpc_subnet_id: ${VPC_SUBNET_ID}
16-
volumes:
17-
- device_name: /dev/sda1
18-
ebs:
19-
volume_size: 30
20-
delete_on_termination: true
21-
volume_type: gp3
2216
- name: alma-9-x86_64
2317
image: ami-07bc349330a94a4e3
2418
instance_type: ${INSTANCE_TYPE_X86}
2519
region: ${REGION}
2620
vpc_subnet_id: ${VPC_SUBNET_ID}
27-
volumes:
28-
- device_name: /dev/sda1
29-
ebs:
30-
volume_size: 30
31-
delete_on_termination: true
32-
volume_type: gp3
3321
- name: debian-10-x86_64
3422
image: ami-0e1e938b3f38e7558
3523
instance_type: ${INSTANCE_TYPE_X86}
@@ -60,7 +48,7 @@ platforms:
6048
instance_type: ${INSTANCE_TYPE_X86}
6149
region: ${REGION}
6250
vpc_subnet_id: ${VPC_SUBNET_ID}
63-
- name: ubuntu-2204-amd64
51+
- name: ubuntu-2204-arm64
6452
image: ami-01ec7354bd709968b
6553
instance_type: ${INSTANCE_TYPE_AARCH}
6654
region: ${REGION}
@@ -70,51 +58,33 @@ platforms:
7058
instance_type: ${INSTANCE_TYPE_X86}
7159
region: ${REGION}
7260
vpc_subnet_id: ${VPC_SUBNET_ID}
73-
volumes:
74-
- device_name: /dev/xvda
75-
ebs:
76-
volume_size: 5
77-
delete_on_termination: true
78-
volume_type: gp3
7961
- name: amazon-2023-x86_64
8062
image: ami-0d4d826d70d17642f
8163
instance_type: ${INSTANCE_TYPE_X86}
8264
region: ${REGION}
8365
vpc_subnet_id: ${VPC_SUBNET_ID}
84-
# - name: centos8-x86
85-
# boot_wait_seconds: 180
86-
# image: ami-03dbb661dc3a9b6a5
87-
# instance_type: ${INSTANCE_TYPE_X86}
88-
# region: ${REGION}
89-
# vpc_subnet_id: ${VPC_SUBNET_ID}
90-
# - name: centos8-aarch
91-
# boot_wait_seconds: 180
92-
# image: ami-0fbdd12bd5a9c2e6f
93-
# instance_type: ${INSTANCE_TYPE_AARCH}
94-
# region: ${REGION}
95-
# vpc_subnet_id: ${VPC_SUBNET_ID}
96-
- name: rocky8
66+
- name: centos8-x86_64
67+
boot_wait_seconds: 180
68+
image: ami-03dbb661dc3a9b6a5
69+
instance_type: ${INSTANCE_TYPE_X86}
70+
region: ${REGION}
71+
vpc_subnet_id: ${VPC_SUBNET_ID}
72+
- name: centos8-arm64
73+
boot_wait_seconds: 180
74+
image: ami-0fbdd12bd5a9c2e6f
75+
instance_type: ${INSTANCE_TYPE_AARCH}
76+
region: ${REGION}
77+
vpc_subnet_id: ${VPC_SUBNET_ID}
78+
- name: rocky8-x86_64
9779
image: ami-093bfdaaa5ea85b41
9880
instance_type: ${INSTANCE_TYPE_X86}
9981
region: ${REGION}
10082
vpc_subnet_id: ${VPC_SUBNET_ID}
101-
volumes:
102-
- device_name: /dev/sda1
103-
ebs:
104-
volume_size: 30
105-
delete_on_termination: true
106-
volume_type: gp3
10783
- name: rocky-9-x86_64
10884
image: ami-021a1f96fec61f4e9
10985
instance_type: ${INSTANCE_TYPE_X86}
11086
region: ${REGION}
11187
vpc_subnet_id: ${VPC_SUBNET_ID}
112-
volumes:
113-
- device_name: /dev/sda1
114-
ebs:
115-
volume_size: 30
116-
delete_on_termination: true
117-
volume_type: gp3
11888
provisioner:
11989
lint:
12090
name: ansible-lint

‎molecule/agent-smoke-universal-ebpf/molecule.yml.template‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,11 @@ platforms:
1313
instance_type: ${INSTANCE_TYPE_X86}
1414
region: ${REGION}
1515
vpc_subnet_id: ${VPC_SUBNET_ID}
16-
volumes:
17-
- device_name: /dev/sda1
18-
ebs:
19-
volume_size: 30
20-
delete_on_termination: true
21-
volume_type: gp3
2216
- name: alma-9-x86_64
2317
image: ami-07bc349330a94a4e3
2418
instance_type: ${INSTANCE_TYPE_X86}
2519
region: ${REGION}
2620
vpc_subnet_id: ${VPC_SUBNET_ID}
27-
volumes:
28-
- device_name: /dev/sda1
29-
ebs:
30-
volume_size: 30
31-
delete_on_termination: true
32-
volume_type: gp3
3321
- name: debian-11-x86_64
3422
image: ami-0fd320e6b2de9e34a
3523
instance_type: ${INSTANCE_TYPE_X86}
@@ -65,12 +53,6 @@ platforms:
6553
instance_type: ${INSTANCE_TYPE_X86}
6654
region: ${REGION}
6755
vpc_subnet_id: ${VPC_SUBNET_ID}
68-
volumes:
69-
- device_name: /dev/sda1
70-
ebs:
71-
volume_size: 30
72-
delete_on_termination: true
73-
volume_type: gp3
7456
provisioner:
7557
lint:
7658
name: ansible-lint

‎molecule/agent-uninstall-clean-all/molecule.yml.template‎

Lines changed: 12 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,11 @@ platforms:
1313
instance_type: ${INSTANCE_TYPE_X86}
1414
region: ${REGION}
1515
vpc_subnet_id: ${VPC_SUBNET_ID}
16-
volumes:
17-
- device_name: /dev/sda1
18-
ebs:
19-
volume_size: 30
20-
delete_on_termination: true
21-
volume_type: gp3
2216
- name: alma-9-x86_64
2317
image: ami-07bc349330a94a4e3
2418
instance_type: ${INSTANCE_TYPE_X86}
2519
region: ${REGION}
2620
vpc_subnet_id: ${VPC_SUBNET_ID}
27-
volumes:
28-
- device_name: /dev/sda1
29-
ebs:
30-
volume_size: 30
31-
delete_on_termination: true
32-
volume_type: gp3
3321
- name: debian-10-x86_64
3422
image: ami-0e1e938b3f38e7558
3523
instance_type: ${INSTANCE_TYPE_X86}
@@ -70,51 +58,33 @@ platforms:
7058
instance_type: ${INSTANCE_TYPE_X86}
7159
region: ${REGION}
7260
vpc_subnet_id: ${VPC_SUBNET_ID}
73-
volumes:
74-
- device_name: /dev/xvda
75-
ebs:
76-
volume_size: 5
77-
delete_on_termination: true
78-
volume_type: gp3
7961
- name: amazon-2023-x86_64
8062
image: ami-0d4d826d70d17642f
8163
instance_type: ${INSTANCE_TYPE_X86}
8264
region: ${REGION}
8365
vpc_subnet_id: ${VPC_SUBNET_ID}
84-
# - name: centos8-x86
85-
# boot_wait_seconds: 180
86-
# image: ami-03dbb661dc3a9b6a5
87-
# instance_type: ${INSTANCE_TYPE_X86}
88-
# region: ${REGION}
89-
# vpc_subnet_id: ${VPC_SUBNET_ID}
90-
# - name: centos8-aarch
91-
# boot_wait_seconds: 180
92-
# image: ami-0fbdd12bd5a9c2e6f
93-
# instance_type: ${INSTANCE_TYPE_AARCH}
94-
# region: ${REGION}
95-
# vpc_subnet_id: ${VPC_SUBNET_ID}
66+
- name: centos8-x86
67+
boot_wait_seconds: 180
68+
image: ami-03dbb661dc3a9b6a5
69+
instance_type: ${INSTANCE_TYPE_X86}
70+
region: ${REGION}
71+
vpc_subnet_id: ${VPC_SUBNET_ID}
72+
- name: centos8-aarch
73+
boot_wait_seconds: 180
74+
image: ami-0fbdd12bd5a9c2e6f
75+
instance_type: ${INSTANCE_TYPE_AARCH}
76+
region: ${REGION}
77+
vpc_subnet_id: ${VPC_SUBNET_ID}
9678
- name: rocky8
9779
image: ami-093bfdaaa5ea85b41
9880
instance_type: ${INSTANCE_TYPE_X86}
9981
region: ${REGION}
10082
vpc_subnet_id: ${VPC_SUBNET_ID}
101-
volumes:
102-
- device_name: /dev/sda1
103-
ebs:
104-
volume_size: 30
105-
delete_on_termination: true
106-
volume_type: gp3
10783
- name: rocky-9-x86_64
10884
image: ami-021a1f96fec61f4e9
10985
instance_type: ${INSTANCE_TYPE_X86}
11086
region: ${REGION}
11187
vpc_subnet_id: ${VPC_SUBNET_ID}
112-
volumes:
113-
- device_name: /dev/sda1
114-
ebs:
115-
volume_size: 30
116-
delete_on_termination: true
117-
volume_type: gp3
11888
- name: centos-7-x86_64
11989
image: ami-0aedf6b1cb669b4c7
12090
instance_type: ${INSTANCE_TYPE_X86}

‎molecule/resources/playbooks/create.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# Platform settings handling
2121
default_assign_public_ip: true
2222
default_aws_profile: "{{ lookup('env', 'AWS_PROFILE') }}"
23-
default_boot_wait_seconds: 120
23+
default_boot_wait_seconds: 180
2424
default_instance_type: t3a.medium
2525
default_key_inject_method: cloud-init # valid values: [cloud-init, ec2]
2626
default_key_name: "molecule-{{ run_config.run_id }}"
@@ -70,7 +70,12 @@
7070
region: ""
7171
security_groups: []
7272
tags: {}
73-
volumes: []
73+
volumes:
74+
- device_name: /dev/sda1
75+
ebs:
76+
volume_size: 30
77+
delete_on_termination: true
78+
volume_type: gp3
7479
vpc_id: ""
7580
vpc_subnet_id: ""
7681

0 commit comments

Comments
 (0)