Merge "Don't do cleanup for Suse images"

zuul.d/playbooks/pre-gate-cleanup.yml

@@ -18,6 +18,9 @@
   become: yes
   become_user: root
   tasks:
+
+    - name: Cleanup gate images
+      block:
         - name: Gather variables for each operating system
           include_vars: "{{ ansible_os_family | lower }}.yml"
 
@@ -41,6 +44,7 @@
               - zipp
               - backports
             state: absent
+      when: ansible_os_family | lower in ['debian', 'redhat']
 
     - name: Remove package blacklist for yum/dnf
       lineinfile:

zuul.d/playbooks/vars/suse.yml

@@ -1,18 +0,0 @@
----
-# Copyright 2020, VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-gate_packages_remove:
-  - python-virtualenv
-  - python2-virtualenv