Merge branch 'release/3.4.0'

pantarei · Sep 18, 2019 · daa55a1 · daa55a1
2 parents 67124d6 + dfa146d
commit daa55a1
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 40 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -36,7 +36,14 @@ install:
     ln -s $TRAVIS_BUILD_DIR $HOME/.ansible/roles/$ROLE
 
 script:
-  - travis_wait 120 sudo ./scripts/run-tests.sh molecule test -s $MOLECULE_SCENARIO_NAME
+  - |
+    source ./scripts/run-tests.sh \
+      && sudo -E molecule dependency -s $MOLECULE_SCENARIO_NAME \
+      && sudo -E molecule lint -s $MOLECULE_SCENARIO_NAME \
+      && sudo -E molecule syntax -s $MOLECULE_SCENARIO_NAME \
+      && sudo -E molecule converge -s $MOLECULE_SCENARIO_NAME \
+      && travis_wait 120 sudo -E molecule idempotence -s $MOLECULE_SCENARIO_NAME \
+      && sudo -E molecule verify -s $MOLECULE_SCENARIO_NAME
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,15 @@
 # Ansible Role for Snapd
 
-## 3.4.0 - TBC
+## 3.5.0 - TBC
 
 ### Major Changes
 
+## 3.4.0 - 2019-09-18
+
+### Major Changes
+
+  - Run molecule test manually on Travis CI
+
 ## 3.3.0 - 2019-08-27
 
 ### Major Changes

diff --git a/vars/centos-7.yml b/vars/centos-7.yml
@@ -14,11 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-_yum_repository: [
-  { state: "latest", name: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" },
-]
-_yum: [
-  { state: "latest", name: "fuse" },
-  { state: "latest", name: "squashfuse" },
-  { state: "latest", name: "snapd" },
-]
+_yum_repository:
+  - { state: "latest", name: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" }
+
+_yum:
+  - { state: "latest", name: "fuse" }
+  - { state: "latest", name: "squashfuse" }
+  - { state: "latest", name: "snapd" }
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
@@ -14,11 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-_yum_repository: [
-  { state: "latest", name: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" },
-]
-_yum: [
-  { state: "latest", name: "fuse" },
-  { state: "latest", name: "squashfuse" },
-  { state: "latest", name: "snapd" },
-]
+_yum_repository:
+  - { state: "latest", name: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" }
+
+_yum:
+  - { state: "latest", name: "fuse" }
+  - { state: "latest", name: "squashfuse" }
+  - { state: "latest", name: "snapd" }
diff --git a/vars/suse-15.yml b/vars/suse-15.yml
@@ -14,15 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-_zypper_repository: [
-  {
-    name: "system:snappy",
-    repo: "https://download.opensuse.org/repositories/system:/snappy/openSUSE_Leap_15.0",
-    state: "present",
-  },
-]
-_zypper: [
-  { state: "latest", name: "fuse" },
-  { state: "latest", name: "squashfs" },
-  { state: "latest", name: "snapd" },
-]
+_zypper_repository:
+  - name: "system:snappy"
+    repo: "https://download.opensuse.org/repositories/system:/snappy/openSUSE_Leap_15.0"
+    state: "present"
+
+_zypper:
+  - { state: "latest", name: "fuse" }
+  - { state: "latest", name: "squashfs" }
+  - { state: "latest", name: "snapd" }
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
@@ -14,8 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-_apt: [
-  { state: "latest", name: "fuse" },
-  { state: "latest", name: "squashfuse" },
-  { state: "latest", name: "snapd" },
-]
+_apt:
+  - { state: "latest", name: "fuse" }
+  - { state: "latest", name: "squashfuse" }
+  - { state: "latest", name: "snapd" }
diff --git a/vars/ubuntu-18.04.yml b/vars/ubuntu-18.04.yml
@@ -14,8 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-_apt: [
-  { state: "latest", name: "fuse" },
-  { state: "latest", name: "squashfuse" },
-  { state: "latest", name: "snapd" },
-]
+_apt:
+  - { state: "latest", name: "fuse" }
+  - { state: "latest", name: "squashfuse" }
+  - { state: "latest", name: "snapd" }