Merge branch 'release/4.8.3-4alvistack2' into master

.travis.yml

@@ -2,10 +2,13 @@
 
 os: linux
 
-dist: bionic
+dist: focal
 
 language: shell
 
+services:
+  - docker
+
 env:
   jobs:
     - MOLECULE_SCENARIO_NAME="4.8"
@@ -15,8 +18,8 @@ before_install:
   - |
     sudo apt-get -y purge python3-openssl && sudo apt-get -y autoremove
     sudo apt-get update && sudo apt-get install -y ca-certificates curl gcc iproute2 pwgen python3 python3-dev sudo
-    curl -skL https://bootstrap.pypa.io/get-pip.py | sudo -H python3
-    sudo -H pip3 install --upgrade --ignore-installed --requirement requirements.txt
+    curl -skL https://bootstrap.pypa.io/get-pip.py | sudo -H python3 - --prefix=/usr/local
+    sudo -H pip3 install --prefix=/usr/local --upgrade --ignore-installed --requirement requirements.txt
 
 install:
   - |

CHANGELOG.md

@@ -4,6 +4,9 @@
 
 ### Major Changes
 
+  - Upgrade Travis CI test as Ubuntu Focal based
+  - Upgrade minimal Ansible support to 2.10.0
+
 ## 4.8.2-4alvistack6 - 2020-06-10
 
 ### Major Changes

ansible-galaxy-requirements.yml

@@ -0,0 +1,24 @@
+---
+
+# (c) Wong Hoi Sing Edison <[email protected]>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+collections:
+  - name: community.kubernetes
+    src: https://galaxy.ansible.com
+    version: ">=1.0.0,<2.0.0"
+
+  - name: operator_sdk.util
+    src: https://galaxy.ansible.com
+    version: ">=0.0.0,<1.0.0"

molecule/default/create.yml

@@ -24,6 +24,7 @@
       template:
         src: "{{ molecule_scenario_directory }}/{{ item.dockerfile }}"
         dest: "{{ molecule_ephemeral_directory }}/Dockerfile-{{ item.name }}"
+        mode: "0644"
       loop_control:
         label: "{{ item.name }}"
       loop: "{{ molecule_yml.platforms }}"

requirements.txt

@@ -12,14 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ansible>=2.9.5
-ansible-lint
+ansible~=2.10.0a9
+ansible-lint~=4.3.0a6
 ansible-runner
 ansible-runner-http
 argcomplete
 docker
 flake8
-molecule>=3.0.2
+jmespath
+molecule~=3.0.2
 molecule-vagrant
 netaddr
 openshift

scripts/bootstrap-ansible.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# (c) Wong Hoi Sing Edison <[email protected]>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+set -o xtrace
+
+cd "$(cd "$(dirname "$0")"; pwd -P)/../"
+
+# Prepare APT dependencies
+if [ -x "$(command -v apt-get)" ]; then
+    apt-get update
+    apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo
+fi
+
+# Prepare YUM dependencies
+if [ -x "$(command -v yum)" ]; then
+    yum makecache
+    yum install -y ca-certificates curl gcc iproute python3 python3-devel sudo
+fi
+
+# Prepare Zypper dependencies
+if [ -x "$(command -v zypper)" ]; then
+    zypper -n --gpg-auto-import-keys refresh
+    zypper -n install -y ca-certificates curl gcc iproute2 python3 python3-devel sudo
+fi
+
+# Install PIP
+curl -skL https://bootstrap.pypa.io/get-pip.py | python3 - --prefix=/usr/local
+
+# Install PIP dependencies
+pip3 install --prefix=/usr/local --upgrade --ignore-installed --requirement requirements.txt

scripts/bootstrap-vagrant.sh

@@ -0,0 +1,49 @@
+#!/bin/bash
+
+# (c) Wong Hoi Sing Edison <[email protected]>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+set -o xtrace
+
+cd "$(cd "$(dirname "$0")"; pwd -P)/../"
+
+# Prepare APT dependencies
+if [ -x "$(command -v apt-get)" ]; then
+    apt-get update
+    apt-get install -y binutils bridge-utils dnsmasq-base ebtables libvirt-clients libvirt-daemon-system libvirt-dev make qemu-kvm qemu-utils ruby-dev
+    curl -Os https://releases.hashicorp.com/vagrant/2.2.9/vagrant_2.2.9_x86_64.deb
+    dpkg -i vagrant_2.2.9_x86_64.deb
+    rm -rf vagrant_2.2.9_*
+fi
+
+# Prepare YUM dependencies
+if [ -x "$(command -v yum)" ]; then
+    yum makecache
+    yum install -y binutils dnsmasq ebtables libvirt libvirt-client libvirt-devel make qemu-img qemu-kvm ruby-devel virt-install
+    curl -Os https://releases.hashicorp.com/vagrant/2.2.9/vagrant_2.2.9_x86_64.rpm
+    yum localinstall vagrant_2.2.9_x86_64.rpm
+    rm -rf vagrant_2.2.9_*
+fi
+
+# Prepare Zypper dependencies
+if [ -x "$(command -v zypper)" ]; then
+    zypper -n --gpg-auto-import-keys refresh
+    zypper -n install -y binutils-gold bridge-utils dnsmasq ebtables libvirt libvirt-client libvirt-devel make qemu-kvm qemu-tools ruby-devel virt-install
+    curl -Os https://releases.hashicorp.com/vagrant/2.2.9/vagrant_2.2.9_x86_64.rpm
+    zypper install vagrant_2.2.9_x86_64.rpm
+    rm -rf vagrant_2.2.9_*
+fi
+
+# Install vagrant-libvirt
+vagrant plugin install vagrant-libvirt