imfreedom/teamcity-ansible

Update roles to declare their dependencies
draft
2021-06-02, Gary Kramlich
2526cb817526
Parents f3c6c1e0ef9a
Children 597fa8502268
Update roles to declare their dependencies
7 files changed, 18 insertions(+), 17 deletions(-)
  • +1 -11
    agent.yml
  • +4 -0
    roles/convey/meta/main.yaml
  • +1 -1
    roles/openjdk/tasks/darwin.yml
  • +2 -2
    roles/openjdk/tasks/main.yml
  • +1 -1
    roles/pidgin2-dependencies/tasks/openbsd.yml
  • +7 -0
    roles/teamcity/meta/main.yaml
  • +2 -2
    roles/teamcity/tasks/systemd.yml
    • --- a/agent.yml Tue May 25 03:25:33 2021 -0500
    +++ b/agent.yml Wed Jun 02 01:11:06 2021 -0500
    @@ -3,27 +3,17 @@
    roles:
    - role: update
    - role: cron-apt
    - - role: qemu-user-static
    - - role: curl
    - - role: docker
    - role: convey
    convey_version: 0.13.1
    convey_sha256_checksum: c5f1d5c7d5da5ec61d325659e77e74a205f62929f2abca82b949c22164f2e5b6
    - - role: mercurial
    - - role: git
    - - role: meson
    - - role: openjdk
    - role: teamcity
    teamcity_server: https://ci.imfreedom.org/
    - hosts: simple
    roles:
    - role: update
    - role: cron-apt
    - - role: mercurial
    - - role: git
    - - role: meson
    - - role: openjdk
    - role: pidgin2-dependencies
    - role: pidgin3-dependencies
    - role: teamcity
    teamcity_server: https://ci.imfreedom.org/
    +
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/roles/convey/meta/main.yaml Wed Jun 02 01:11:06 2021 -0500
    @@ -0,0 +1,4 @@
    +dependencies:
    + - docker
    + - qemu-user-static
    +
    --- a/roles/openjdk/tasks/darwin.yml Tue May 25 03:25:33 2021 -0500
    +++ b/roles/openjdk/tasks/darwin.yml Wed Jun 02 01:11:06 2021 -0500
    @@ -5,7 +5,7 @@
    become: no
    - name: install dependencies
    - homebrew_cask:
    + homebrew:
    name: adoptopenjdk11
    state: present
    become: no
    --- a/roles/openjdk/tasks/main.yml Tue May 25 03:25:33 2021 -0500
    +++ b/roles/openjdk/tasks/main.yml Wed Jun 02 01:11:06 2021 -0500
    @@ -1,6 +1,6 @@
    ---
    -- include_tasks: darwin.yml
    - when: ansible_system == "Darwin"
    +#- include_tasks: darwin.yml
    +# when: ansible_system == "Darwin"
    - include_tasks: debian.yml
    when: ansible_facts['os_family'] == "Debian"
    - include_tasks: freebsd.yml
    --- a/roles/pidgin2-dependencies/tasks/openbsd.yml Tue May 25 03:25:33 2021 -0500
    +++ b/roles/pidgin2-dependencies/tasks/openbsd.yml Wed Jun 02 01:11:06 2021 -0500
    @@ -17,6 +17,6 @@
    - pkgconf
    - py-gobject3-common
    - py3-gobject3
    - - python-3.7.9p0
    + - python-3.7.10
    - vala
    state: present
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/roles/teamcity/meta/main.yaml Wed Jun 02 01:11:06 2021 -0500
    @@ -0,0 +1,7 @@
    +dependencies:
    + - curl
    + - git
    + - mercurial
    + - meson
    + - openjdk
    +
    --- a/roles/teamcity/tasks/systemd.yml Tue May 25 03:25:33 2021 -0500
    +++ b/roles/teamcity/tasks/systemd.yml Wed Jun 02 01:11:06 2021 -0500
    @@ -20,8 +20,8 @@
    After=network.target
    [Service]
    - Type=oneshot
    -
    + Type=simple
    + Restart=always
    User={{teamcity_user}}
    Group={{teamcity_group}}