From 04e14c1f9568bb168da79b493b87693e2d603ef3 Mon Sep 17 00:00:00 2001
From: Abhijeet Kasurde <akasurde@redhat.com>
Date: Wed, 12 Jan 2022 13:37:03 +0530
Subject: [PATCH] DNM: CI fix (#323)

CI fix

SUMMARY
Signed-off-by: Abhijeet Kasurde akasurde@redhat.com
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
molecule/default/tasks/taint.yml

Reviewed-by: None <None>
Reviewed-by: Alina Buzachis <None>
Reviewed-by: Abhijeet Kasurde <None>
Reviewed-by: None <None>
---
 .../default/roles/helm/tasks/tests_helm_diff.yml   | 14 ++------------
 molecule/default/tasks/taint.yml                   | 10 +++++-----
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/molecule/default/roles/helm/tasks/tests_helm_diff.yml b/molecule/default/roles/helm/tasks/tests_helm_diff.yml
index 3191e227..4ba3f9af 100644
--- a/molecule/default/roles/helm/tasks/tests_helm_diff.yml
+++ b/molecule/default/roles/helm/tasks/tests_helm_diff.yml
@@ -52,20 +52,10 @@
 
     - name: Check if helm diff check is correct
       vars:
-        expected: "\u001b[0;33mhelm, test-chart-another-configmap, ConfigMap (v1) has been added:\u001b[0m\n\
-          \u001b[0;31m- \u001b[0m\n\
-          \u001b[0;32m+ # Source: test-chart/templates/anothermap.yaml\u001b[0m\n\
-          \u001b[0;32m+ # BEGIN ANSIBLE MANAGED BLOCK\u001b[0m\n\
-          \u001b[0;32m+ apiVersion: v1\u001b[0m\n\
-          \u001b[0;32m+ kind: ConfigMap\u001b[0m\n\
-          \u001b[0;32m+ metadata:\u001b[0m\n\
-          \u001b[0;32m+   name: test-chart-another-configmap\u001b[0m\n\
-          \u001b[0;32m+ data:\u001b[0m\n\
-          \u001b[0;32m+   foo: bar\u001b[0m\n\
-          \u001b[0;32m+ # END ANSIBLE MANAGED BLOCK\u001b[0m"
+        foo_bar_value: "+   foo: bar"
       assert:
         that:
-          - expected == diff_result.diff.prepared
+          - foo_bar_value in diff_result.diff.prepared
 
     - name: Upgrade local chart with modifications
       helm:
diff --git a/molecule/default/tasks/taint.yml b/molecule/default/tasks/taint.yml
index d190f4fc..3628d9fe 100644
--- a/molecule/default/tasks/taint.yml
+++ b/molecule/default/tasks/taint.yml
@@ -241,7 +241,7 @@
     vars:
       search_key: "{{ item.key}}"
       search_effect: "{{ item.effect }}"
-      all_taints: "{{ taint_patch_1 }} + {{ taint_patch_2 }}"
+      all_taints: "{{ taint_patch_1 + taint_patch_2 }}"
     with_items: "{{ _result.result.spec.taints }}"
 
   - name: Remove taints from node (check_mode)
@@ -323,7 +323,7 @@
     vars:
       search_key: "{{ item.key}}"
       search_effect: "{{ item.effect }}"
-      all_taints: "{{ taint_patch_1 }} + {{ taint_patch_2 }}"
+      all_taints: "{{ taint_patch_1 + taint_patch_2 }}"
     with_items: "{{ _result.result.spec.taints }}"
 
   - name: Add other taints and update
@@ -340,7 +340,7 @@
     vars:
       search_key: "{{ item.key}}"
       search_effect: "{{ item.effect }}"
-      all_taints: "{{ taint_patch_3 }} + {{ taint_patch_2 }}"
+      all_taints: "{{ taint_patch_3 + taint_patch_2 }}"
     with_items: "{{ _result.result.spec.taints }}"
 
   - name: Remove taint using key:effect
@@ -373,7 +373,7 @@
     vars:
       search_key: "{{ item.key}}"
       search_effect: "{{ item.effect }}"
-      all_taints: "{{ taint_patch_3 }} + {{ left_taint_patch_2 }}"
+      all_taints: "{{ taint_patch_3 + left_taint_patch_2 }}"
     with_items: "{{ _result.resources[0].spec.taints }}"
 
   - name: Remove taint using key
@@ -405,7 +405,7 @@
     vars:
       search_key: "{{ item.key}}"
       search_effect: "{{ item.effect }}"
-      all_taints: "{{ left_taint_patch_2 }} + {{ left_taint_patch_3 }}"
+      all_taints: "{{ left_taint_patch_2 + left_taint_patch_3 }}"
     with_items: "{{ _result.resources[0].spec.taints }}"
 
   - name: Remove taints (including non existing ones)