ansible: upgrade test-nearform_intel-ubuntu1604-x64-1 (#3052)

Upgrade the first benchmark machine to Ubuntu 18.04.

ansible/inventory.yml

@@ -239,7 +239,7 @@ hosts:
             user: admin
             remote_env:
                 PATH: /opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin
-        intel-ubuntu1604-x64-1: {ip: 92.51.196.114, build_test_v8: yes}
+        intel-ubuntu1804-x64-1: {ip: 92.51.196.114, build_test_v8: yes, is_benchmark: yes}
         intel-ubuntu1604-x64-2: {ip: 92.51.196.115}
 
 

ansible/playbooks/jenkins/worker/create.yml

@@ -72,6 +72,7 @@
 
 - hosts:
     - test-*-ubuntu1604-x*
+    - test-*intel-ubuntu1804-x*
   roles:
     - linux-perf
 

ansible/roles/baselayout/vars/main.yml

@@ -170,7 +170,7 @@ packages: {
   ],
 
   ubuntu: [
-    'ccache,git,libfontconfig1,sudo,python3-pip',
+    'ccache,curl,git,libfontconfig1,sudo,python3-pip',
   ],
 
   ubuntu1404: [

ansible/roles/benchmarking/tasks/main.yml

@@ -33,13 +33,9 @@
   args:
     chdir: "/home/{{ server_user }}/wrk"
 
-- name: Install Rscript repo | ubuntu1404
-  when: os == "ubuntu1404"
-  shell: echo "deb https://ftp.heanet.ie/mirrors/cran.r-project.org/bin/linux/ubuntu trusty/" > /etc/apt/sources.list.d/r.list
-
-- name: Install Rscript repo | ubuntu1604
-  when: os == "ubuntu1604"
-  shell: echo "deb https://ftp.heanet.ie/mirrors/cran.r-project.org/bin/linux/ubuntu xenial/" > /etc/apt/sources.list.d/r.list
+- name: Install Rscript repo | {{ os }}
+  when: os|startswith("ubuntu")
+  shell: echo "deb https://ftp.heanet.ie/mirrors/cran.r-project.org/bin/linux/ubuntu {{ ansible_distribution_release }}-cran40/" > /etc/apt/sources.list.d/r.list
 
 - name: Add R key
   apt_key:

ansible/roles/benchmarking/vars/main.yml

@@ -13,3 +13,4 @@ packages:
   - python-requests
   - zlib1g-dev
   - build-essential
+  - unzip

ansible/roles/build-test-v8/tasks/partials/ubuntu1804.yml

@@ -0,0 +1,10 @@
+---
+
+#
+# Install packages for V8 builds.
+#
+
+- name: install httplib2
+  ansible.builtin.apt:
+    name: ['python-httplib2', 'python3-httplib2']
+    state: present

ansible/roles/linux-perf/handlers/main.yml

@@ -0,0 +1,6 @@
+---
+
+# sysctl handler
+
+- name: update sysctl settings
+  ansible.builtin.command: sysctl -p /etc/sysctl.d/20-perf.conf

ansible/roles/linux-perf/tasks/main.yml

@@ -44,3 +44,14 @@
       file:
         state: absent
         path: "{{ tmp_folder }}"
+
+- name: Allow monitoring
+  ansible.builtin.lineinfile:
+    create: yes
+    dest: "/etc/sysctl.d/20-perf.conf"
+    line: "{{ item.line }}"
+    regexp: "{{ item.regexp }}"
+  notify: update sysctl settings
+  with_items:
+  - { regexp: "kernel.perf_event_paranoid", line: "kernel.perf_event_paranoid = 2" }
+  tags: linux_perf