Infra: AWS/Azure fix OOM issues on smaller instances

Signed-off-by: Tomas Alexy <tomas.alexy@pantheon.tech>
Change-Id: Ic799f5eeaf03f34386603421c1d9282167c25aa5

4 files changed, 33 insertions, 8 deletions

diff --git a/resources/tools/testbed-setup/ansible/sut.yaml b/resources/tools/testbed-setup/ansible/sut.yaml
index afa4d40ef5..abc25a279c 100644
--- a/resources/tools/testbed-setup/ansible/sut.yaml
+++ b/resources/tools/testbed-setup/ansible/sut.yaml
@@ -56,12 +56,12 @@
       tags: vpp
     - role: dpdk
       tags: dpdk
-    - role: aws
-      tags: aws
     - role: iperf
       tags: iperf
     - role: docker
       tags: docker
+    - role: aws
+      tags: aws
     - role: cleanup
       tags: cleanup
     # TODO: 'Check Kernel Parameters' failing in
@@ -87,12 +87,12 @@
       tags: docker
     - role: vpp
       tags: vpp
-    - role: azure
-      tags: azure
     - role: iperf
       tags: iperf
     - role: dpdk
       tags: dpdk
+    - role: azure
+      tags: azure
     - role: cleanup
       tags: cleanup
     # TODO: 'Check Kernel Parameters' failing in
diff --git a/resources/tools/testbed-setup/ansible/tg.yaml b/resources/tools/testbed-setup/ansible/tg.yaml
index 2b18b5d85d..38ea8227e8 100644
--- a/resources/tools/testbed-setup/ansible/tg.yaml
+++ b/resources/tools/testbed-setup/ansible/tg.yaml
@@ -54,8 +54,6 @@
       tags: common
     - role: dpdk
       tags: dpdk
-    - role: aws
-      tags: aws
     - role: docker
       tags: docker
     - role: tg
@@ -66,6 +64,8 @@
       tags: trex
     - role: ab
       tags: ab
+    - role: aws
+      tags: aws
     - role: cleanup
       tags: cleanup
     # TODO: 'Check Kernel Parameters' failing in
@@ -87,8 +87,6 @@
       tags: user_add
     - role: common
       tags: common
-    - role: azure
-      tags: azure
     - role: docker
       tags: docker
     - role: tg
@@ -99,6 +97,8 @@
       tags: trex
     - role: ab
       tags: ab
+    - role: azure
+      tags: azure
     - role: cleanup
       tags: cleanup
     # TODO: 'Check Kernel Parameters' failing in
diff --git a/terraform-ci-infra/2n_aws_c5n/deploy/main.tf b/terraform-ci-infra/2n_aws_c5n/deploy/main.tf
index 8595f9f270..f97d974b38 100644
--- a/terraform-ci-infra/2n_aws_c5n/deploy/main.tf
+++ b/terraform-ci-infra/2n_aws_c5n/deploy/main.tf
@@ -319,6 +319,11 @@ resource "null_resource" "deploy_tg" {
       }
     }
   }
+
+  provisioner "remote-exec" {
+    on_failure = continue
+    inline = ["sudo reboot"]
+  }
 }
 
 resource "null_resource" "deploy_dut1" {
@@ -352,6 +357,11 @@ resource "null_resource" "deploy_dut1" {
       }
     }
   }
+
+  provisioner "remote-exec" {
+    on_failure = continue
+    inline = ["sudo reboot"]
+  }
 }
 
 resource "null_resource" "deploy_topology" {
diff --git a/terraform-ci-infra/3n_aws_c5n/deploy/main.tf b/terraform-ci-infra/3n_aws_c5n/deploy/main.tf
index 6559bbf70d..7c029c6c54 100644
--- a/terraform-ci-infra/3n_aws_c5n/deploy/main.tf
+++ b/terraform-ci-infra/3n_aws_c5n/deploy/main.tf
@@ -385,6 +385,11 @@ resource "null_resource" "deploy_tg" {
       }
     }
   }
+
+  provisioner "remote-exec" {
+    on_failure = continue
+    inline = ["sudo reboot"]
+  }
 }
 
 resource "null_resource" "deploy_dut1" {
@@ -418,6 +423,11 @@ resource "null_resource" "deploy_dut1" {
       }
     }
   }
+
+  provisioner "remote-exec" {
+    on_failure = continue
+    inline = ["sudo reboot"]
+  }
 }
 
 resource "null_resource" "deploy_dut2" {
@@ -451,6 +461,11 @@ resource "null_resource" "deploy_dut2" {
       }
     }
   }
+
+  provisioner "remote-exec" {
+    on_failure = continue
+    inline = ["sudo reboot"]
+  }
 }
 
 resource "null_resource" "deploy_topology" {