aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools/testbed-setup
diff options
context:
space:
mode:
Diffstat (limited to 'resources/tools/testbed-setup')
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.16.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.17.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.18.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.20.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.21.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.22.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.24.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.25.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.26.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.36.yaml7
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.37.yaml7
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.44.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.45.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.46.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.47.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.48.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.49.yaml3
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.50.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.51.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.52.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.53.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.54.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.55.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.56.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.57.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.58.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.59.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/host_vars/10.30.51.60.yaml1
-rw-r--r--resources/tools/testbed-setup/ansible/production12
-rw-r--r--resources/tools/testbed-setup/ansible/roles/common/files/apt-sources-arm.list47
-rw-r--r--resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml8
-rw-r--r--resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu.yaml (renamed from resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu_x86_64.yaml)14
-rw-r--r--resources/tools/testbed-setup/ansible/roles/sut/files/taishan_workaround.service11
-rw-r--r--resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml8
-rw-r--r--resources/tools/testbed-setup/ansible/roles/sut/tasks/taishan_workaround.yaml30
-rw-r--r--resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu.yaml (renamed from resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_x86_64.yaml)2
-rw-r--r--resources/tools/testbed-setup/ansible/roles/tg_sut/defaults/main.yaml4
-rw-r--r--resources/tools/testbed-setup/ansible/roles/tg_sut/files/90-csit2
-rw-r--r--resources/tools/testbed-setup/ansible/roles/tg_sut/files/interfaces_physical14
-rw-r--r--resources/tools/testbed-setup/ansible/roles/tg_sut/files/netplan_config11
-rw-r--r--resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/aarch64.yaml12
-rw-r--r--resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml59
-rw-r--r--resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/skylake.yaml17
-rw-r--r--resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu.yaml (renamed from resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_x86_64.yaml)26
-rw-r--r--resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/x86_64.yaml18
45 files changed, 245 insertions, 92 deletions
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.16.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.16.yaml
index 8a841cae09..25401e33f3 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.16.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.16.yaml
@@ -3,3 +3,4 @@
hostname: "t1-tg1"
isolcpus: "1-17,19-35"
+cfs_cpus: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.17.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.17.yaml
index e770668ee9..ac3f9fa310 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.17.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.17.yaml
@@ -3,3 +3,4 @@
hostname: "t1-sut1"
isolcpus: "1-17,19-35"
+cfs_cpus: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.18.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.18.yaml
index d8c128e302..e96ed37d89 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.18.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.18.yaml
@@ -3,3 +3,4 @@
hostname: "t1-sut2"
isolcpus: "1-17,19-35"
+cfs_cpus: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.20.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.20.yaml
index 082b706c3f..91eb9fc9ca 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.20.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.20.yaml
@@ -3,3 +3,4 @@
hostname: "t2-tg1"
isolcpus: "1-17,19-35"
+cfs_cpus: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.21.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.21.yaml
index 00f886e0a8..84a72542e9 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.21.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.21.yaml
@@ -3,3 +3,4 @@
hostname: "t2-sut1"
isolcpus: "1-17,19-35"
+cfs_cpus: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.22.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.22.yaml
index 4b39d8e3b7..5d7aaa5bee 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.22.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.22.yaml
@@ -3,3 +3,4 @@
hostname: "t2-sut2"
isolcpus: "1-17,19-35"
+cfs_cpus: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.24.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.24.yaml
index 3fbb919fb1..88e5148dfb 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.24.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.24.yaml
@@ -3,3 +3,4 @@
hostname: "t3-tg1"
isolcpus: "1-17,19-35"
+cfs_cpus: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.25.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.25.yaml
index 9a6c5a3aca..144e449b4a 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.25.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.25.yaml
@@ -3,3 +3,4 @@
hostname: "t3-sut1"
isolcpus: "1-17,19-35"
+cfs_cpus: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.26.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.26.yaml
index 4c95b8aee5..d860ef216d 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.26.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.26.yaml
@@ -3,3 +3,4 @@
hostname: "t3-sut2"
isolcpus: "1-17,19-35"
+cfs_cpus: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.36.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.36.yaml
new file mode 100644
index 0000000000..e405b8064d
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.36.yaml
@@ -0,0 +1,7 @@
+---
+# file: host_vars/10.30.51.36.yaml
+
+hostname: "s17-t33-sut1"
+isolcpus: "1-15,17-31,33-47,49-63"
+cfs_cpus: "0,16,32,48"
+taishan_workaround: True
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.37.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.37.yaml
new file mode 100644
index 0000000000..ece3a752aa
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.37.yaml
@@ -0,0 +1,7 @@
+---
+# file: host_vars/10.30.51.37.yaml
+
+hostname: "s18-t33-sut2"
+isolcpus: "1-15,17-31,33-47,49-63"
+cfs_cpus: "0,16,32,48"
+taishan_workaround: True
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.44.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.44.yaml
index 7a07e88012..bdaeed5407 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.44.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.44.yaml
@@ -3,3 +3,4 @@
hostname: "s3-t21-sut1"
isolcpus: "1-27,29-55,57-83,85-111"
+cfs_cpus: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.45.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.45.yaml
index 01c331630a..d12c763516 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.45.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.45.yaml
@@ -3,3 +3,4 @@
hostname: "s4-t21-tg1"
isolcpus: "1-27,29-55,57-83,85-111"
+cfs_cpus: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.46.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.46.yaml
index 6c1baf80d6..8e38586f7f 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.46.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.46.yaml
@@ -3,3 +3,4 @@
hostname: "s11-t31-sut1"
isolcpus: "1-27,29-55,57-83,85-111"
+cfs_cpus: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.47.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.47.yaml
index a4d9da8e7e..a3d05730da 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.47.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.47.yaml
@@ -3,3 +3,4 @@
hostname: "s12-t31-sut2"
isolcpus: "1-27,29-55,57-83,85-111"
+cfs_cpus: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.48.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.48.yaml
index 2aa3bdfd60..f6a77e8be3 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.48.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.48.yaml
@@ -3,3 +3,4 @@
hostname: "s13-t31-tg1"
isolcpus: "1-27,29-55,57-83,85-111"
+cfs_cpus: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.49.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.49.yaml
index 687b1f65eb..9aad58a00b 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.49.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.49.yaml
@@ -1,5 +1,6 @@
---
# file: host_vars/10.30.51.49.yaml
-hostname: "s17-t33-tg1"
+hostname: "s19-t33t34-tg1"
isolcpus: "1-27,29-55,57-83,85-111"
+cfs_cpus: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.50.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.50.yaml
index b783a3ff25..55b8655e8c 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.50.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.50.yaml
@@ -3,3 +3,4 @@
hostname: "s1-t11-sut1"
isolcpus: "1-27,29-55,57-83,85-111"
+cfs_cpus: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.51.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.51.yaml
index 3f2e6a164b..42eeea814d 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.51.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.51.yaml
@@ -3,3 +3,4 @@
hostname: "s2-t12-sut1"
isolcpus: "1-27,29-55,57-83,85-111"
+cfs_cpus: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.52.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.52.yaml
index 2f89fb6784..7eb994a8a2 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.52.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.52.yaml
@@ -3,3 +3,4 @@
hostname: "s5-t22-sut1"
isolcpus: "1-27,29-55,57-83,85-111"
+cfs_cpus: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.53.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.53.yaml
index 2b91d82ea3..938bcecd30 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.53.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.53.yaml
@@ -3,3 +3,4 @@
hostname: "s6-t22-tg1"
isolcpus: "1-27,29-55,57-83,85-111"
+cfs_cpus: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.54.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.54.yaml
index 3e4125626f..9a3de32d3d 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.54.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.54.yaml
@@ -3,3 +3,4 @@
hostname: "s7-t23-sut1"
isolcpus: "1-27,29-55,57-83,85-111"
+cfs_cpus: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.55.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.55.yaml
index ba51b44675..2014e01dea 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.55.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.55.yaml
@@ -3,3 +3,4 @@
hostname: "s8-t23-tg1"
isolcpus: "1-27,29-55,57-83,85-111"
+cfs_cpus: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.56.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.56.yaml
index 2662447404..1d926f56a9 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.56.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.56.yaml
@@ -3,3 +3,4 @@
hostname: "s9-t24-sut1"
isolcpus: "1-27,29-55,57-83,85-111"
+cfs_cpus: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.57.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.57.yaml
index b28efb4e68..e5bddf33f8 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.57.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.57.yaml
@@ -3,3 +3,4 @@
hostname: "s10-t24-tg1"
isolcpus: "1-27,29-55,57-83,85-111"
+cfs_cpus: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.58.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.58.yaml
index 68551122dc..0e854fdeb0 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.58.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.58.yaml
@@ -3,3 +3,4 @@
hostname: "s14-t32-sut1"
isolcpus: "1-27,29-55,57-83,85-111"
+cfs_cpus: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.59.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.59.yaml
index 938f3cf511..4647606980 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.59.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.59.yaml
@@ -3,3 +3,4 @@
hostname: "s15-t32-sut2"
isolcpus: "1-27,29-55,57-83,85-111"
+cfs_cpus: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.60.yaml b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.60.yaml
index 870d612e43..27f5b45645 100644
--- a/resources/tools/testbed-setup/ansible/host_vars/10.30.51.60.yaml
+++ b/resources/tools/testbed-setup/ansible/host_vars/10.30.51.60.yaml
@@ -3,3 +3,4 @@
hostname: "s16-t32-tg1"
isolcpus: "1-27,29-55,57-83,85-111"
+cfs_cpus: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/production b/resources/tools/testbed-setup/ansible/production
index 465796546e..5397d319db 100644
--- a/resources/tools/testbed-setup/ansible/production
+++ b/resources/tools/testbed-setup/ansible/production
@@ -26,7 +26,7 @@ all:
hosts:
10.30.51.45: null #s4-t21-tg1
10.30.51.48: null #s13-t31-tg1
- 10.30.51.49: null #s17-t33-tg1
+ 10.30.51.49: null #s19-t33t34-tg1
10.30.51.53: null #s6-t22-tg1
10.30.51.55: null #s8-t23-tg1
10.30.51.57: null #s10-t24-tg1
@@ -45,9 +45,11 @@ all:
hosts:
10.30.51.50: null #s1-t11-sut1
10.30.51.51: null #s2-t12-sut1
-# arm:
-# children:
+ taishan:
+ children:
# tg:
# hosts:
-# sut:
-# hosts:
+ sut:
+ hosts:
+ 10.30.51.36: null #s17-t33-sut1
+ 10.30.51.37: null #s18-t33-sut2
diff --git a/resources/tools/testbed-setup/ansible/roles/common/files/apt-sources-arm.list b/resources/tools/testbed-setup/ansible/roles/common/files/apt-sources-arm.list
new file mode 100644
index 0000000000..08da1ecf96
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/roles/common/files/apt-sources-arm.list
@@ -0,0 +1,47 @@
+deb http://ca.ports.ubuntu.com/ubuntu-ports/ bionic main restricted
+deb-src http://ca.ports.ubuntu.com/ubuntu-ports/ bionic main restricted
+
+## Major bug fix updates produced after the final release of the
+## distribution.
+deb http://ca.ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted
+deb-src http://ca.ports.ubuntu.com/ubuntu-ports/ bionic-updates main restricted
+
+## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
+## team. Also, please note that software in universe WILL NOT receive any
+## review or updates from the Ubuntu security team.
+deb http://ca.ports.ubuntu.com/ubuntu-ports/ bionic universe
+deb-src http://ca.ports.ubuntu.com/ubuntu-ports/ bionic universe
+deb http://ca.ports.ubuntu.com/ubuntu-ports/ bionic-updates universe
+deb-src http://ca.ports.ubuntu.com/ubuntu-ports/ bionic-updates universe
+
+## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
+## team, and may not be under a free licence. Please satisfy yourself as to
+## your rights to use the software. Also, please note that software in
+## multiverse WILL NOT receive any review or updates from the Ubuntu
+## security team.
+deb http://ca.ports.ubuntu.com/ubuntu-ports/ bionic multiverse
+deb-src http://ca.ports.ubuntu.com/ubuntu-ports/ bionic multiverse
+deb http://ca.ports.ubuntu.com/ubuntu-ports/ bionic-updates multiverse
+deb-src http://ca.ports.ubuntu.com/ubuntu-ports/ bionic-updates multiverse
+
+## N.B. software from this repository may not have been tested as
+## extensively as that contained in the main release, although it includes
+## newer versions of some applications which may provide useful features.
+## Also, please note that software in backports WILL NOT receive any review
+## or updates from the Ubuntu security team.
+deb http://ca.ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted universe multiverse
+deb-src http://ca.ports.ubuntu.com/ubuntu-ports/ bionic-backports main restricted universe multiverse
+
+deb http://ports.ubuntu.com/ubuntu-ports bionic-security main restricted
+deb-src http://ports.ubuntu.com/ubuntu-ports bionic-security main restricted
+deb http://ports.ubuntu.com/ubuntu-ports bionic-security universe
+deb-src http://ports.ubuntu.com/ubuntu-ports bionic-security universe
+deb http://ports.ubuntu.com/ubuntu-ports bionic-security multiverse
+deb-src http://ports.ubuntu.com/ubuntu-ports bionic-security multiverse
+
+## Uncomment the following two lines to add software from Canonical's
+## 'partner' repository.
+## This software is not part of Ubuntu, but is offered by Canonical and the
+## respective vendors as a service to Ubuntu users.
+# deb http://archive.canonical.com/ubuntu bionic partner
+# deb-src http://archive.canonical.com/ubuntu bionic partner
diff --git a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
index 06058a427b..38d8188be8 100644
--- a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
@@ -2,8 +2,8 @@
# file: roles/common/tasks/main.yaml
- name: Ubuntu specific
- import_tasks: ubuntu_x86_64.yaml
- when: ansible_distribution|lower == 'ubuntu' and ansible_machine == 'x86_64'
+ import_tasks: ubuntu.yaml
+ when: ansible_distribution|lower == 'ubuntu'
- name: Set hostname
hostname:
@@ -17,7 +17,7 @@
line: '{{ ansible_default_ipv4.address }} {{ hostname }}.linuxfoundation.org'
tags: set-hostname
-- name: Set sudoers
+- name: Set sudoers admin
lineinfile:
path: '/etc/sudoers'
state: 'present'
@@ -26,7 +26,7 @@
validate: '/usr/sbin/visudo -cf %s'
tags: set-sudoers
-- name: Set sudoers
+- name: Set sudoers sudo
lineinfile:
path: '/etc/sudoers'
state: 'present'
diff --git a/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu_x86_64.yaml b/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu.yaml
index b6116c3690..ff47ffc656 100644
--- a/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu_x86_64.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu.yaml
@@ -1,11 +1,19 @@
---
-# file: roles/common/tasks/ubuntu_x86_64.yaml
+# file: roles/common/tasks/ubuntu.yaml
-- name: Copy apt sources file
+- name: Copy aarch64 apt sources file
+ template:
+ src: 'files/apt-sources-arm.list'
+ dest: '/etc/apt/sources.list'
+ tags: copy-apt-sources
+ when: ansible_machine == 'aarch64'
+
+- name: Copy x86_64 apt sources file
template:
src: 'files/apt-sources.list'
dest: '/etc/apt/sources.list'
tags: copy-apt-sources
+ when: ansible_machine == 'x86_64'
- name: Install python-apt
apt:
@@ -44,7 +52,7 @@
- name: Install qemu
apt:
- name: 'qemu-system-x86'
+ name: 'qemu-system'
state: 'present'
update_cache: True
tags: install-qemu
diff --git a/resources/tools/testbed-setup/ansible/roles/sut/files/taishan_workaround.service b/resources/tools/testbed-setup/ansible/roles/sut/files/taishan_workaround.service
new file mode 100644
index 0000000000..05f865f407
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/roles/sut/files/taishan_workaround.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Numa node workaround configuration
+
+[Service]
+ExecStart=/bin/sh -c 'echo 1 > /sys/bus/pci/devices/000a:11:00.0/numa_node'
+ExecStart=/bin/sh -c 'echo 1 > /sys/bus/pci/devices/000a:11:00.1/numa_node'
+Type=oneshot
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target \ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml
index 0ecdcdba3b..f5a2dd86ad 100644
--- a/resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml
@@ -2,8 +2,12 @@
# file: roles/sut/tasks/main.yaml
- name: Ubuntu specific
- import_tasks: ubuntu_x86_64.yaml
- when: ansible_distribution|lower == 'ubuntu' and ansible_machine == 'x86_64'
+ import_tasks: ubuntu.yaml
+ when: ansible_distribution|lower == 'ubuntu'
+
+- name: Taishan aarch64 specific
+ import_tasks: taishan_workaround.yaml
+ when: taishan_workaround is defined
- name: Copy 80-vpp.conf
file:
diff --git a/resources/tools/testbed-setup/ansible/roles/sut/tasks/taishan_workaround.yaml b/resources/tools/testbed-setup/ansible/roles/sut/tasks/taishan_workaround.yaml
new file mode 100644
index 0000000000..e262e7288b
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/roles/sut/tasks/taishan_workaround.yaml
@@ -0,0 +1,30 @@
+---
+# file: roles/sut/tasks/taishan_workaround.yaml
+
+- name: Ensure systemd directory exists
+ file:
+ path: "/etc/systemd/system"
+ state: "directory"
+ owner: "root"
+ group: "root"
+ mode: "0755"
+ tags: taishan-workaround
+
+- name: Copy systemd numa config unit file
+ template:
+ src: "files/taishan_workaround.service"
+ dest: "/etc/systemd/system/nic-numa-config.service"
+ owner: "root"
+ group: "root"
+ mode: "0644"
+ register: numa_config_service
+ tags: taishan-workaround
+
+- name: Reload systemd daemon
+ command: "systemctl daemon-reload"
+ when: (numa_config_service and numa_config_service is changed)
+ tags: taishan-workaround
+
+- name: Enable numa config service
+ command: "systemctl enable nic-numa-config.service"
+ tags: taishan-workaround
diff --git a/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_x86_64.yaml b/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu.yaml
index 38946b6bbb..824f0926b5 100644
--- a/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu_x86_64.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/sut/tasks/ubuntu.yaml
@@ -1,5 +1,5 @@
---
-# file: roles/sut/tasks/ubuntu_x86_64.yaml
+# file: roles/sut/tasks/ubuntu.yaml
- name: Install DKMS
apt:
diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/defaults/main.yaml
index 174dc78cb0..3a6f68fb8b 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg_sut/defaults/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/defaults/main.yaml
@@ -16,8 +16,7 @@ docker_daemon_options: []
# - "NO_PROXY=localhost,127.0.0.1"
docker_daemon_environment: []
-docker_apt_key: "9DC858229FC7DD38854AE2D88D81803C0EBFCD88"
-docker_repository: "deb [arch=amd64] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_channel }}"
+docker_repository: "deb https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_channel }}"
docker_apt_package_name: "{{ docker_version }}~{{ docker_edition }}~3-0~{{ ansible_distribution | lower }}"
apt_cache_time: 86400
@@ -25,6 +24,5 @@ apt_cache_time: 86400
kubernetes_channel: "main"
kubernetes_version: "1.11.0-00"
-kubernetes_apt_key: "54A647F9048D5688D7DA2ABE6A030B21BA07F4FB"
kubernetes_repository: "deb http://apt.kubernetes.io/ kubernetes-xenial {{ kubernetes_channel }}"
kubernetes_apt_package_name: "{{ kubernetes_version }}"
diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/files/90-csit b/resources/tools/testbed-setup/ansible/roles/tg_sut/files/90-csit
index 4a57a7c131..e96547e4d7 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg_sut/files/90-csit
+++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/files/90-csit
@@ -77,4 +77,4 @@ kernel.randomize_va_space=0
# typically this value would only be touched in the nohz_full case
# to re-enable cores that by default were not running the watchdog,
# if a kernel lockup was suspected on those cores.
-kernel.watchdog_cpumask=0,18
+kernel.watchdog_cpumask={{ cfs_cpus }}
diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/files/interfaces_physical b/resources/tools/testbed-setup/ansible/roles/tg_sut/files/interfaces_physical
deleted file mode 100644
index 734d8cd18f..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/tg_sut/files/interfaces_physical
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file describes the network interfaces available on your system
-# and how to activate them. For more information, see interfaces(5).
-
-# The loopback network interface
-auto lo
-iface lo inet loopback
-
-# The primary network interface
-auto {{ ansible_default_ipv4["interface"] }}
-iface {{ ansible_default_ipv4["interface"] }} inet static
- address {{ ansible_default_ipv4["address"] }}
- netmask {{ ansible_default_ipv4["netmask"] }}
- gateway {{ ansible_default_ipv4["gateway"] }}
- dns-nameservers 199.204.44.24 199.204.47.54
diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/files/netplan_config b/resources/tools/testbed-setup/ansible/roles/tg_sut/files/netplan_config
new file mode 100644
index 0000000000..2f34cfbaca
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/files/netplan_config
@@ -0,0 +1,11 @@
+# This file describes the network interfaces available on your system
+# For more information, see netplan(5).
+network:
+ version: 2
+ renderer: networkd
+ ethernets:
+ {{ ansible_default_ipv4["interface"] }}:
+ addresses: [ {{ (ansible_default_ipv4.address + '/' + ansible_default_ipv4.netmask) | ipaddr('host/prefix') }} ]
+ gateway4: {{ ansible_default_ipv4["gateway"] }}
+ nameservers:
+ addresses: [ 199.204.44.24, 199.204.47.54 ]
diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/aarch64.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/aarch64.yaml
new file mode 100644
index 0000000000..afaf5cd06b
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/aarch64.yaml
@@ -0,0 +1,12 @@
+---
+# file: roles/tg_sut/tasks/aarch64.yaml
+
+- name: Configure aarch64 kernel parameters
+ lineinfile:
+ path: '/etc/default/grub'
+ state: 'present'
+ regexp: '^GRUB_CMDLINE_LINUX='
+ line: 'GRUB_CMDLINE_LINUX="isolcpus={{ isolcpus }} nohz_full={{ isolcpus }} rcu_nocbs={{ isolcpus }} intel_iommu=on nmi_watchdog=0 audit=0 nosoftlockup processor.max_cstate=1"'
+ notify: ['Update GRUB']
+ tags: set-grub
+
diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml
index ea779c07da..e5da2fc72d 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml
@@ -2,19 +2,31 @@
# file: roles/tg_sut/tasks/main.yaml
- name: Ubuntu specific
- import_tasks: ubuntu_x86_64.yaml
- when: ansible_distribution|lower == 'ubuntu' and ansible_machine == 'x86_64'
+ import_tasks: ubuntu.yaml
+ when: ansible_distribution|lower == 'ubuntu'
-- name: Copy interfaces file
+- name: x86 specific
+ import_tasks: x86_64.yaml
+ when: ansible_machine == 'x86_64'
+
+- name: skylake specific
+ import_tasks: skylake.yaml
+ when: ("skylake" in groups) and inventory_hostname in groups['skylake']
+
+- name: aarch specific
+ import_tasks: aarch64.yaml
+ when: ansible_machine == 'aarch64'
+
+- name: Copy netplan network config file
template:
- src: 'files/interfaces_physical'
- dest: '/etc/network/interfaces'
+ src: 'files/netplan_config'
+ dest: '/etc/netplan/01-netcfg.yaml'
owner: 'root'
group: 'root'
mode: '0644'
tags: copy-interface-file
-- name: Copy sysctl file
+- name: Copy CSIT sysctl file
template:
src: 'files/90-csit'
dest: '/etc/sysctl.d/90-csit.conf'
@@ -47,15 +59,6 @@
dest: '/tmp/requirements.txt'
tags: copy-pip
-- name: Set isolcpus and pstate parameter
- lineinfile:
- path: '/etc/default/grub'
- state: 'present'
- regexp: '^GRUB_CMDLINE_LINUX='
- line: 'GRUB_CMDLINE_LINUX="isolcpus={{ isolcpus }} nohz_full={{ isolcpus }} rcu_nocbs={{ isolcpus }} numa_balancing=disable intel_pstate=disable intel_iommu=on iommu=pt nmi_watchdog=0 audit=0 nosoftlockup processor.max_cstate=1 intel_idle.max_cstate=1 hpet=disable tsc=reliable mce=off"'
- notify: ['Update GRUB']
- tags: set-grub
-
- name: Set ondemand service to disable
service:
name: 'ondemand'
@@ -73,29 +76,3 @@
state: 'present'
line: 'vfio-pci'
tags: load-vfio-pci
-
-- name: Load msr by default
- lineinfile:
- path: '/etc/modules'
- state: 'present'
- line: 'msr'
- tags: disable-turbo-boost
-
-- name: Disable Turbo-Boost by service
- copy:
- src: 'files/disable-turbo-boost.service'
- dest: '/etc/systemd/system/disable-turbo-boost.service'
- owner: 'root'
- group: 'root'
- mode: '0644'
- when: >
- inventory_hostname in groups['skylake']
- tags: disable-turbo-boost
-
-- name: Disable Turbo-Boost by service on startup
- service:
- name: disable-turbo-boost
- enabled: yes
- when: >
- inventory_hostname in groups['skylake']
- tags: disable-turbo-boost
diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/skylake.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/skylake.yaml
new file mode 100644
index 0000000000..03b4714d3e
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/skylake.yaml
@@ -0,0 +1,17 @@
+---
+# file: roles/tg_sut/tasks/skylake.yaml
+
+- name: Disable Skylake Turbo-Boost by service
+ copy:
+ src: 'files/disable-turbo-boost.service'
+ dest: '/etc/systemd/system/disable-turbo-boost.service'
+ owner: 'root'
+ group: 'root'
+ mode: '0644'
+ tags: disable-turbo-boost
+
+- name: Disable Skylake Turbo-Boost by service on startup
+ service:
+ name: disable-turbo-boost
+ enabled: yes
+ tags: disable-turbo-boost
diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_x86_64.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu.yaml
index 76af5be7fd..8604185aa2 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu_x86_64.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/ubuntu.yaml
@@ -1,5 +1,5 @@
---
-# file: roles/tg_sut/tasks/ubuntu_x86_64.yaml
+# file: roles/tg_sut/tasks/ubuntu.yaml
- name: Install python-dev
apt:
@@ -69,17 +69,13 @@
- "cron"
tags: install-docker
-- name: Install upstream APT GPG key
+- name: Install Docker APT GPG key
apt_key:
- id: "{{ docker_apt_key }}"
- keyserver: "{{ ansible_local.core.keyserver
- if (ansible_local|d() and ansible_local.core|d() and
- ansible_local.core.keyserver)
- else 'hkp://pool.sks-keyservers.net' }}"
+ url: https://download.docker.com/linux/ubuntu/gpg
state: "present"
tags: install-docker
-- name: Install upstream APT repository
+- name: Install Docker APT repository
apt_repository:
repo: "{{ docker_repository }}"
state: "present"
@@ -95,7 +91,7 @@
cache_valid_time: "{{ apt_cache_time }}"
tags: install-docker
-- name: Remove Upstart config file
+- name: Remove Upstart docker config file
file:
path: "/etc/default/docker"
state: "absent"
@@ -110,7 +106,7 @@
mode: "0755"
tags: ensure-docker
-- name: Copy systemd unit file
+- name: Copy systemd docker unit file
template:
src: "templates/docker.service.j2"
dest: "/etc/systemd/system/docker.service"
@@ -136,17 +132,13 @@
when: docker_users
tags: set-docker
-- name: Install upstream APT GPG key
+- name: Install kubernetes APT GPG key
apt_key:
- id: "{{ kubernetes_apt_key }}"
- keyserver: "{{ ansible_local.core.keyserver
- if (ansible_local|d() and ansible_local.core|d() and
- ansible_local.core.keyserver)
- else 'hkp://pool.sks-keyservers.net' }}"
+ url: https://packages.cloud.google.com/apt/doc/apt-key.gpg
state: "present"
tags: install-kubernetes
-- name: Install upstream APT repository
+- name: Install kubernetes APT repository
apt_repository:
repo: "{{ kubernetes_repository }}"
state: "present"
diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/x86_64.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/x86_64.yaml
new file mode 100644
index 0000000000..5c7110e289
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/x86_64.yaml
@@ -0,0 +1,18 @@
+---
+# file: roles/tg_sut/tasks/x86_64.yaml
+
+- name: Configure x86_64 kernel parameters
+ lineinfile:
+ path: '/etc/default/grub'
+ state: 'present'
+ regexp: '^GRUB_CMDLINE_LINUX='
+ line: 'GRUB_CMDLINE_LINUX="isolcpus={{ isolcpus }} nohz_full={{ isolcpus }} rcu_nocbs={{ isolcpus }} numa_balancing=disable intel_pstate=disable intel_iommu=on iommu=pt nmi_watchdog=0 audit=0 nosoftlockup processor.max_cstate=1 intel_idle.max_cstate=1 hpet=disable tsc=reliable mce=off"'
+ notify: ['Update GRUB']
+ tags: set-grub
+
+- name: Load msr by default
+ lineinfile:
+ path: '/etc/modules'
+ state: 'present'
+ line: 'msr'
+ tags: disable-turbo-boost