newrelic · hrai-nr · Sep 14, 2024 · Sep 14, 2024 · Sep 14, 2024 · Sep 14, 2024
diff --git a/.github/workflows/run_e2e_tests.yml b/.github/workflows/run_e2e_tests.yml
@@ -97,10 +97,18 @@ jobs:
           files: |
             ${{ inputs.test_report_filename }}
 
-  tear_down_test_executor_instances:
-    name: Tear down test executor instances
-    needs: report_test_results
+  stop_executor_instances:
+    name: Stop executor instances
+    needs: [ provision_and_execute_tests, report_test_results ]
     uses: ./.github/workflows/run_task.yml
     with:
-      container_make_target: "terraform/ec2-test-executors/clean PRE_RELEASE_NAME=${{ inputs.gh_release_name }}"
+      container_make_target: "terraform/ec2-stop-instances/stop"
     secrets: inherit
+
+#  tear_down_test_executor_instances:
+#    name: Tear down test executor instances
+#    needs: report_test_results
+#    uses: ./.github/workflows/run_task.yml
+#    with:
+#      container_make_target: "terraform/ec2-test-executors/clean PRE_RELEASE_NAME=${{ inputs.gh_release_name }}"
+#    secrets: inherit
diff --git a/terraform/ec2-instances-creator/main.tf b/terraform/ec2-instances-creator/main.tf
@@ -71,4 +71,8 @@ module "ec2_instance" {
     instance_type = var.instance_type
     fb_package_name = each.value.targetPackageName
   })
+}
+
+output "instance_ids" {
+  value = { for k, v in module.ec2_instance : k => v.id }
 }
diff --git a/terraform/ec2-stop-instances/Makefile b/terraform/ec2-stop-instances/Makefile
@@ -0,0 +1,9 @@
+# Terraform-stop
+.PHONY: stop
+stop: 
+	terraform init -reconfigure 
+	terraform refresh 
+	#terraform output -json instance_ids | jq -r '.[]' | paste -sd ' ' - 
+	terraform destroy -auto-approve
+	#terraform apply -target null_resource.stop_instances -auto-approve 
+	@echo "Stopping all the instances"
diff --git a/terraform/ec2-stop-instances/main.tf b/terraform/ec2-stop-instances/main.tf
@@ -0,0 +1,9 @@
+# creates a resource named null_resource 
+resource "null_resource" "stop_instances" {
+  provisioner "local-exec" {
+    on_failure  = continue
+    command     = <<EOT
+         aws ec2 stop-instances --region us-east-2  --instance-ids $(terraform output -json instance_ids | jq -r '.[]' | paste -sd ' ' -)       
+     EOT
+  }
+}
diff --git a/versions/amazonlinux_2.yml → versions/amazonlinux_2.yml.disabled b/versions/amazonlinux_2.yml → versions/amazonlinux_2.yml.disabled
diff --git a/versions/amazonlinux_2023.yml → versions/amazonlinux_2023.yml.disabled b/versions/amazonlinux_2023.yml → versions/amazonlinux_2023.yml.disabled
diff --git a/versions/centos_7.yml → versions/centos_7.yml.disabled b/versions/centos_7.yml → versions/centos_7.yml.disabled
diff --git a/versions/centos_8.yml → versions/centos_8.yml.disabled b/versions/centos_8.yml → versions/centos_8.yml.disabled
diff --git a/versions/centos_9.yml → versions/centos_9.yml.disabled b/versions/centos_9.yml → versions/centos_9.yml.disabled
diff --git a/versions/debian_10_buster.yml → versions/debian_10_buster.yml.disabled b/versions/debian_10_buster.yml → versions/debian_10_buster.yml.disabled
diff --git a/versions/debian_11_bullseye.yml → versions/debian_11_bullseye.yml.disabled b/versions/debian_11_bullseye.yml → versions/debian_11_bullseye.yml.disabled
diff --git a/versions/debian_12_bookworm.yml → versions/debian_12_bookworm.yml.disabled b/versions/debian_12_bookworm.yml → versions/debian_12_bookworm.yml.disabled
diff --git a/versions/sles_12.1.yml → versions/sles_12.1.yml.disabled b/versions/sles_12.1.yml → versions/sles_12.1.yml.disabled
diff --git a/versions/sles_12.2.yml → versions/sles_12.2.yml.disabled b/versions/sles_12.2.yml → versions/sles_12.2.yml.disabled
diff --git a/versions/sles_12.3.yml → versions/sles_12.3.yml.disabled b/versions/sles_12.3.yml → versions/sles_12.3.yml.disabled
diff --git a/versions/sles_12.4.yml → versions/sles_12.4.yml.disabled b/versions/sles_12.4.yml → versions/sles_12.4.yml.disabled
diff --git a/versions/sles_12.5.yml → versions/sles_12.5.yml.disabled b/versions/sles_12.5.yml → versions/sles_12.5.yml.disabled
diff --git a/versions/sles_15.1.yml → versions/sles_15.1.yml.disabled b/versions/sles_15.1.yml → versions/sles_15.1.yml.disabled
diff --git a/versions/sles_15.2.yml → versions/sles_15.2.yml.disabled b/versions/sles_15.2.yml → versions/sles_15.2.yml.disabled
diff --git a/versions/sles_15.3.yml → versions/sles_15.3.yml.disabled b/versions/sles_15.3.yml → versions/sles_15.3.yml.disabled
diff --git a/versions/sles_15.4.yml → versions/sles_15.4.yml.disabled b/versions/sles_15.4.yml → versions/sles_15.4.yml.disabled
diff --git a/versions/sles_15.5.yml → versions/sles_15.5.yml.disabled b/versions/sles_15.5.yml → versions/sles_15.5.yml.disabled
diff --git a/versions/ubuntu_18_bionic.yml → versions/ubuntu_18_bionic.yml.disabled b/versions/ubuntu_18_bionic.yml → versions/ubuntu_18_bionic.yml.disabled
diff --git a/versions/ubuntu_20_focal.yml → versions/ubuntu_20_focal.yml.disabled b/versions/ubuntu_20_focal.yml → versions/ubuntu_20_focal.yml.disabled
diff --git a/versions/ubuntu_24_noble.yml → versions/ubuntu_24_noble.yml.disabled b/versions/ubuntu_24_noble.yml → versions/ubuntu_24_noble.yml.disabled
diff --git a/versions/windows-server-2019.yml → versions/windows-server-2019.yml.disabled b/versions/windows-server-2019.yml → versions/windows-server-2019.yml.disabled
diff --git a/versions/windows-server-2022.yml → versions/windows-server-2022.yml.disabled b/versions/windows-server-2022.yml → versions/windows-server-2022.yml.disabled