Skip to content

Commit 2b17715

Browse files
sam-githubmhdawson
sam-github
authored and
mhdawson
committed
Machines updated: Update linux s390 gcc (#1735)
ansible: Machines updated: Update linux s390 gcc PR-URL: #1735 Reviewed-By: Michael Dawson <[email protected]>
1 parent 5e4ad40 commit 2b17715

10 files changed

Lines changed: 221 additions & 75 deletions

File tree

‎ansible/README.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,18 @@ If you only want to run a specific set of steps, you can use `--step`. This is
4343
useful when developing playbooks and when you want to be sure that only a few
4444
steps are executed, to avoid disrupting the machines.
4545

46+
You can't run any playbooks on a host until you've manually created a
47+
`build:ansible/host_vars/HOST` file for that host (same name as the argument
48+
to limit, above). Use `host_vars/test-marist-zos13-s390x-templat` as an
49+
example. The `secret:` doesn't have to be the real Jenkins secret until the
50+
worker actually has to connect to the master.
51+
52+
You may also need to copy the SSH ID files you are using while setting up a new
53+
host to the correct file name, for example:
54+
```console
55+
$ cp ~/.ssh/rhel72-s390x-3.pem /home/sam/.ssh/nodejs_build_test
56+
```
57+
4658
### Secrets
4759

4860
If you have access to secrets, clone the `secrets` repository [next to the

‎ansible/host_vars/test-marist-zos13-s390x-template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
secret:
1+
secret: JENKINS_SECRET
22
remote_env:
33
FFI_LIB: /NODEJS2/python-2017-04-12-py27/python27/lib/ffi
44
PYTHON_ENV: python27

‎ansible/inventory.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ hosts:
118118
- linuxonecc:
119119
rhel72-s390x-1: {ip: 148.100.110.63}
120120
rhel72-s390x-2: {ip: 148.100.110.64}
121-
rhel72-s390x-3: {ip: 148.100.110.12}
121+
rhel72-s390x-3: {ip: 148.100.110.153}
122122

123123
- mininodes:
124124
ubuntu1604-arm64_odroid_c2-1: {ip: 70.167.220.147}

‎ansible/playbooks/jenkins/worker/create.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,14 @@
2020
- jenkins-worker
2121

2222
pre_tasks:
23+
# Requires `secret: XXX` to be in the ansible/host_vars/HOST
24+
# file, where XXX is the jenkins secret used to connect to the master,
25+
# and HOST is the full ansible host name.
2326
- name: check if secret is properly set
2427
fail:
2528
failed_when: not secret
29+
# Requires `additional_drive: /dev/dasdb1` to be in the ansible/host_vars/HOST
30+
# file, where HOST is the full ansible host name.
2631
- name: check if additional_drive is properly set
2732
fail:
2833
failed_when: not additional_drive

‎ansible/roles/baselayout/tasks/ccache.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
#
66

77
- name: "ccache : fetch samba ccache HTML page"
8-
local_action: shell curl -sL https://www.samba.org/ftp/ccache/
8+
# This depends on ansible being able to run curl locally, YMMV, if it doesn't
9+
# work, try changing the local_action to a remote one:
10+
# raw: curl -sL https://www.samba.org/ftp/ccache/
11+
local_action: command shell -sL https://www.samba.org/ftp/ccache/
912
register: ccache_html_content
1013

1114
- name: "ccache : extract ccache latest version"

‎ansible/roles/baselayout/vars/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ packages: {
7171
],
7272

7373
rhel72: [
74-
'gcc-c++,sudo',
74+
'gcc-c++,sudo,git,zip,unzip',
7575
],
7676

7777
smartos: [

0 commit comments

Comments
 (0)