Fix molecule jobs to work with stream nodes

Change-Id: I274fa5e2a4dcd0501f4b40ce38b5480c2f88002d
(cherry picked from commit 7e29933d41)
This commit is contained in:
Sagi Shnaidman 2021-04-26 12:01:06 +03:00
parent 99d747c7ba
commit 08541ffd5d
11 changed files with 22 additions and 3 deletions

View File

@ -79,4 +79,10 @@ tripleo_packages_upgrade_init_command: ''
tripleo_packages_upgrade_init_common_command: '' tripleo_packages_upgrade_init_common_command: ''
tripleo_packages_short_bootstrap_node_name: '' tripleo_packages_short_bootstrap_node_name: ''
# Exclude specific packages from update
tripleo_packages_exclude_from_update:
# Ansbile cannot upgrade itself as it will cause the current execution to fail.
# https://github.com/ansible/ansible/issues/56636
- ansible
tripleo_release: "{{ release | default('queens') }}" tripleo_release: "{{ release | default('queens') }}"

View File

@ -22,6 +22,7 @@ platforms:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
- /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg
- /opt/yum.repos.d:/etc/yum.repos.d:rw - /opt/yum.repos.d:/etc/yum.repos.d:rw
- /etc/dnf/vars:/etc/dnf/vars
privileged: true privileged: true
environment: &env environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}" http_proxy: "{{ lookup('env', 'http_proxy') }}"

View File

@ -17,5 +17,7 @@
- name: Prepare - name: Prepare
hosts: all hosts: all
vars:
test_deps_setup_stream: false
roles: roles:
- role: test_deps - role: test_deps

View File

@ -22,6 +22,7 @@ platforms:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
- /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg
- /opt/yum.repos.d:/etc/yum.repos.d:rw - /opt/yum.repos.d:/etc/yum.repos.d:rw
- /etc/dnf/vars:/etc/dnf/vars
privileged: true privileged: true
environment: &env environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}" http_proxy: "{{ lookup('env', 'http_proxy') }}"

View File

@ -17,5 +17,7 @@
- name: Prepare - name: Prepare
hosts: all hosts: all
vars:
test_deps_setup_stream: false
roles: roles:
- role: test_deps - role: test_deps

View File

@ -22,6 +22,7 @@ platforms:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
- /etc/pki/rpm-gpg:/etc/pki/rpm-gpg - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg
- /opt/yum.repos.d:/etc/yum.repos.d:rw - /opt/yum.repos.d:/etc/yum.repos.d:rw
- /etc/dnf/vars:/etc/dnf/vars
privileged: true privileged: true
environment: &env environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}" http_proxy: "{{ lookup('env', 'http_proxy') }}"

View File

@ -17,5 +17,7 @@
- name: Prepare - name: Prepare
hosts: all hosts: all
vars:
test_deps_setup_stream: false
roles: roles:
- role: test_deps - role: test_deps

View File

@ -21,6 +21,7 @@ platforms:
- /dev:/dev - /dev:/dev
- /lib/modules:/lib/modules - /lib/modules:/lib/modules
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
- /etc/dnf/vars:/etc/dnf/vars
privileged: true privileged: true
environment: &env environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}" http_proxy: "{{ lookup('env', 'http_proxy') }}"

View File

@ -19,6 +19,9 @@
hosts: all hosts: all
vars: vars:
step: 3 step: 3
tripleo_packages_exclude_from_update:
- ansible
- redhat-release
tasks: tasks:
- name: Import TripleO packages role - name: Import TripleO packages role
include_role: include_role:

View File

@ -17,5 +17,7 @@
- name: Prepare - name: Prepare
hosts: all hosts: all
vars:
test_deps_setup_stream: false
roles: roles:
- role: test_deps - role: test_deps

View File

@ -30,12 +30,10 @@
when: when:
- (((step | int) == 0) or ((step | int) == 3)) and (yum_pid_file.stat.exists | bool) - (((step | int) == 0) or ((step | int) == 3)) and (yum_pid_file.stat.exists | bool)
# Ansbile cannot upgrade itself as it will cause the current execution to fail.
# https://github.com/ansible/ansible/issues/56636
- name: Update all packages - name: Update all packages
when: step|int == 3 when: step|int == 3
package: package:
name: '*' name: '*'
state: latest state: latest
exclude: ansible exclude: "{{ tripleo_packages_exclude_from_update }}"
notify: start openvswitch notify: start openvswitch