Merge branch 'release/4.7.9'

.gitlab-ci.yml

@@ -14,19 +14,22 @@
 .script-bootstrap-vagrant: &script-bootstrap-vagrant
   - |
     if ! [[ -x "$(command -v vagrant)" ]]; then
-      curl -skL -O https://releases.hashicorp.com/vagrant/2.2.16/vagrant_2.2.16_x86_64.deb
-      sudo dpkg -i vagrant_2.2.16_x86_64.deb
-      rm -rf vagrant_2.2.16_*
+      export DEBIAN_FRONTEND=noninteractive
+      curl -skL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -
+      sudo add-apt-repository -y "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
+      sudo -E apt-get update
+      sudo -E apt-get install -y vagrant
     fi
     sh -x -c "vagrant --version"
-    vagrant cloud auth login --token $VAGRANT_CLOUD_TOKEN
 
 .script-bootstrap-libvirt: &script-bootstrap-libvirt
   - |
     if ! [[ -x "$(command -v qemu-system-x86_64)" ]]; then
       export DEBIAN_FRONTEND=noninteractive
+      curl -skL "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xE996735927E427A733BB653E374C7797FB006459" | sudo apt-key add -
+      sudo add-apt-repository -y "deb http://ppa.launchpad.net/savoury1/virtualisation/ubuntu $(lsb_release -cs) main"
       sudo -E apt-get update
-      sudo -E apt-get install -y binutils bridge-utils dnsmasq-base ebtables gcc libguestfs-tools libvirt-clients libvirt-daemon-system libvirt-dev make qemu-system qemu-utils ruby-dev
+      sudo -E apt-get install -y binutils bridge-utils dnsmasq-base ebtables gcc libarchive-tools libguestfs-tools libvirt-clients libvirt-daemon-system libvirt-dev make qemu-system qemu-utils ruby-dev virt-manager
     fi
     sudo systemctl start libvirtd.service
     sh -x -c "qemu-system-x86_64 --version"
@@ -56,7 +59,7 @@
 .script-bootstrap-ansible: &script-bootstrap-ansible
   - |
     if ! [[ -x "$(command -v ansible)" ]]; then
-      sudo -E pipx install --force --pip-args='--upgrade' --include-deps 'ansible>=2.10.3,<2.11.0'
+      sudo -E pipx install --force --pip-args='--upgrade' --include-deps 'ansible>=4.0.0,<5.0.0'
       sudo -E pipx inject --force --pip-args='--upgrade' --include-apps ansible ansible-lint
       sudo -E pipx inject --force --pip-args='--upgrade' ansible docker netaddr python-vagrant
     fi

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Major Changes
 
+  - Upgrade minimal Ansible support to 4.0.0
   - Remove MySQL JDBC support
   - Support Fedora 34
   - Support Ubuntu 21.04

README.md

@@ -9,7 +9,7 @@ Ansible Role for Atlassian Bamboo Installation.
 
 ## Requirements
 
-This role require Ansible 2.10 or higher.
+This role require Ansible 4.0 or higher.
 
 This role was designed for:
 

ansible-galaxy-requirements.yml

@@ -17,7 +17,7 @@
 collections:
   - name: community.general
     src: https://galaxy.ansible.com
-    version: ">=2.0.0,<3.0.0"
+    version: ">=3.0.0,<4.0.0"
 
   - name: community.kubernetes
     src: https://galaxy.ansible.com

defaults/main.yml

@@ -14,8 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Bamboo release.
+bamboo_release: "7.2"
+
 # Bamboo version.
-bamboo_version: "7.2.4"
+bamboo_version: "{{ _bamboo_version[bamboo_release] }}"
 
 # Bamboo download details.
 bamboo_download: "{{ _bamboo_download[bamboo_version] }}"

meta/main.yml

@@ -21,7 +21,7 @@ galaxy_info:
   description: Ansible Role for Atlassian Bamboo Installation
   company: PantaRei Design
   license: Apache-2.0
-  min_ansible_version: "2.10"
+  min_ansible_version: "4.0"
   platforms:
     - name: Ubuntu
       versions:

requirements.txt

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ansible>=2.10.3,<2.11.0
+ansible>=4.0.0,<5.0.0
 ansible-lint
 ansible-runner
 ansible-runner-http

scripts/bootstrap-ansible.sh

@@ -48,7 +48,7 @@ export PIPX_HOME=/usr/local/share/pipx
 export PIPX_BIN_DIR=/usr/local/bin
 pipx install --force --pip-args='--upgrade' flake8
 pipx install --force --pip-args='--upgrade' yamllint
-pipx install --force --pip-args='--upgrade' --include-deps 'ansible>=2.10.3,<2.11.0'
+pipx install --force --pip-args='--upgrade' --include-deps 'ansible>=4.0.0,<5.0.0'
 pipx inject --force --pip-args='--upgrade' --include-apps ansible ansible-lint
 pipx inject --force --pip-args='--upgrade' ansible docker netaddr python-vagrant
 

tasks/main.yml

@@ -76,7 +76,6 @@
     state: "{{ item.state | default('directory') }}"
   loop:
     - { dest: "/lib/systemd/system" }
-    - { dest: "/lib/systemd/system/bamboo.service.d" }
     - dest: "{{ bamboo_catalina }}"
       owner: "{{ bamboo_owner }}"
       group: "{{ bamboo_group }}"

templates/lib/systemd/system/bamboo.service.j2

@@ -2,8 +2,8 @@
 
 [Unit]
 Description=Atlassian Bamboo
-After=network-online.target local-fs.target remote-fs.target time-sync.target
-Wants=network-online.target local-fs.target remote-fs.target time-sync.target
+After=multi-user.target
+Wants=multi-user.target
 
 [Service]
 Type=forking

vars/main.yml

@@ -14,6 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+_bamboo_version:
+  "7.2": "7.2.4"
+  "7.1": "7.1.4"
+
 _bamboo_download:
   "7.2.4":
     url: "http://product-downloads.atlassian.com/software/bamboo/downloads/atlassian-bamboo-7.2.4.tar.gz"