openstack
/
tripleo-ansible
Code Issues Proposed changes

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 committed by Shnaidman Sagi (Sergey)
parent 6637f112e9
commit 6de4de2b2c
12 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tripleo_ansible/roles/tripleo_packages/defaults/main.yml
View File

@ -79,4 +79,10 @@ tripleo_packages_upgrade_init_command: ''
tripleo_packages_upgrade_init_common_command: ''
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') }}"

1
tripleo_ansible/roles/tripleo_packages/molecule/default/molecule.yml
View File

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

2
tripleo_ansible/roles/tripleo_packages/molecule/default/prepare.yml
View File

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

1
tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/molecule.yml
View File

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

2
tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/prepare.yml
View File

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

1
tripleo_ansible/roles/tripleo_packages/molecule/ffu/molecule.yml
View File

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

2
tripleo_ansible/roles/tripleo_packages/molecule/ffu/prepare.yml
View File

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

3
tripleo_ansible/roles/tripleo_packages/molecule/update/converge.yml
View File

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

1
tripleo_ansible/roles/tripleo_packages/molecule/update/molecule.yml
View File

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

2
tripleo_ansible/roles/tripleo_packages/molecule/update/prepare.yml
View File

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

4
tripleo_ansible/roles/tripleo_packages/tasks/update.yml
View File

@ -30,14 +30,12 @@
when:
- (((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
when: step|int == 3
package:
name: '*'
state: latest
exclude: ansible
exclude: "{{ tripleo_packages_exclude_from_update }}"
register: tripleo_package_update_result
- name: Handle openvswitch service

1
zuul.d/molecule.yaml
View File

@ -419,7 +419,6 @@
- ^tripleo_ansible/roles/tripleo_packages/.*
name: tripleo-ansible-centos-8-molecule-tripleo_packages
parent: tripleo-ansible-centos-8-base
voting: false
vars:
tripleo_role_name: tripleo_packages
- job: