imfreedom/teamcity-ansible

A bunch of updates. I added two new FreeBSD 12.1 build agent VM's, two new
draft
2020-11-02, John Bailey
8f95413a753b
Parents 60e274eb7a72
Children 9a51f8300f84
A bunch of updates. I added two new FreeBSD 12.1 build agent VM's, two new
OpenBSD 6.8 build agent VM's, and removed two outdated build agents I ran.
Also did a bunch of work to get the teamcity agent to run via init script
on OpenBSD.
11 files changed, 58 insertions(+), 30 deletions(-)
  • +0 -2
    hosts/rekkanoryo-beastie-32
  • +2 -0
    hosts/rekkanoryo-beastie64
  • +0 -3
    hosts/rekkanoryo-puffy
  • +3 -0
    hosts/rekkanoryo-puffy32
  • +3 -0
    hosts/rekkanoryo-puffy64
  • +1 -1
    roles/openjdk/tasks/openbsd.yml
  • +1 -1
    roles/pidgin2-dependencies/tasks/openbsd.yml
  • +1 -1
    roles/pidgin3-dependencies/tasks/openbsd.yml
  • +1 -1
    roles/teamcity/tasks/dependencies.yml
  • +34 -21
    roles/teamcity/tasks/openbsd.yml
  • +12 -0
    roles/teamcity/tasks/user.yml
    • --- a/hosts/rekkanoryo-beastie-32 Sun Oct 25 16:21:16 2020 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,2 +0,0 @@
    -[simple]
    -rekkanoryo-beastie-32 ansible_host=beastie-32 teamcity_agent_name='rekkanoryo-beastie-32' teamcity_home=/srv/teamcity/
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/hosts/rekkanoryo-beastie64 Mon Nov 02 21:14:24 2020 -0500
    @@ -0,0 +1,2 @@
    +[simple]
    +rekkanoryo-beastie-64 ansible_host=beastie64 teamcity_agent_name='rekkanoryo-beastie64' teamcity_home=/srv/teamcity/
    --- a/hosts/rekkanoryo-puffy Sun Oct 25 16:21:16 2020 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,3 +0,0 @@
    -[simple]
    -rekkanoryo-puffy ansible_host=puffy teamcity_agent_name='rekkanoryo-puffy' teamcity_home=/home/teamcity/
    -
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/hosts/rekkanoryo-puffy32 Mon Nov 02 21:14:24 2020 -0500
    @@ -0,0 +1,3 @@
    +[simple]
    +rekkanoryo-puffy32 ansible_host=puffy32 teamcity_agent_name='rekkanoryo-puffy32' teamcity_home=/home/teamcity/
    +
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/hosts/rekkanoryo-puffy64 Mon Nov 02 21:14:24 2020 -0500
    @@ -0,0 +1,3 @@
    +[simple]
    +rekkanoryo-puffy64 ansible_host=puffy64 teamcity_agent_name='rekkanoryo-puffy64' teamcity_home=/home/teamcity/
    +
    --- a/roles/openjdk/tasks/openbsd.yml Sun Oct 25 16:21:16 2020 -0500
    +++ b/roles/openjdk/tasks/openbsd.yml Mon Nov 02 21:14:24 2020 -0500
    @@ -1,4 +1,4 @@
    - name: install dependencies
    openbsd_pkg:
    - name: jdk-1.8.0.222.b10.1v0
    + name: jdk-11.0.8.10.1v0
    state: present
    --- a/roles/pidgin2-dependencies/tasks/openbsd.yml Sun Oct 25 16:21:16 2020 -0500
    +++ b/roles/pidgin2-dependencies/tasks/openbsd.yml Mon Nov 02 21:14:24 2020 -0500
    @@ -17,6 +17,6 @@
    - pkgconf
    - py-gobject3-common
    - py3-gobject3
    - - python-3.7.4
    + - python-3.7.9p0
    - vala
    state: present
    --- a/roles/pidgin3-dependencies/tasks/openbsd.yml Sun Oct 25 16:21:16 2020 -0500
    +++ b/roles/pidgin3-dependencies/tasks/openbsd.yml Mon Nov 02 21:14:24 2020 -0500
    @@ -17,6 +17,6 @@
    - pkgconf
    - py-gobject3-common
    - py3-gobject3
    - - python-3.7.4
    + - python-3.7.9p0
    - vala
    state: present
    --- a/roles/teamcity/tasks/dependencies.yml Sun Oct 25 16:21:16 2020 -0500
    +++ b/roles/teamcity/tasks/dependencies.yml Mon Nov 02 21:14:24 2020 -0500
    @@ -16,7 +16,7 @@
    when: ansible_system == "FreeBSD"
    - name: install openbsd dependencies
    openbsd_pkg:
    - name: unzip-6.0p12
    + name: unzip-6.0p13
    state: present
    when: ansible_system == "OpenBSD"
    --- a/roles/teamcity/tasks/openbsd.yml Sun Oct 25 16:21:16 2020 -0500
    +++ b/roles/teamcity/tasks/openbsd.yml Mon Nov 02 21:14:24 2020 -0500
    @@ -4,37 +4,50 @@
    path: /etc/rc.d/teamcity-agent
    state: absent
    +- name: delete old run script
    + file:
    + path: "{{teamcity_agent_home}}/run_agent.sh"
    + state: absent
    +
    +- name: install run script
    + copy:
    + dest: "{{teamcity_agent_home}}/run_agent.sh"
    + content: |
    + #!/bin/sh
    + # Wrapper script to get teamcity agent to run
    + export JAVA_HOME="/usr/local/jdk-11"
    + shift 0
    + {{teamcity_agent_home}}/bin/agent.sh "${@}"
    + mode: '0555'
    +
    - name: install init script
    copy:
    dest: /etc/rc.d/teamcity_agent
    content: |
    #!/bin/sh
    -
    - # PROVIDE: teamcity-agent
    - # REQUIRE: DAEMON
    + daemon="{{teamcity_agent_home}}/run_agent.sh"
    + deamon_user="teamcity"
    . /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}}"}
    + rc_usercheck=YES
    - JAVA_HOME=/usr/local/jdk-1.8.0
    + rc_start() {
    + su ${daemon_user} -c "${daemon} start"
    + }
    + rc_stop() {
    + su ${daemon_user} -c "${daemon} stop"
    + }
    + rc_restart() {
    + su ${daemon_user} -c "${daemon} stop"
    + sleep 5
    + su ${daemon_user} -c "${daemon} start"
    + }
    + rc_reload() {
    + rc_restart()
    + }
    - 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"
    + rc_cmd $1
    mode: '0555'
    - name: restart agent
    --- a/roles/teamcity/tasks/user.yml Sun Oct 25 16:21:16 2020 -0500
    +++ b/roles/teamcity/tasks/user.yml Mon Nov 02 21:14:24 2020 -0500
    @@ -5,6 +5,18 @@
    system: yes
    - name: "create user: {{teamcity_user}}"
    + when: ansible_system == "OpenBSD"
    + user:
    + name: "{{teamcity_user}}"
    + shell: /bin/sh
    + group: "{{teamcity_group}}"
    + groups: "{{teamcity_groups}}"
    + system: yes
    + createhome: yes
    + home: "{{teamcity_home}}"
    +
    +- name: "create user: {{teamcity_user}}"
    + when: ansible_system != "OpenBSD"
    user:
    name: "{{teamcity_user}}"
    shell: /bin/false