Merge branch 'release/4.3.0'

.travis.yml

@@ -17,7 +17,6 @@ env:
 
 jobs:
   allow_failures:
-    - env: MOLECULE_SCENARIO_NAME="ubuntu-20.04"
     - env: MOLECULE_SCENARIO_NAME="ubuntu-19.10"
     - env: MOLECULE_SCENARIO_NAME="centos-8"
     - env: MOLECULE_SCENARIO_NAME="centos-7"

defaults/main.yml

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Bamboo version.
-bamboo_version: "7.0.2"
+bamboo_version: "7.0.3"
 
 # Bamboo download details.
 bamboo_download: "{{ _bamboo_download[bamboo_version] }}"

handlers/main.yml

@@ -20,7 +20,7 @@
   changed_when: false
   ignore_errors: true
 
-- name: bamboo | systemctl restart
+- name: bamboo | systemctl restart bamboo
   service:
     name: "bamboo"
     state: "restarted"

molecule/default/Dockerfile.j2

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG   "en_US.utf8"
 ENV LC_ALL "en_US.utf8"

molecule/default/molecule.yml

@@ -24,7 +24,7 @@ platforms:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     entrypoint: init
     command: "bash -c 'sleep infinity'"
-    tty: True
+    tty: true
     env:
       container: docker
 lint: |

molecule/ubuntu-20.04/molecule.yml

@@ -15,18 +15,23 @@
 # limitations under the License.
 
 driver:
-  name: docker
+  name: vagrant
+  provider:
+    name: libvirt
 platforms:
   - name: ${MOLECULE_INSTANCE_NAME}-1
-    dockerfile: Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    entrypoint: init
-    command: "bash -c 'sleep infinity'"
-    tty: True
-    env:
-      container: docker
+    box: abi/ubuntu2004
+    cpu: 2
+    memory: 2048
+    interfaces:
+      - auto_config: true
+        network_name: private_network
+        type: dhcp
+    provider_raw_config_args:
+      - 'nic_model_type = "virtio"'
+      - 'disk_bus = "virtio"'
+      - 'volume_cache = "none"'
+      - 'storage :file, bus: "virtio", cache: "none"'
 lint: |
   set -ex
   yamllint .

tasks/main.yml

@@ -137,7 +137,7 @@
   when: get_url_result is changed
   notify:
     - bamboo | systemctl daemon-reload
-    - bamboo | systemctl restart
+    - bamboo | systemctl restart bamboo
   tags: bamboo
 
 - name: copy templates
@@ -160,7 +160,7 @@
       group: "{{ bamboo_group }}"
   notify:
     - bamboo | systemctl daemon-reload
-    - bamboo | systemctl restart
+    - bamboo | systemctl restart bamboo
   tags: bamboo
 
 - name: prepare files
@@ -181,15 +181,15 @@
       group: "{{ bamboo_group }}"
   tags: bamboo
 
-- name: flush handlers
-  meta: flush_handlers
-  tags: bamboo
-
-- name: start service
+- name: systemctl start bamboo
   service:
     name: "bamboo"
     state: "started"
     enabled: true
   changed_when: false
   ignore_errors: true
   tags: bamboo
+
+- name: flush handlers
+  meta: flush_handlers
+  tags: bamboo

vars/main.yml

@@ -15,6 +15,10 @@
 # limitations under the License.
 
 _bamboo_download:
+  7.0.3:
+    url: "https://product-downloads.atlassian.com/software/bamboo/downloads/atlassian-bamboo-7.0.3.tar.gz"
+    dest: "{{ ansible_user_dir }}/.ansible/tmp/atlassian-bamboo-7.0.3.tar.gz"
+    checksum: "sha1:836f2ecd247ac7a243c3490dae9e65c1095c44e4"
   7.0.2:
     url: "https://product-downloads.atlassian.com/software/bamboo/downloads/atlassian-bamboo-7.0.2.tar.gz"
     dest: "{{ ansible_user_dir }}/.ansible/tmp/atlassian-bamboo-7.0.2.tar.gz"