imfreedom/teamcity-ansible

add a whole bunch of role updates that apparently i was really bad on updating
draft
2020-01-12, Gary Kramlich
dc1694eaf037
Parents 5742c7feddde
Children 65c704c5745f
add a whole bunch of role updates that apparently i was really bad on updating
19 files changed, 177 insertions(+), 14 deletions(-)
  • +2 -1
    roles/docker/tasks/darwin.yml
  • +3 -3
    roles/docker/tasks/main.yml
  • +6 -0
    roles/git/tasks/darwin.yml
  • +5 -0
    roles/git/tasks/main.yml
  • +4 -0
    roles/git/tasks/openbsd.yml
  • +7 -0
    roles/mercurial/tasks/darwin.yml
  • +5 -0
    roles/mercurial/tasks/main.yml
  • +6 -0
    roles/mercurial/tasks/openbsd.yml
  • +11 -0
    roles/openjdk/tasks/darwin.yml
  • +4 -0
    roles/openjdk/tasks/main.yml
  • +4 -0
    roles/openjdk/tasks/openbsd.yml
  • +2 -0
    roles/pidgin3-dependencies/tasks/main.yml
  • +22 -0
    roles/pidgin3-dependencies/tasks/openbsd.yml
  • +17 -9
    roles/teamcity/tasks/agent.yml
  • +7 -0
    roles/teamcity/tasks/darwin.yml
  • +3 -1
    roles/teamcity/tasks/freebsd.yml
  • +12 -0
    roles/teamcity/tasks/main.yml
  • +49 -0
    roles/teamcity/tasks/openbsd.yml
  • +8 -0
    roles/teamcity/tasks/vars.yml
    • --- a/roles/docker/tasks/darwin.yml Sun Jan 12 14:36:00 2020 -0600
    +++ b/roles/docker/tasks/darwin.yml Sun Jan 12 14:36:34 2020 -0600
    @@ -3,4 +3,5 @@
    homebrew_cask:
    name: docker
    state: present
    - when: ansible_system == "Darwin"
    + become: no
    +
    --- a/roles/docker/tasks/main.yml Sun Jan 12 14:36:00 2020 -0600
    +++ b/roles/docker/tasks/main.yml Sun Jan 12 14:36:34 2020 -0600
    @@ -1,9 +1,9 @@
    ---
    +- include_tasks: darwin.yml
    + when: ansible_system == "Darwin"
    +
    - include_tasks: debian.yml
    when: ansible_facts['os_family'] == "Debian"
    -- include_tasks: darwin.yml
    - when: ansible_system == "Darwin"
    -
    - include_tasks: freebsd.yml
    when: ansible_system == "FreeBSD"
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/roles/git/tasks/darwin.yml Sun Jan 12 14:36:34 2020 -0600
    @@ -0,0 +1,6 @@
    +- name: install dependencies
    + homebrew:
    + name: git
    + state: present
    + become: no
    +
    --- a/roles/git/tasks/main.yml Sun Jan 12 14:36:00 2020 -0600
    +++ b/roles/git/tasks/main.yml Sun Jan 12 14:36:34 2020 -0600
    @@ -1,5 +1,10 @@
    ---
    +- include_tasks: darwin.yml
    + when: ansible_system == "Darwin"
    - include_tasks: debian.yml
    when: ansible_facts['os_family'] == "Debian"
    - include_tasks: freebsd.yml
    when: ansible_system == "FreeBSD"
    +- include_tasks: openbsd.yml
    + when: ansible_system == "OpenBSD"
    +
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/roles/git/tasks/openbsd.yml Sun Jan 12 14:36:34 2020 -0600
    @@ -0,0 +1,4 @@
    +- name: install dependencies
    + openbsd_pkg:
    + name: git
    + state: present
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/roles/mercurial/tasks/darwin.yml Sun Jan 12 14:36:34 2020 -0600
    @@ -0,0 +1,7 @@
    +---
    +- name: install mercurial
    + homebrew:
    + name: mercurial
    + state: present
    + become: no
    +
    --- a/roles/mercurial/tasks/main.yml Sun Jan 12 14:36:00 2020 -0600
    +++ b/roles/mercurial/tasks/main.yml Sun Jan 12 14:36:34 2020 -0600
    @@ -1,5 +1,10 @@
    ---
    +- include_tasks: darwin.yml
    + when: ansible_facts['os_family'] == "Darwin"
    - include_tasks: debian.yml
    when: ansible_facts['os_family'] == "Debian"
    - include_tasks: freebsd.yml
    when: ansible_facts['os_family'] == "FreeBSD"
    +- include_tasks: openbsd.yml
    + when: ansible_facts['os_family'] == "OpenBSD"
    +
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/roles/mercurial/tasks/openbsd.yml Sun Jan 12 14:36:34 2020 -0600
    @@ -0,0 +1,6 @@
    +---
    +- name: install mercurial
    + openbsd_pkg:
    + name: mercurial
    + state: present
    +
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/roles/openjdk/tasks/darwin.yml Sun Jan 12 14:36:34 2020 -0600
    @@ -0,0 +1,11 @@
    +- name: add tap
    + homebrew_tap:
    + name: AdoptOpenJDK/openjdk
    + state: present
    + become: no
    +
    +- name: install dependencies
    + homebrew_cask:
    + name: adoptopenjdk11
    + state: present
    + become: no
    --- a/roles/openjdk/tasks/main.yml Sun Jan 12 14:36:00 2020 -0600
    +++ b/roles/openjdk/tasks/main.yml Sun Jan 12 14:36:34 2020 -0600
    @@ -1,5 +1,9 @@
    ---
    +- include_tasks: darwin.yml
    + when: ansible_system == "Darwin"
    - include_tasks: debian.yml
    when: ansible_facts['os_family'] == "Debian"
    - include_tasks: freebsd.yml
    when: ansible_system == "FreeBSD"
    +- include_tasks: openbsd.yml
    + when: ansible_system == "OpenBSD"
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/roles/openjdk/tasks/openbsd.yml Sun Jan 12 14:36:34 2020 -0600
    @@ -0,0 +1,4 @@
    +- name: install dependencies
    + openbsd_pkg:
    + name: jdk-1.8.0.222.b10.1v0
    + state: present
    --- a/roles/pidgin3-dependencies/tasks/main.yml Sun Jan 12 14:36:00 2020 -0600
    +++ b/roles/pidgin3-dependencies/tasks/main.yml Sun Jan 12 14:36:34 2020 -0600
    @@ -3,4 +3,6 @@
    when: ansible_facts['os_family'] == "Debian"
    - include_tasks: freebsd.yml
    when: ansible_system == "FreeBSD"
    +- include_tasks: openbsd.yml
    + when: ansible_system == "OpenBSD"
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/roles/pidgin3-dependencies/tasks/openbsd.yml Sun Jan 12 14:36:34 2020 -0600
    @@ -0,0 +1,22 @@
    +- name: install dependencies
    + openbsd_pkg:
    + name:
    + - cmark
    + - json-glib
    + - gettext-tools
    + - glib2
    + - gspell
    + - gtk+3
    + - gumbo
    + - help2man
    + - libidn
    + - libsoup
    + - lua-5.2.4p1
    + - lua52-lgi
    + - meson
    + - pkgconf
    + - py-gobject3-common
    + - py3-gobject3
    + - python-3.7.4
    + - vala
    + state: present
    --- a/roles/teamcity/tasks/agent.yml Sun Jan 12 14:36:00 2020 -0600
    +++ b/roles/teamcity/tasks/agent.yml Sun Jan 12 14:36:34 2020 -0600
    @@ -1,11 +1,4 @@
    ---
    -- name: set internal var for buildAgent.zip url
    - set_fact:
    - teamcity_build_agent_zip_url: "{{teamcity_server}}update/buildAgent.zip"
    -- name: set internal var for teamcity_agent_home
    - set_fact:
    - teamcity_agent_home: "{{teamcity_home}}tc/"
    -
    - name: "create directory {{teamcity_agent_home}}"
    file:
    name: "{{teamcity_agent_home}}"
    @@ -13,10 +6,25 @@
    owner: "{{teamcity_user}}"
    group: "{{teamcity_group}}"
    -- name: download and extract buildAgent.zip
    +# - name: download and extract buildAgent.zip
    +# unarchive:
    +# remote_src: yes
    +# src: "{{teamcity_build_agent_zip_url}}"
    +# dest: "{{teamcity_agent_home}}"
    +# owner: "{{teamcity_user}}"
    +# group: "{{teamcity_group}}"
    +
    +- name: download buildAgent.zip
    + get_url:
    + url: "{{teamcity_build_agent_zip_url}}"
    + dest: "{{teamcity_home}}buildAgent.zip"
    + owner: "{{teamcity_user}}"
    + group: "{{teamcity_group}}"
    +
    +- name: extract buildAgent.zip
    unarchive:
    remote_src: yes
    - src: "{{teamcity_build_agent_zip_url}}"
    + src: "{{teamcity_home}}buildAgent.zip"
    dest: "{{teamcity_agent_home}}"
    owner: "{{teamcity_user}}"
    group: "{{teamcity_group}}"
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/roles/teamcity/tasks/darwin.yml Sun Jan 12 14:36:34 2020 -0600
    @@ -0,0 +1,7 @@
    +---
    +- name: install ca-certificates
    + homebrew:
    + name: ca-certificates
    + state: present
    + become: no
    +
    --- a/roles/teamcity/tasks/freebsd.yml Sun Jan 12 14:36:00 2020 -0600
    +++ b/roles/teamcity/tasks/freebsd.yml Sun Jan 12 14:36:34 2020 -0600
    @@ -1,7 +1,9 @@
    ---
    - name: install dependencies
    pkgng:
    - name: unzip
    + name:
    + - unzip
    + - gtar
    state: present
    - name: delete old init script
    --- a/roles/teamcity/tasks/main.yml Sun Jan 12 14:36:00 2020 -0600
    +++ b/roles/teamcity/tasks/main.yml Sun Jan 12 14:36:34 2020 -0600
    @@ -4,13 +4,25 @@
    fail: msg="ERROR - required variable 'teamcity_server' missing"
    when: teamcity_server is not defined
    +- include_tasks: vars.yml
    +
    - include_tasks: user.yml
    + when: ansible_system != "Darwin"
    +
    - include_tasks: agent.yml
    +- include_tasks: darwin.yml
    + when: ansible_system == "Darwin"
    +
    - include_tasks: debian.yml
    when: ansible_facts['os_family'] == "Debian"
    +
    - include_tasks: systemd.yml
    when: ansible_system == "Linux"
    - include_tasks: freebsd.yml
    when: ansible_system == "FreeBSD"
    +
    +- include_tasks: openbsd.yml
    + when: ansible_system == "OpenBSD"
    +
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/roles/teamcity/tasks/openbsd.yml Sun Jan 12 14:36:34 2020 -0600
    @@ -0,0 +1,49 @@
    +---
    +- name: install dependencies
    + openbsd_pkg:
    + name: unzip-6.0p12
    + state: present
    +
    +- name: delete old init script
    + file:
    + path: /etc/rc.d/teamcity-agent
    + state: absent
    +
    +- name: install init script
    + copy:
    + dest: /etc/rc.d/teamcity_agent
    + content: |
    + #!/bin/sh
    +
    + # PROVIDE: teamcity-agent
    + # REQUIRE: DAEMON
    +
    + . /etc/rc.d/rc.subr
    +
    + name="teamcity_agent"
    + rcvar="teamcity_agent_enable"
    +
    + load_rc_config "${name}"
    +
    + : ${teamcity_agent_enable:="NO"}
    + : ${teamcity_agent_user:="{{teamcity_user}}"}
    + : ${teamcity_agent_group:="{{teamcity_group}}"}
    + : ${teamcity_agent_home:="{{teamcity_agent_home}}"}
    +
    + JAVA_HOME=/usr/local/jdk-1.8.0
    +
    + PATH="$PATH:/usr/local/bin"
    + pidfile="{{teamcity_agent_home}}logs/buildAgent.pid"
    + procname="/usr/local/openjdk11/bin/java"
    +
    + command="/usr/sbin/daemon"
    + command_args="-S -f -p ${pidfile} /usr/bin/env ${teamcity_agent_env} /usr/local/openjdk11/bin/java -ea -Xms16m -Xmx64m -cp ${teamcity_agent_home}/launcher/lib/launcher.jar jetbrains.buildServer.agent.Launcher -ea -Xmx384m -Dteamcity_logs=${teamcity_agent_home}/logs/ -Dlog4j.configuration=file:${teamcity_agent_home}/conf/teamcity-agent-log4j.xml jetbrains.buildServer.agent.AgentMain -file ${teamcity_agent_home}/conf/buildAgent.properties"
    +
    + run_rc_command "$1"
    + mode: '0555'
    +
    +- name: restart agent
    + service:
    + name: teamcity_agent
    + state: restarted
    + enabled: yes
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/roles/teamcity/tasks/vars.yml Sun Jan 12 14:36:34 2020 -0600
    @@ -0,0 +1,8 @@
    +---
    +- name: set internal var for buildAgent.zip url
    + set_fact:
    + teamcity_build_agent_zip_url: "{{teamcity_server}}update/buildAgent.zip"
    +- name: set internal var for teamcity_agent_home
    + set_fact:
    + teamcity_agent_home: "{{teamcity_home}}tc/"
    +