X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Ftestbed-setup%2Fansible%2Fsut.yaml;h=f3e8c3b57bb04a2f2f4709d10fbd8f43727c7c84;hb=refs%2Fchanges%2F64%2F30964%2F22;hp=67caadd99acfec1587d6a12de0574f30946fe1d8;hpb=8605f3f406468f57bb9b2eac12a4421f65965300;p=csit.git

diff --git a/resources/tools/testbed-setup/ansible/sut.yaml b/resources/tools/testbed-setup/ansible/sut.yaml
index 67caadd99a..f3e8c3b57b 100644
--- a/resources/tools/testbed-setup/ansible/sut.yaml
+++ b/resources/tools/testbed-setup/ansible/sut.yaml
@@ -5,26 +5,62 @@
   remote_user: testuser
   become: yes
   become_user: root
+  gather_facts: false
+  pre_tasks:
+    - name: Gathering Facts
+      gather_facts:
+      tags:
+        - always
   roles:
+    - role: baremetal
+      tags: baremetal
     - role: common
       tags: common
-    - role: vexx_hosts
-      tags: vexx_hosts
-    - role: sut
-      tags: sut
+    - role: kernel
+      tags: kernel
+    - role: mellanox
+      tags: mellanox
+    - role: vpp
+      tags: vpp
     - role: dpdk
       tags: dpdk
     - role: docker
       tags: docker
     - role: kubernetes
       tags: kubernetes
-    - role: mellanox
-      tags: mellanox
     - role: kernel_vm
       tags: kernel_vm
+    - role: csit_sut_image
+      tags: csit_sut_image
     - role: performance_tuning
       tags: performance_tuning
     - role: cleanup
       tags: cleanup
     - role: calibration
       tags: calibration
+
+- hosts: sut_aws
+  remote_user: testuser
+  become: yes
+  become_user: root
+  roles:
+    - role: user_add
+      tags: user_add
+    - role: common
+      tags: common
+    - role: vpp
+      tags: vpp
+    - role: dpdk
+      tags: dpdk
+    - role: aws
+      tags: aws
+    - role: iperf
+      tags: iperf
+    - role: docker
+      tags: docker
+    - role: cleanup
+      tags: cleanup
+    # TODO: 'Check Kernel Parameters' failing in
+    # resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
+    # - role: calibration
+    #   tags: calibration