Reprovision s390x machines (#2083)

* ansible: update playbooks for new s390x machines
* Remove symbolic link + turn devtoolset install to manual
* ansible: Rename every reference of rhel72 -> rhel7

Author: Ash Cripps

ansible/ansible.cfg

@@ -34,6 +34,9 @@ ansible_python_interpreter = /usr/local/bin/python
 [hosts:fedora30]
 ansible_python_interpreter = /usr/bin/python3
 
+[hosts:ibm]
+become_method             = sudo
+
 [hosts:marist]
 ansible_become             = false
 ansible_python_interpreter = /NODEJS2/python-2017-04-12-py27/python27/bin/python

ansible/inventory.yml

@@ -36,6 +36,7 @@ hosts:
 
     - ibm:
         aix71-ppc64_be-1: {ip: 129.33.196.199, user: b9s010a}
+        rhel7-s390x-1: {ip: 148.100.86.101, user: linux1}
 
     - joyent:
         smartos15-x64-2: {ip: 165.225.148.139}
@@ -61,8 +62,6 @@ hosts:
     - softlayer:
         centos6-x64-1: {ip: 169.62.77.228}
 
-    - linuxonecc:
-        rhel72-s390x-1: {ip: 148.100.110.65}
 
     - packetnet:
         centos7-arm64-1: {ip: 147.75.104.218}
@@ -98,6 +97,10 @@ hosts:
     - ibm:
         aix71-ppc64_be-1: {ip: 129.33.196.197, user: b9s010a}
         aix71-ppc64_be-2: {ip: 129.33.196.198, user: b9s010a}
+        rhel7-s390x-1: {ip: 148.100.86.21, user: linux1}
+        rhel7-s390x-2: {ip: 148.100.86.117, user: linux1}
+        rhel7-s390x-3: {ip: 148.100.86.28, user: linux1}
+        rhel7-s390x-4: {ip: 148.100.86.94, user: linux1}
 
     - joyent:
         smartos15-x64-3: {ip: 165.225.148.128}
@@ -115,11 +118,7 @@ hosts:
     - marist:
         zos13-s390x-1: {ip: 148.100.36.133, user: Unix1}
         zos13-s390x-2: {ip: 148.100.36.134, user: Unix1}
-
-    - linuxonecc:
-        rhel72-s390x-1: {ip: 148.100.110.63}
-        rhel72-s390x-2: {ip: 148.100.110.64}
-        rhel72-s390x-3: {ip: 148.100.110.153}
+        
 
     - mininodes:
         ubuntu1604-arm64_odroid_c2-1: {ip: 70.167.220.147}

ansible/playbooks/jenkins/worker/create.yml

@@ -28,12 +28,6 @@
     - name: check if secret is properly set
       fail:
       failed_when: not secret
-# Requires `additional_drive: /dev/dasdb1` to be in the ansible/host_vars/HOST
-# file, where HOST is the full ansible host name.
-    - name: check if additional_drive is properly set
-      fail:
-      failed_when: not additional_drive
-      when: "'rhel72-s390x' in inventory_hostname"
 
   environment: '{{remote_env}}'
 

ansible/roles/baselayout/tasks/main.yml

@@ -42,6 +42,7 @@
   shell: coreadm -i /home/iojs/cores/core.%f.%p -e process -d global
 
 - name: disable sftp
+  when: not "'rhel7-s390x' in inventory_hostname"
   notify: restart sshd
   lineinfile: state=absent dest="{{ ssh_config }}" regexp=^Subsystem(\s+)sftp
 
@@ -56,7 +57,7 @@
       skip: true
 
 - name: check for a recent enough ccache
-  when: os in ccache_no_binpkg or 'rhel72-s390x' in inventory_hostname
+  when: os in ccache_no_binpkg or 'rhel7-s390x' in inventory_hostname
   stat: path="{{ binary_dest }}"
   register: has_ccache
 
@@ -175,7 +176,7 @@
     line: '127.0.1.1        {{safe_hostname}}'
 
 - name: run ccache installer
-  when: os == "rhel72" and arch == "s390x" and not has_ccache.stat.exists
+  when: os == "rhel7" and arch == "s390x" and not has_ccache.stat.exists
   include: ccache.yml
   static: false
   vars:

ansible/roles/baselayout/vars/main.yml

@@ -86,7 +86,7 @@ packages: {
     'python@2,python,ccache'
   ],
 
-  rhel72: [
+  rhel7: [
     'gcc-c++,sudo,git,zip,unzip',
   ],
 

ansible/roles/java-base/vars/main.yml

@@ -13,7 +13,7 @@ packages: {
   'fedora': 'java-1.8.0-openjdk-headless',
   'freebsd': 'openjdk8-jre',
   'macos': 'adoptopenjdk-openjdk8',
-  'rhel72': 'java-1.8.0-openjdk',
+  'rhel7': 'java-1.8.0-openjdk',
   'smartos': 'openjdk8',
   'ubuntu': 'openjdk-8-jre-headless',
   'ubuntu1404': 'oracle-java8-installer',

ansible/roles/jenkins-worker/meta/main.yml

@@ -2,7 +2,3 @@
 
 #
 # this role depends on java-base
-#
-
-dependencies:
-- { 'role': 'gcc', when: os|startswith("rhel7") }

ansible/roles/jenkins-worker/tasks/main.yml

@@ -28,63 +28,13 @@
   when: not os|startswith("zos")
   group: name="{{ server_user }}"
 
-- name: User | create file system on larger disk
-  filesystem:
-    fstype: ext4
-    dev: "{{ additional_drive }}"
-  when: "'rhel72-s390x' in inventory_hostname"
-
-- name: User | ensure larger disk is mounted
-  mount:
-    name: /data
-    src: "{{ additional_drive }}"
-    fstype: ext4
-    state: mounted
-  when: "'rhel72-s390x' in inventory_hostname"
-
 - name: create user
-  when: "not os|startswith('zos') and not 'rhel72-s390x' in inventory_hostname"
+  when: "not os|startswith('zos')"
   user:
     name: "{{ server_user }}"
     group: "{{ server_user }}"
     shell: "{{ bash_path[os|stripversion]|default('/bin/bash') }}"
 
-- name: create user for rhel72-s390x
-  user:
-    name: "{{ server_user }}"
-    group: "{{ server_user }}"
-    home: "/data/{{server_user }}"
-    shell: "{{ bash_path[os|stripversion]|default('/bin/bash') }}"
-  when: "'rhel72-s390x' in inventory_hostname"
-
-- name: create symbolic link for home directory on rhel72-s390x
-  file:
-    src: "/data/{{ server_user }}"
-    dest: "/home/{{ server_user }}"
-    state: link
-  when: "'rhel72-s390x' in inventory_hostname"
-
-# devtools6_s390x_src should be defined in the host_vars file to be one of
-# current hosts that has set RPMs already (in /data/devtoolset-6-s390x-rpms/).
-# Example:
-#   devtools6_s390x_src: test-linuxonecc-rhel72-s390x-1
-- name: copy devtools-6 to control host
-  local_action: command rsync -ar {{ devtools6_s390x_src }}:/data/devtoolset-6-s390x-rpms/ /tmp/devtoolset-6-s390x-rpms/
-  when: "'rhel72-s390x' in inventory_hostname"
-
-- name: copy devtools-6 to remote host
-  synchronize:
-    src: /tmp/devtoolset-6-s390x-rpms/
-    dest: /data/devtoolset-6-s390x-rpms/
-    recursive: true
-  when: "'rhel72-s390x' in inventory_hostname"
-
-- name: install devtools-6 on remote host
-  shell: yum install -y /data/devtoolset-6-s390x-rpms/*
-  async: 3600
-  poll: 10
-  when: "'rhel72-s390x' in inventory_hostname"
-
 - name: add ::1 to /etc/hosts for ipv6 compat
   when: not os|startswith("zos")
   lineinfile:
@@ -123,31 +73,6 @@
         - "{{ role_path }}/tasks/partials/tap2junit/pip.yml"
       skip: true
 
-- name: Firewall | add rule to allow accepting multicast
-  lineinfile:
-    dest: /etc/sysconfig/iptables
-    insertafter: ":OUTPUT ACCEPT.*]"
-    line: "-A INPUT -m pkttype --pkt-type multicast -j ACCEPT"
-  when: "'rhel72-s390x' in inventory_hostname"
-
-- name: Firewall | add basic rule to allow communication locally
-  lineinfile:
-    dest: /etc/sysconfig/iptables
-    insertafter: ":OUTPUT ACCEPT.*]"
-    line: "-A INPUT -s 127.0.0.1/32 -d 127.0.0.1/32 -j ACCEPT"
-  when: "'rhel72-s390x' in inventory_hostname"
-
-- name: Firewall | add additional rule to allow communication from 127.0.0.2
-  lineinfile:
-    dest: /etc/sysconfig/iptables
-    insertafter: ":OUTPUT ACCEPT.*]"
-    line: "-A INPUT -s 127.0.0.2/32 -d 127.0.0.1/32 -j ACCEPT"
-  when: "'rhel72-s390x' in inventory_hostname"
-
-- name: Firewall | make the new firewall rules take effect
-  command: systemctl restart iptables
-  when: "'rhel72-s390x' in inventory_hostname"
-
 - name: download slave.jar
   when: not os|startswith("zos")
   get_url:

ansible/roles/jenkins-worker/tasks/partials/tap2junit/rhel72.yml renamed to ansible/roles/jenkins-worker/tasks/partials/tap2junit/rhel7.yml

@@ -1,7 +1,7 @@
 ---
 
 #
-# rhel72: python2.7 is default
+# rhel7: python2.7 is default
 #
 
 - name: install required packages

ansible/roles/jenkins-worker/vars/main.yml

@@ -10,7 +10,7 @@ init: {
   debian: 'debian7',
   freebsd: 'freebsd',
   macos: 'macos',
-  rhel72: 'rhel72',
+  rhel7: 'rhel7',
   systemd: ['centos7', 'debian8', 'debian9', 'debian10', 'fedora', 'ubuntu1604', 'ubuntu1804'],
   svc: 'smartos',
   upstart: ['ubuntu12', 'ubuntu1404'],
@@ -48,7 +48,7 @@ jenkins_init: {
     src: 'openrc.initd.j2',
     mode: '0755'
     },
-  rhel72: {
+  rhel7: {
     dest: '/usr/lib/systemd/system/jenkins.service',
     src: 'systemd.service.j2',
     mode: '0644'

ansible/roles/package-upgrade/vars/main.yml

@@ -5,7 +5,7 @@
 #
 
   pm: {
-    'yum': ['centos', 'rhel72', 'aix'],
+    'yum': ['centos', 'rhel7', 'aix'],
     'apt': ['debian', 'ubuntu'],
     'dnf': 'fedora',
     'pkg': 'freebsd',

doc/node-test-commit-matrix.md

@@ -112,7 +112,7 @@ This is assumed correct as of the date of last commit. If you notice a discrepan
     - debian9-docker-armv7 (Node >= 10)
     - ubuntu1604-arm64 
   - **node-test-commit-linuxone**
-    - rhel72-s390x (Node >= 6)
+    - rhel7-s390x (Node >= 6)
   - **node-test-commit-aix**
     - aix61-ppc64 (Node >= 6)
   - **node-test-commit-arm-fanned**

doc/non-ansible-configuration-notes.md

@@ -150,6 +150,8 @@ An NFS root server can be separate from NFS boot server, and could be different
 * The ext4 partition of the Raspbian image file (second partition, not the boot FAT partition) should be extracted into this root directory.
 * `etc/fstab` in the root directory should be edited to make it NFS compatible. Remove the existing `/boot` and `/` entries and replace them with:
 
+```
+
 ```
 /dev/mmcblk0p1 /mnt/mmcblk0p1 vfat defaults 0 0
 NFS_ROOT_SERVER_IP:PATH_TO_SHARED_CCACHE_DIRECTORY /home/iojs/.ccache nfs4 rw,exec,async,noauto 0 0
@@ -279,6 +281,30 @@ Notes:
 	```
 
 
+## rhel7-s390x
+
+### devtoolset-6 install
+
+First copy the rpms from a machine that already has them
+
+```
+scp -r test-ibm-rhel7-s390x-1:/data/devtoolset-6-s390x-rpms/ ~/devtoolset-6-s390x-rpms
+```
+
+Then copy them over to the target machine
+
+```
+scp -r ~/devtoolset-6-s390x-rpms {target host}:~/devtoolset-6-s390x-rpms/
+```
+
+Then install the rpms
+
+```
+yum install -y devtoolset-6-s390x-rpms/*
+```
+
+
+
 [`ansible.intro_windows`]: http://docs.ansible.com/ansible/intro_windows.html
 [newer Ansible configuration]: https://github.com/nodejs/build/tree/master/ansible
 [stand-alone]: https://github.com/nodejs/build/tree/master/setup/windows

jenkins/pipelines/llnode-pipeline.jenkinsfile

@@ -7,7 +7,7 @@ properties([
     string(name: 'NODE_VERSIONS', defaultValue: 'v6 v8 v9 v10 nightly canary', description: 'Space separated list of NODE_VERSIONS to pass to llnode-continuous-integration.'),
     string(name: 'LLDB_VERSIONS', defaultValue: '3.9 4.0 5.0 6.0', description: 'Space separated list of LLDB_VERSIONS to pass to llnode-continuous-integration.'),
     string(name: 'MACHINES', defaultValue: 'all', description: '''Can be "all" or a space-separated list of nodes, eg:
-      debian8-64 fedora22 fedora23 osx1010 ppcle-ubuntu1404 ubuntu1204-64 ubuntu1404-64 ubuntu1604-64 rhel72-s390x aix61-ppc64 ppcbe-ubuntu1404 smartos16-64 smartos15-64 win10 win2012r2'''),
+      debian8-64 fedora22 fedora23 osx1010 ppcle-ubuntu1404 ubuntu1204-64 ubuntu1404-64 ubuntu1604-64 rhel7-s390x aix61-ppc64 ppcbe-ubuntu1404 smartos16-64 smartos15-64 win10 win2012r2'''),
   ]),
 ])
 

tools/build-p-ssh-hosts.sh

@@ -25,7 +25,7 @@ grep -- 'digitalocean' hosts/all > hosts/digitalocean
 grep -- 'infra-' hosts/all > hosts/infra
 grep -- 'joyent' hosts/all > hosts/joyent
 grep -- 'release-' hosts/all > hosts/release
-grep -- 'rhel72-s390x' hosts/all > hosts/rhel72-s390x
+grep -- 'rhel7-s390x' hosts/all > hosts/rhel7-s390x
 grep -- 'smartos' hosts/all > hosts/smartos
 grep -- 'softlayer' hosts/all > hosts/softlayer
 grep -- 'test-' hosts/all > hosts/test