Renamed x86 architecture

diff --git a/automation/ansible/hosts b/automation/ansible/hosts
index f1494ab25a5a24391247ce77ef493393c60db6b6..28f3842f8fc37595a4c69a2085a9523eb3a7dd84 100644 (file)
--- a/automation/ansible/hosts
+++ b/automation/ansible/hosts
@@ -24,19 +24,29 @@ ci-slave-powerpc-01
 140.211.168.186
 140.211.168.187
 
-[slave-x32]
-ci-slave-32-02
-ci-slave-32-03
-ci-slave-32-04
-
-[slave-x64]
-ci-slave-64-02
-ci-slave-64-03
-ci-slave-64-04
+[slave-i386]
+ci-slave-i386-04-01
+ci-slave-i386-04-02
+ci-slave-i386-04-03
+ci-slave-i386-04-04
+ci-slave-i386-05-01
+ci-slave-i386-05-02
+ci-slave-i386-05-03
+ci-slave-i386-05-04
+
+[slave-amd64]
+ci-slave-amd64-04-01
+ci-slave-amd64-04-02
+ci-slave-amd64-04-03
+ci-slave-amd64-04-04
+ci-slave-amd64-05-01
+ci-slave-amd64-05-02
+ci-slave-amd64-05-03
+ci-slave-amd64-05-04
 
 [slave:children]
-slave-x32
-slave-x64
+slave-i386
+slave-amd64
 slave-armhf
 slave-arm64
 slave-powerpc

diff --git a/automation/ansible/site.yml b/automation/ansible/site.yml
index 9f9dee5fd7f3c287f875fe4e84778b6bd343aaa1..b706081b05c915b14134cc053df8bf221e5c7f1d 100644 (file)
--- a/automation/ansible/site.yml
+++ b/automation/ansible/site.yml
@@ -4,5 +4,5 @@
 - include: slave-arm64.yml
 - include: slave-powerpc.yml
 - include: slave-ppc64el.yml
-- include: slave-x32.yml
-- include: slave-x64.yml
+- include: slave-i386.yml
+- include: slave-amd64.yml

diff --git a/automation/ansible/slave-amd64.yml b/automation/ansible/slave-amd64.yml
new file mode 100644 (file)
index 0000000..3835701
--- /dev/null
+++ b/automation/ansible/slave-amd64.yml
@@ -0,0 +1,10 @@
+- hosts: slave-amd64
+  roles:
+    - common
+    - cross-compilers
+    - babeltrace
+    - liburcu
+    - lttng-ust
+    - lttng-tools
+    - lttng-modules
+    - tracecompass

diff --git a/automation/ansible/slave-i386.yml b/automation/ansible/slave-i386.yml
new file mode 100644 (file)
index 0000000..3fdebc8
--- /dev/null
+++ b/automation/ansible/slave-i386.yml
@@ -0,0 +1,10 @@
+- hosts: slave-i386
+  roles:
+    - common
+    - cross-compilers
+    - babeltrace
+    - liburcu
+    - lttng-ust
+    - lttng-tools
+    - lttng-modules
+    - tracecompass

diff --git a/automation/ansible/slave-x32.yml b/automation/ansible/slave-x32.yml
deleted file mode 100644 (file)
index 978f762..0000000
--- a/automation/ansible/slave-x32.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- hosts: slave-x32
-  roles:
-    - common
-    - cross-compilers
-    - babeltrace
-    - liburcu
-    - lttng-ust
-    - lttng-tools
-    - lttng-modules
-    - tracecompass

diff --git a/automation/ansible/slave-x64.yml b/automation/ansible/slave-x64.yml
deleted file mode 100644 (file)
index 67143a2..0000000
--- a/automation/ansible/slave-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- hosts: slave-x64
-  roles:
-    - common
-    - cross-compilers
-    - babeltrace
-    - liburcu
-    - lttng-ust
-    - lttng-tools
-    - lttng-modules
-    - tracecompass