Merge branch 'release/4.2.5'

pantarei · Mar 9, 2020 · 8a17707 · 8a17707
2 parents b7c1e07 + c2d866e
commit 8a17707
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,6 +30,7 @@ before_install:
     sudo apt-get update && sudo apt-get install -y bridge-utils dnsmasq-base ebtables libvirt-bin libvirt-dev qemu-kvm qemu-utils ruby-dev
     sudo dpkg -i vagrant_2.2.7_x86_64.deb
     sudo vagrant plugin install vagrant-libvirt
+    rm -rf vagrant_2.2.7_*
 
   - |
     sudo apt-get -y purge python3-openssl && sudo apt-get -y autoremove

diff --git a/molecule/default/group_vars/all/00-defaults.yml b/molecule/default/group_vars/all/00-defaults.yml
diff --git a/molecule/default/group_vars/all/99-molecule.yml b/molecule/default/group_vars/all/99-molecule.yml
diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
@@ -21,30 +21,35 @@
   tasks:
     - name: cp -rfT /etc/skel /root
       raw: |
+        set -ex
         cp -rfT /etc/skel /root
       changed_when: false
       ignore_errors: true
 
     - name: setenforce 0
       raw: |
+        set -ex
         setenforce 0
       changed_when: false
       ignore_errors: true
 
     - name: systemctl stop firewalld.service
       raw: |
+        set -ex
         systemctl stop firewalld.service
       changed_when: false
       ignore_errors: true
 
     - name: systemctl stop ufw.service
       raw: |
+        set -ex
         systemctl stop ufw.service
       changed_when: false
       ignore_errors: true
 
     - name: redhat-7 | subscription-manager register
       raw: |
+        set -ex
         subscription-manager register \
           --username={{ lookup('env', 'REDHAT_USERNAME') }} \
           --password={{ lookup('env', 'REDHAT_PASSWORD') }} \
@@ -54,20 +59,23 @@
 
     - name: debian | apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo
       raw: |
+        set -ex
         apt-get update
         apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo
       changed_when: false
       ignore_errors: true
 
     - name: redhat | yum install -y ca-certificates curl gcc iproute python3 python3-devel sudo
       raw: |
+        set -ex
         yum makecache fast
         yum install -y ca-certificates curl gcc iproute python3 python3-devel sudo
       changed_when: false
       ignore_errors: true
 
     - name: suse | zypper -n install -y ca-certificates curl gcc iproute2 python3 python3-devel sudo
       raw: |
+        set -ex
         zypper -n --gpg-auto-import-keys refresh
         zypper -n install -y ca-certificates curl gcc iproute2 python3 python3-devel sudo
       changed_when: false