test: apt-proxy, fix molecule docker tags

viasite-ansible · Nov 18, 2017 · 64f7b31 · 64f7b31
1 parent 908c5b8
commit 64f7b31
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 29 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,8 +9,6 @@ before_install:
   - docker --version
 install:
   - pip install molecule docker
-before_script:
-  - export MOLECULE_APTPROXY_PATH="$PWD/00aptproxy" && touch "$MOLECULE_APTPROXY_PATH"
 script:
   - molecule test
 

diff --git a/molecule.yml b/molecule.yml
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -3,15 +3,10 @@ driver:
   name: docker
 platforms:
   - name: ansible-role-server-scripts-1604
-    image: ubuntu
-    image_version: 16.04
-    volume_mounts:
-      - ${MOLECULE_APTPROXY_PATH}:/etc/apt/apt.conf.d/00aptproxy
+    image: ubuntu:16.04
+
   - name: ansible-role-server-scripts-centos-7
-    image: centos
-    image_version: 7
-    volume_mounts:
-      - ${MOLECULE_APTPROXY_PATH}:/etc/apt/apt.conf.d/00aptproxy
+    image: centos:7
 
 lint:
   name: yamllint

diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
@@ -2,4 +2,9 @@
 - name: Prepare
   hosts: all
   gather_facts: False
-  tasks: []
+  tasks:
+    - name: apt-proxy
+      copy:
+        content: "Acquire::http::Proxy \"{{ lookup('env', 'APT_PROXY') }}\"; Acquire::https::Proxy \"false\";"
+        dest: /etc/apt/apt.conf.d/01proxy
+      failed_when: False