Still check for stackhpc repos in footer

Author: MoteHue

etc/kayobe/kolla.yml

@@ -353,21 +353,21 @@ kolla_build_blocks:
     {% if kolla_base_distro in ['centos', 'rocky'] %}
     RUN \
         if [ -f /etc/yum.repos.d.backup/repos.tar.gz ]; then \
-          tar -xzf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d && \
-          if grep -r '{{ stackhpc_repo_mirror_url }}' /etc/yum.repos.d; then \
-            echo "Found repository mirror in Yum repositories"; \
-            exit 1; \
-          fi && \
+          tar -xzf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d
           rm -rf /etc/yum.repos.d.backup/
-        fi
+        fi && \
+        if grep -r '{{ stackhpc_repo_mirror_url }}' /etc/yum.repos.d; then \
+          echo "Found repository mirror in Yum repositories"; \
+          exit 1; \
+        fi && \
     {% else %}
     RUN \
         if [ -f /etc/apt/sources.list.backup ]; then \
-          mv /etc/apt/sources.list.backup /etc/apt/sources.list && \
-          if grep -r '{{ stackhpc_repo_mirror_url }}' /etc/apt/sources.list; then \
-            echo "Found repository mirror in APT repositories"; \
-            exit 1; \
-          fi
+          mv /etc/apt/sources.list.backup /etc/apt/sources.list
+        fi && \
+        if grep -r '{{ stackhpc_repo_mirror_url }}' /etc/apt/sources.list; then \
+          echo "Found repository mirror in APT repositories"; \
+          exit 1; \
         fi
     {% endif %}
     {% endif %}