Merge branch 'release/4.3.0'

alvistack · Apr 22, 2020 · 186898f · 186898f
2 parents 2b522a3 + ea0bfee
commit 186898f
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 167 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/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/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/suse.yml b/tasks/suse.yml
@@ -35,6 +35,8 @@
     auto_import_keys: true
     autorefresh: true
   loop: "{{ _zypper_repository[node_release] }}"
+  register: result
+  until: result is succeeded
   tags: node
 
 - name: zypper install

diff --git a/vars/ubuntu-20.04.yml b/vars/ubuntu-20.04.yml
@@ -15,18 +15,39 @@
 # limitations under the License.
 
 _apt_key:
-  "13": []
-  "12": []
-  "10": []
+  "13":
+    - url: "https://deb.nodesource.com/gpgkey/nodesource.gpg.key"
+      id: "9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280"
+      state: "present"
+  "12":
+    - url: "https://deb.nodesource.com/gpgkey/nodesource.gpg.key"
+      id: "9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280"
+      state: "present"
+  "10":
+    - url: "https://deb.nodesource.com/gpgkey/nodesource.gpg.key"
+      id: "9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280"
+      state: "present"
 
 _apt_repository:
-  "13": []
-  "12": []
-  "10": []
+  "13":
+    - repo: "deb https://deb.nodesource.com/node_13.x focal main"
+      state: "present"
+  "12":
+    - repo: "deb https://deb.nodesource.com/node_12.x focal main"
+      state: "present"
+  "10":
+    - repo: "deb https://deb.nodesource.com/node_10.x focal main"
+      state: "present"
 
 _apt:
-  "13": []
-  "12": []
+  "13":
+    - { state: "latest", name: "g++" }
+    - { state: "latest", name: "make" }
+    - { state: "latest", name: "nodejs" }
+  "12":
+    - { state: "latest", name: "g++" }
+    - { state: "latest", name: "make" }
+    - { state: "latest", name: "nodejs" }
   "10":
     - { state: "latest", name: "g++" }
     - { state: "latest", name: "make" }