From 4f7ce5e300d486a4b65f0b4d5132b814b94898bd Mon Sep 17 00:00:00 2001
From: Sagi Shnaidman <sshnaidm@redhat.com>
Date: Mon, 26 Apr 2021 12:01:06 +0300
Subject: [PATCH] Fix molecule jobs to work with stream nodes

Change-Id: I274fa5e2a4dcd0501f4b40ce38b5480c2f88002d
(cherry picked from commit 7e29933d41f0de6b0697a17ea88a5bfcee72103b)
---
 tripleo_ansible/roles/tripleo_packages/defaults/main.yml    | 6 ++++++
 .../roles/tripleo_packages/molecule/default/molecule.yml    | 1 +
 .../roles/tripleo_packages/molecule/default/prepare.yml     | 2 ++
 .../tripleo_packages/molecule/external_upgrade/molecule.yml | 1 +
 .../tripleo_packages/molecule/external_upgrade/prepare.yml  | 2 ++
 .../roles/tripleo_packages/molecule/ffu/molecule.yml        | 1 +
 .../roles/tripleo_packages/molecule/ffu/prepare.yml         | 2 ++
 .../roles/tripleo_packages/molecule/update/converge.yml     | 3 +++
 .../roles/tripleo_packages/molecule/update/molecule.yml     | 1 +
 .../roles/tripleo_packages/molecule/update/prepare.yml      | 2 ++
 tripleo_ansible/roles/tripleo_packages/tasks/update.yml     | 4 +---
 zuul.d/molecule.yaml                                        | 1 -
 12 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/tripleo_ansible/roles/tripleo_packages/defaults/main.yml b/tripleo_ansible/roles/tripleo_packages/defaults/main.yml
index 5464468ad..93c745e69 100644
--- a/tripleo_ansible/roles/tripleo_packages/defaults/main.yml
+++ b/tripleo_ansible/roles/tripleo_packages/defaults/main.yml
@@ -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') }}"
diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/default/molecule.yml b/tripleo_ansible/roles/tripleo_packages/molecule/default/molecule.yml
index 3490ad9ba..b7b8fb25b 100644
--- a/tripleo_ansible/roles/tripleo_packages/molecule/default/molecule.yml
+++ b/tripleo_ansible/roles/tripleo_packages/molecule/default/molecule.yml
@@ -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') }}"
diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_packages/molecule/default/prepare.yml
index ef85c3128..9f5594992 100644
--- a/tripleo_ansible/roles/tripleo_packages/molecule/default/prepare.yml
+++ b/tripleo_ansible/roles/tripleo_packages/molecule/default/prepare.yml
@@ -17,5 +17,7 @@
 
 - name: Prepare
   hosts: all
+  vars:
+    test_deps_setup_stream: false
   roles:
     - role: test_deps
diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/molecule.yml b/tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/molecule.yml
index 3490ad9ba..b7b8fb25b 100644
--- a/tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/molecule.yml
+++ b/tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/molecule.yml
@@ -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') }}"
diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/prepare.yml b/tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/prepare.yml
index ef85c3128..9f5594992 100644
--- a/tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/prepare.yml
+++ b/tripleo_ansible/roles/tripleo_packages/molecule/external_upgrade/prepare.yml
@@ -17,5 +17,7 @@
 
 - name: Prepare
   hosts: all
+  vars:
+    test_deps_setup_stream: false
   roles:
     - role: test_deps
diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/ffu/molecule.yml b/tripleo_ansible/roles/tripleo_packages/molecule/ffu/molecule.yml
index 7b770ddc1..4f4026805 100644
--- a/tripleo_ansible/roles/tripleo_packages/molecule/ffu/molecule.yml
+++ b/tripleo_ansible/roles/tripleo_packages/molecule/ffu/molecule.yml
@@ -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') }}"
diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/ffu/prepare.yml b/tripleo_ansible/roles/tripleo_packages/molecule/ffu/prepare.yml
index ef85c3128..9f5594992 100644
--- a/tripleo_ansible/roles/tripleo_packages/molecule/ffu/prepare.yml
+++ b/tripleo_ansible/roles/tripleo_packages/molecule/ffu/prepare.yml
@@ -17,5 +17,7 @@
 
 - name: Prepare
   hosts: all
+  vars:
+    test_deps_setup_stream: false
   roles:
     - role: test_deps
diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/update/converge.yml b/tripleo_ansible/roles/tripleo_packages/molecule/update/converge.yml
index 3837727eb..873354605 100644
--- a/tripleo_ansible/roles/tripleo_packages/molecule/update/converge.yml
+++ b/tripleo_ansible/roles/tripleo_packages/molecule/update/converge.yml
@@ -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:
diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/update/molecule.yml b/tripleo_ansible/roles/tripleo_packages/molecule/update/molecule.yml
index 76405b94c..40a1df5a5 100644
--- a/tripleo_ansible/roles/tripleo_packages/molecule/update/molecule.yml
+++ b/tripleo_ansible/roles/tripleo_packages/molecule/update/molecule.yml
@@ -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') }}"
diff --git a/tripleo_ansible/roles/tripleo_packages/molecule/update/prepare.yml b/tripleo_ansible/roles/tripleo_packages/molecule/update/prepare.yml
index ef85c3128..9f5594992 100644
--- a/tripleo_ansible/roles/tripleo_packages/molecule/update/prepare.yml
+++ b/tripleo_ansible/roles/tripleo_packages/molecule/update/prepare.yml
@@ -17,5 +17,7 @@
 
 - name: Prepare
   hosts: all
+  vars:
+    test_deps_setup_stream: false
   roles:
     - role: test_deps
diff --git a/tripleo_ansible/roles/tripleo_packages/tasks/update.yml b/tripleo_ansible/roles/tripleo_packages/tasks/update.yml
index 07cbc0f35..349691403 100644
--- a/tripleo_ansible/roles/tripleo_packages/tasks/update.yml
+++ b/tripleo_ansible/roles/tripleo_packages/tasks/update.yml
@@ -30,12 +30,10 @@
   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 }}"
   notify: start openvswitch
diff --git a/zuul.d/molecule.yaml b/zuul.d/molecule.yaml
index bcfe11d53..cce7bdb23 100644
--- a/zuul.d/molecule.yaml
+++ b/zuul.d/molecule.yaml
@@ -418,7 +418,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: