Merge branch 'release/4.3.0'

alvistack · Apr 22, 2020 · 862b0af · 862b0af
2 parents c896982 + 17ee5ca
commit 862b0af
Show file tree

Hide file tree

Showing 23 changed files with 148 additions and 184 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,6 @@ env:
 
 jobs:
   allow_failures:
-    - env: MOLECULE_SCENARIO_NAME="ubuntu-20.04"
     - env: MOLECULE_SCENARIO_NAME="ubuntu-19.10"
     - env: MOLECULE_SCENARIO_NAME="centos-8"
     - env: MOLECULE_SCENARIO_NAME="centos-7"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,7 +9,6 @@
   - Support Ubuntu 20.04
   - Remove Ubuntu 16.04 support
   - Upgrade minimal Molecule support to 3.0.2
-  - Install from pre-build archive
 
 ## 4.2.0 - 2020-02-22
 

diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml
@@ -17,3 +17,15 @@
 - name: python
   src: https://github.com/alvistack/ansible-role-python
   version: develop
+
+- name: git
+  src: https://github.com/alvistack/ansible-role-git
+  version: develop
+
+- name: golang
+  src: https://github.com/alvistack/ansible-role-golang
+  version: develop
+
+- name: runc
+  src: https://github.com/alvistack/ansible-role-runc
+  version: develop
diff --git a/molecule/default/Dockerfile.j2 b/molecule/default/Dockerfile.j2
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG   "en_US.utf8"
 ENV LC_ALL "en_US.utf8"

diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -21,5 +21,14 @@
     - include_role:
         name: python
 
+    - include_role:
+        name: git
+
+    - include_role:
+        name: golang
+
+    - include_role:
+        name: runc
+
     - include_role:
         name: conmon
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -24,7 +24,7 @@ platforms:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     entrypoint: init
     command: "bash -c 'sleep infinity'"
-    tty: True
+    tty: true
     env:
       container: docker
 lint: |

diff --git a/molecule/ubuntu-20.04/Dockerfile.j2 b/molecule/ubuntu-20.04/Dockerfile.j2
diff --git a/molecule/ubuntu-20.04/create.yml b/molecule/ubuntu-20.04/create.yml
diff --git a/molecule/ubuntu-20.04/destroy.yml b/molecule/ubuntu-20.04/destroy.yml
diff --git a/molecule/ubuntu-20.04/molecule.yml b/molecule/ubuntu-20.04/molecule.yml
@@ -15,18 +15,23 @@
 # limitations under the License.
 
 driver:
-  name: docker
+  name: vagrant
+  provider:
+    name: libvirt
 platforms:
   - name: ${MOLECULE_INSTANCE_NAME}-1
-    dockerfile: Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    entrypoint: init
-    command: "bash -c 'sleep infinity'"
-    tty: True
-    env:
-      container: docker
+    box: abi/ubuntu2004
+    cpu: 2
+    memory: 2048
+    interfaces:
+      - auto_config: true
+        network_name: private_network
+        type: dhcp
+    provider_raw_config_args:
+      - 'nic_model_type = "virtio"'
+      - 'disk_bus = "virtio"'
+      - 'volume_cache = "none"'
+      - 'storage :file, bus: "virtio", cache: "none"'
 lint: |
   set -ex
   yamllint .

diff --git a/tasks/debian.yml b/tasks/debian.yml
@@ -13,3 +13,12 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+- name: apt-get install
+  apt:
+    name: "{{ item.name }}"
+    state: "{{ item.state }}"
+  loop: "{{ _apt }}"
+  register: result
+  until: result is succeeded
+  tags: conmon
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -74,19 +74,20 @@
   until: get_url_result is succeeded
   tags: conmon
 
-- name: unarchive package
+- name: build package
   shell: |
     set -o pipefail
-    cd /usr/local/bin
     TMP_DIR="$(mktemp -d)" \
-      && cp {{ conmon_download.dest }} $TMP_DIR/conmon \
-      && chown root:root $TMP_DIR/conmon \
-      && chmod 0755 $TMP_DIR/conmon \
-      && mv $TMP_DIR/conmon . \
+      && tar -zx -C $TMP_DIR -f {{ conmon_download.dest }} --strip-components=1 \
+      && cd $TMP_DIR \
+      && make \
+      && make install \
       && rm -rf $TMP_DIR
   args:
     executable: "/bin/bash"
   when: get_url_result is changed
+  register: result
+  until: result is succeeded
   tags: conmon
 
 - name: prepare files

diff --git a/tasks/redhat.yml b/tasks/redhat.yml
@@ -13,3 +13,12 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+- name: yum install
+  yum:
+    name: "{{ item.name }}"
+    state: "{{ item.state }}"
+  loop: "{{ _yum }}"
+  register: result
+  until: result is succeeded
+  tags: conmon
diff --git a/tasks/suse.yml b/tasks/suse.yml
@@ -13,3 +13,14 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+- name: zypper install
+  vars:
+    ansible_python_interpreter: "python3"
+  zypper:
+    name: "{{ item.name }}"
+    state: "{{ item.state }}"
+  loop: "{{ _zypper }}"
+  register: result
+  until: result is succeeded
+  tags: conmon
diff --git a/vars/centos-7.yml b/vars/centos-7.yml
@@ -13,3 +13,10 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+_yum:
+  - { state: "latest", name: "gcc" }
+  - { state: "latest", name: "glib2-devel" }
+  - { state: "latest", name: "glibc-devel" }
+  - { state: "latest", name: "make" }
+  - { state: "latest", name: "pkgconfig" }
diff --git a/vars/centos-8.yml b/vars/centos-8.yml
@@ -13,3 +13,10 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+_yum:
+  - { state: "latest", name: "gcc" }
+  - { state: "latest", name: "glib2-devel" }
+  - { state: "latest", name: "glibc-devel" }
+  - { state: "latest", name: "make" }
+  - { state: "latest", name: "pkgconfig" }
diff --git a/vars/main.yml b/vars/main.yml
@@ -16,26 +16,26 @@
 
 _conmon_download:
   v2.0.15:
-    url: "https://github.com/containers/conmon/releases/download/v2.0.15/conmon"
-    dest: "{{ ansible_user_dir }}/.ansible/tmp/conmon-v2.0.15"
-    checksum: "sha1:2507385705de4904a1d2d37f627c00e94bba72ff"
+    url: "https://github.com/containers/conmon/archive/v2.0.15.tar.gz"
+    dest: "{{ ansible_user_dir }}/.ansible/tmp/conmon-v2.0.15.tar.gz"
+    checksum: "sha1:b1f93bd7bace53ac157cedaa6750f9d5c44e1bd6"
   v2.0.14:
-    url: "https://github.com/containers/conmon/releases/download/v2.0.14/conmon"
-    dest: "{{ ansible_user_dir }}/.ansible/tmp/conmon-v2.0.14"
-    checksum: "sha1:b75f775330113675ff6edd8351e4cd67dec9ffd2"
+    url: "https://github.com/containers/conmon/archive/v2.0.14.tar.gz"
+    dest: "{{ ansible_user_dir }}/.ansible/tmp/conmon-v2.0.14.tar.gz"
+    checksum: "sha1:b7ad2c2e0b2782842db73c2f8094f1743dac62a6"
   v2.0.13:
-    url: "https://github.com/containers/conmon/releases/download/v2.0.13/conmon"
-    dest: "{{ ansible_user_dir }}/.ansible/tmp/conmon-v2.0.13"
-    checksum: "sha1:5ef59bbc973ee8173a9f7700daf5c6a8743bae61"
+    url: "https://github.com/containers/conmon/archive/v2.0.13.tar.gz"
+    dest: "{{ ansible_user_dir }}/.ansible/tmp/conmon-v2.0.13.tar.gz"
+    checksum: "sha1:d790fc4baeb5150edce57b54a12f4cd4a08f96d5"
   v2.0.12:
-    url: "https://github.com/containers/conmon/releases/download/v2.0.12/conmon"
-    dest: "{{ ansible_user_dir }}/.ansible/tmp/conmon-v2.0.12"
-    checksum: "sha1:a267aaef8a06d5d5bb3acfd64272d783c1ec253f"
+    url: "https://github.com/containers/conmon/archive/v2.0.12.tar.gz"
+    dest: "{{ ansible_user_dir }}/.ansible/tmp/conmon-v2.0.12.tar.gz"
+    checksum: "sha1:b61a21f568b6f0166d2cdd620cc2bd71bb32b054"
   v2.0.11:
-    url: "https://github.com/containers/conmon/releases/download/v2.0.11/conmon"
-    dest: "{{ ansible_user_dir }}/.ansible/tmp/conmon-v2.0.11"
-    checksum: "sha1:66529371bd9f9fa21291b70cca506f69c44d68fb"
+    url: "https://github.com/containers/conmon/archive/v2.0.11.tar.gz"
+    dest: "{{ ansible_user_dir }}/.ansible/tmp/conmon-v2.0.11.tar.gz"
+    checksum: "sha1:4cd3c95ef03a9c53b8113703e28ec48e46bafc40"
   v2.0.10:
-    url: "https://github.com/containers/conmon/releases/download/v2.0.10/conmon"
-    dest: "{{ ansible_user_dir }}/.ansible/tmp/conmon-v2.0.10"
-    checksum: "sha1:2fa7e18daa424b5b6808192b805ba53529a0fd32"
+    url: "https://github.com/containers/conmon/archive/v2.0.10.tar.gz"
+    dest: "{{ ansible_user_dir }}/.ansible/tmp/conmon-v2.0.10.tar.gz"
+    checksum: "sha1:289611c9bc92f722b54023757205bec100021589"
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
@@ -13,3 +13,10 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+_yum:
+  - { state: "latest", name: "gcc" }
+  - { state: "latest", name: "glib2-devel" }
+  - { state: "latest", name: "glibc-devel" }
+  - { state: "latest", name: "make" }
+  - { state: "latest", name: "pkgconfig" }