Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

Commit

Permalink
tests: update template to 1.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
duck-rh committed Sep 8, 2020
1 parent c55a09e commit 3614aad
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 13 deletions.
1 change: 1 addition & 0 deletions molecule/_resources/create-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
- item.registry.credentials.username is defined

- name: Create Dockerfiles from image names
# noqa 208
template:
src: "{{ item.dockerfile | default('Dockerfile.j2') }}"
dest: "{{ molecule_ephemeral_directory }}/Dockerfile_{{ item.image | regex_replace('[^a-zA-Z0-9_]', '_') }}"
Expand Down
2 changes: 1 addition & 1 deletion molecule/_resources/group_vars/all/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ docker_network_defaults:
# TODO: readd yum update when Docker cgroup bug is fixed
# TODO: btw why is there no dnf update while there's an equivalent in all other distros?
image_setup: |
if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y systemd-sysv python sudo bash ca-certificates && apt-get clean; \
if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y systemd-sysv python3 sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3 sudo python3-devel python3-dnf bash && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper update -y && zypper install -y python sudo bash python-xml && zypper clean -a; \
Expand Down
12 changes: 0 additions & 12 deletions molecule/_resources/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,6 @@
hosts: all
gather_facts: yes
tasks:
- name: "Display kernel version"
debug:
var: ansible_kernel_version
- name: "Display OS version #1"
slurp:
src: "{{ (ansible_os_family == 'Debian') | ternary('/etc/debian_version', '/etc/redhat-release') }}"
ignore_errors: True
changed_when: False
register: os_version
- name: "Display OS version #1"
debug:
msg: "{{ os_version['content'] | b64decode }}"
# to ensure having a real FQDN
# (dots are not allowed in LXD container names, thus sticking to short names)
- name: set proper hostname
Expand Down

0 comments on commit 3614aad

Please sign in to comment.