Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ansible/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,18 @@ If you only want to run a specific set of steps, you can use `--step`. This is
useful when developing playbooks and when you want to be sure that only a few
steps are executed, to avoid disrupting the machines.

You can't run any playbooks on a host until you've manually created a
`build:ansible/host_vars/HOST` file for that host (same name as the argument
to limit, above). Use `host_vars/test-marist-zos13-s390x-templat` as an
example. The `secret:` doesn't have to be the real Jenkins secret until the
worker actually has to connect to the master.

You may also need to copy the SSH ID files you are using while setting up a new
host to the correct file name, for example:
```console
$ cp ~/.ssh/rhel72-s390x-3.pem /home/sam/.ssh/nodejs_build_test
```

### Secrets

If you have access to secrets, clone the `secrets` repository [next to the
Expand Down
2 changes: 1 addition & 1 deletion ansible/host_vars/test-marist-zos13-s390x-template
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
secret:
secret: JENKINS_SECRET
remote_env:
FFI_LIB: /NODEJS2/python-2017-04-12-py27/python27/lib/ffi
PYTHON_ENV: python27
Expand Down
2 changes: 1 addition & 1 deletion ansible/inventory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ hosts:
- linuxonecc:
rhel72-s390x-1: {ip: 148.100.110.63}
rhel72-s390x-2: {ip: 148.100.110.64}
rhel72-s390x-3: {ip: 148.100.110.12}
rhel72-s390x-3: {ip: 148.100.110.153}

- mininodes:
ubuntu1604-arm64_odroid_c2-1: {ip: 70.167.220.147}
Expand Down
5 changes: 5 additions & 0 deletions ansible/playbooks/jenkins/worker/create.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,14 @@
- jenkins-worker

pre_tasks:
# Requires `secret: XXX` to be in the ansible/host_vars/HOST
# file, where XXX is the jenkins secret used to connect to the master,
# and HOST is the full ansible host name.
- 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
Expand Down
5 changes: 4 additions & 1 deletion ansible/roles/baselayout/tasks/ccache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
#

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

- name: "ccache : extract ccache latest version"
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/baselayout/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ packages: {
],

rhel72: [
'gcc-c++,sudo',
'gcc-c++,sudo,git,zip,unzip',
],

smartos: [
Expand Down
Loading