Merge pull request #376 from sdarwin/molecule

Fix CircleCI

Author: SuperQ

.circleci/config.yml

@@ -31,19 +31,25 @@ jobs:
       - run: ln -s ~/project ~/${CIRCLE_PROJECT_REPONAME}
       - run: pip install "ansible~=<<parameters.ansible >>.0"
       - run: pip install -r test-requirements.txt
-      - run: molecule test -s default --destroy always
-      - run: |
-         if [[ -d 'molecule/alternative' ]]; then
-           molecule test -s alternative --destroy always
-         else
-           echo 'No alternative test'
-         fi
-      - run: |
-         if [[ -z "${CIRCLE_PULL_REQUEST}" ]] && [[ -d 'molecule/latest' ]]; then
-           molecule test -s latest --destroy always
-         else
-           echo 'Not running latest on PR'
-         fi
+      - run:
+          no_output_timeout: 60m
+          command: molecule test -s default --destroy always
+      - run:
+          no_output_timeout: 60m
+          command: |
+            if [[ -d 'molecule/alternative' ]]; then
+              molecule test -s alternative --destroy always
+            else
+              echo 'No alternative test'
+            fi
+      - run:
+          no_output_timeout: 60m
+          command: |
+            if [[ -z "${CIRCLE_PULL_REQUEST}" ]] && [[ -d 'molecule/latest' ]]; then
+              molecule test -s latest --destroy always
+            else
+              echo 'Not running latest on PR'
+            fi
   release:
     executor: publisher
     steps:

molecule/alternative/playbook.yml

@@ -3,7 +3,7 @@
   hosts: all
   any_errors_fatal: true
   roles:
-    - ansible-prometheus
+    - cloudalchemy.prometheus
   vars:
     prometheus_binary_local_dir: '/tmp/prometheus-linux-amd64'
     prometheus_config_dir: /opt/prom/etc

molecule/default/playbook.yml

@@ -3,4 +3,4 @@
   hosts: all
   any_errors_fatal: true
   roles:
-    - ansible-prometheus
+    - cloudalchemy.prometheus

molecule/latest/playbook.yml

@@ -3,6 +3,6 @@
   hosts: all
   any_errors_fatal: true
   roles:
-    - ansible-prometheus
+    - cloudalchemy.prometheus
   vars:
     prometheus_version: latest