Browse Source

[CI] fix molecule tests on opensuse by upgrading to 15.4 (#9175)

* [CI] fix molecule tests on opensuse by upgrading to 15.4

* [opensuse] use correct python crytography package name depending on distribution version
pull/9178/head
Cristian Calin 2 years ago
committed by GitHub
parent
commit
b9e4e27195
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 2 deletions
  1. 2
      Vagrantfile
  2. 15
      roles/bootstrap-os/tasks/bootstrap-opensuse.yml
  3. 2
      roles/container-engine/containerd/molecule/default/molecule.yml

2
Vagrantfile

@ -31,7 +31,7 @@ SUPPORTED_OS = {
"rockylinux8" => {box: "generic/rocky8", user: "vagrant"}, "rockylinux8" => {box: "generic/rocky8", user: "vagrant"},
"fedora35" => {box: "fedora/35-cloud-base", user: "vagrant"}, "fedora35" => {box: "fedora/35-cloud-base", user: "vagrant"},
"fedora36" => {box: "fedora/36-cloud-base", user: "vagrant"}, "fedora36" => {box: "fedora/36-cloud-base", user: "vagrant"},
"opensuse" => {box: "opensuse/Leap-15.3.x86_64", user: "vagrant"},
"opensuse" => {box: "opensuse/Leap-15.4.x86_64", user: "vagrant"},
"opensuse-tumbleweed" => {box: "opensuse/Tumbleweed.x86_64", user: "vagrant"}, "opensuse-tumbleweed" => {box: "opensuse/Tumbleweed.x86_64", user: "vagrant"},
"oraclelinux" => {box: "generic/oracle7", user: "vagrant"}, "oraclelinux" => {box: "generic/oracle7", user: "vagrant"},
"oraclelinux8" => {box: "generic/oracle8", user: "vagrant"}, "oraclelinux8" => {box: "generic/oracle8", user: "vagrant"},

15
roles/bootstrap-os/tasks/bootstrap-opensuse.yml

@ -1,5 +1,9 @@
--- ---
# OpenSUSE ships with Python installed # OpenSUSE ships with Python installed
- name: Gather host facts to get ansible_distribution_version ansible_distribution_major_version
setup:
gather_subset: '!all'
filter: ansible_distribution_*version
- name: Check that /etc/sysconfig/proxy file exists - name: Check that /etc/sysconfig/proxy file exists
stat: stat:
@ -59,6 +63,17 @@
state: present state: present
update_cache: true update_cache: true
become: true become: true
when:
- ansible_distribution_version is version('15.4', '<')
- name: Install python3-cryptography
zypper:
name: python3-cryptography
state: present
update_cache: true
become: true
when:
- ansible_distribution_version is version('15.4', '>=')
# Nerdctl needs some basic packages to get an environment up # Nerdctl needs some basic packages to get an environment up
- name: Install basic dependencies - name: Install basic dependencies

2
roles/container-engine/containerd/molecule/default/molecule.yml

@ -32,7 +32,7 @@ platforms:
- kube_node - kube_node
- k8s_cluster - k8s_cluster
- name: opensuse - name: opensuse
box: opensuse/Leap-15.3.x86_64
box: opensuse/Leap-15.4.x86_64
cpus: 1 cpus: 1
memory: 1024 memory: 1024
groups: groups:

Loading…
Cancel
Save