test ci: add an option to terminate VMs instead of stopping

test/ci/deprovision.yml

@@ -15,20 +15,31 @@
           tag-key: "kubernetes.io/cluster/{{ aws_cluster_id }}"
       register: ec2
 
-    - name: Stop VMs
+    - name: Terminate instances
       ec2:
         instance_ids: "{{ item.instance_id }}"
         region: "{{ aws_region }}"
-        state: stopped
+        state: absent
         wait: no
       with_items: "{{ ec2.instances }}"
-      ignore_errors: true
+      when: not aws_use_auto_terminator | default(true)
 
-    - name: Rename VMs
-      ec2_tag:
-        resource: "{{ item.instance_id }}"
-        region: "{{ aws_region }}"
-        tags:
-          Name: "{{ item.tags.Name }}-terminate"
-      when: "'-terminate' not in item.tags.Name"
-      with_items: "{{ ec2.instances }}"
+    - when: aws_use_auto_terminator | default(true)
+      block:
+        - name: Stop VMs
+          ec2:
+            instance_ids: "{{ item.instance_id }}"
+            region: "{{ aws_region }}"
+            state: stopped
+            wait: no
+          with_items: "{{ ec2.instances }}"
+          ignore_errors: true
+
+        - name: Rename VMs
+          ec2_tag:
+            resource: "{{ item.instance_id }}"
+            region: "{{ aws_region }}"
+            tags:
+              Name: "{{ item.tags.Name }}-terminate"
+          when: "'-terminate' not in item.tags.Name"
+          with_items: "{{ ec2.instances }}"

test/ci/vars.yml.sample

@@ -1,5 +1,8 @@
 ---
 vm_prefix: "ci_test"
+#aws_use_auto_terminator is set to True by default, as rh-dev account doesn't have permission
+# to terminate instances. These should be stopped and renamed to include 'terminate' instead
+#aws_use_auto_terminator: false
 
 type: aws
 aws_user: "ec2-user"