imfreedom/teamcity-ansible

finally handle the different versions of java that we're dealing with on freebsd
draft
2020-07-24, Gary Kramlich
11a557dd274d
Parents 5d23849dfba5
Children 914a6de331b9
finally handle the different versions of java that we're dealing with on freebsd
3 files changed, 4 insertions(+), 4 deletions(-)
  • +1 -1
    hosts/rekkanoryo-beastie-aarch64
  • +1 -1
    roles/teamcity/defaults/main.yml
  • +2 -2
    roles/teamcity/tasks/freebsd.yml
    • --- a/hosts/rekkanoryo-beastie-aarch64 Thu Jul 23 02:02:35 2020 -0500
    +++ b/hosts/rekkanoryo-beastie-aarch64 Fri Jul 24 04:30:13 2020 -0500
    @@ -1,2 +1,2 @@
    [simple]
    -rekkanoryo-beastie-aarch64 ansible_host=beastie-aarch64 teamcity_agent_name='rekkanoryo-beastie-aarch64' teamcity_home=/srv/teamcity/
    +rekkanoryo-beastie-aarch64 ansible_host=beastie-aarch64 teamcity_agent_name='rekkanoryo-beastie-aarch64' teamcity_home=/srv/teamcity/ teamcity_jdk_version=openjdk8
    --- a/roles/teamcity/defaults/main.yml Thu Jul 23 02:02:35 2020 -0500
    +++ b/roles/teamcity/defaults/main.yml Fri Jul 24 04:30:13 2020 -0500
    @@ -6,4 +6,4 @@
    teamcity_home: /var/lib/teamcity/
    teamcity_properties: []
    teamcity_authorization_token:
    -
    +teamcity_jdk_version: openjdk11
    --- a/roles/teamcity/tasks/freebsd.yml Thu Jul 23 02:02:35 2020 -0500
    +++ b/roles/teamcity/tasks/freebsd.yml Fri Jul 24 04:30:13 2020 -0500
    @@ -27,10 +27,10 @@
    PATH="$PATH:/usr/local/bin"
    pidfile="{{teamcity_agent_home}}logs/buildAgent.pid"
    - procname="/usr/local/openjdk11/bin/java"
    + procname="/usr/local/{{teamcity_jdk_version}}/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"
    + command_args="-S -f -p ${pidfile} /usr/bin/env ${teamcity_agent_env} ${procname} -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'