Add script to clean up

Signed-off-by: Matthias Büchse <[email protected]>

.zuul.d/config.yaml

@@ -22,6 +22,7 @@
 - job:
     name: scs-check-adr-syntax
     parent: base
+    pre-run: playbooks/pre.yml
     run: playbooks/adr_syntax.yaml
 - job:
     name: scs-check-gx-scs
@@ -31,6 +32,7 @@
        secret: SECRET_STANDARDS
     vars:
       cloud: gx-scs
+    pre-run: playbooks/pre.yml
     run: playbooks/compliance_check.yaml
 - job:
     name: scs-check-gx-scs-main

Tests/iaas/entropy/entropy-check.py

@@ -30,11 +30,11 @@
 
 logger = logging.getLogger(__name__)
 
-NETWORK_NAME = "scs-0101-net"
-ROUTER_NAME = "scs-0101-router"
-SERVER_NAME = "scs-0101-server"
-SECURITY_GROUP_NAME = "scs-0101-group"
-KEYPAIR_NAME = "scs-0101-keypair"
+NETWORK_NAME = "_scs-0101-net"
+ROUTER_NAME = "_scs-0101-router"
+SERVER_NAME = "_scs-0101-server"
+SECURITY_GROUP_NAME = "_scs-0101-group"
+KEYPAIR_NAME = "_scs-0101-keypair"
 
 IMAGE_ATTRIBUTES = {
     # https://docs.openstack.org/glance/2023.1/admin/useful-image-properties.html#image-property-keys-and-values

playbooks/adr_syntax.yaml

@@ -1,27 +1,7 @@
 ---
 - name: Run ADR syntax check tool and test script consistency check tool
   hosts: all
-  roles:
-    - role: ensure-pip  # https://zuul-ci.org/docs/zuul-jobs/latest/python-roles.html#role-ensure-pip
   tasks:
-    - name: Copy ADRs on the node
-      ansible.builtin.copy:
-        src: "../Standards"
-        dest: "~/"
-        mode: 0500
-      no_log: false
-
-    - name: Copy Tests on the node
-      ansible.builtin.copy:
-        src: "../Tests"
-        dest: "~/"
-        mode: 0500
-      no_log: false
-
-    - name: Install dependencies
-      ansible.builtin.pip:
-        requirements: /home/ubuntu/Tests/requirements.txt
-
     - name: Run ADR syntax check script
       ansible.builtin.command:
         cmd: python3 /home/ubuntu/Tests/chk_adrs.py /home/ubuntu/Standards

playbooks/compliance_check.yaml

@@ -1,33 +1,12 @@
 ---
 - name: Run compliance check tool
   hosts: all
-  roles:
-    - role: ensure-pip  # https://zuul-ci.org/docs/zuul-jobs/latest/python-roles.html#role-ensure-pip
   tasks:
-    - name: Create cloud config dir
-      ansible.builtin.file:
-        path: "~/.config/openstack"
-        state: directory
-        recurse: true
-        mode: "0700"
-
-    - name: Create cloud config file
-      ansible.builtin.template:
-        src: "clouds.yaml.j2"
-        dest: "~/.config/openstack/clouds.yaml"
-        mode: "0600"
-      no_log: true
-
-    - name: Copy Tests on the node
-      ansible.builtin.copy:
-        src: "../Tests"
-        dest: "~/"
-        mode: 0500
-      no_log: false
-
-    - name: Install dependencies
-      ansible.builtin.pip:
-        requirements: /home/ubuntu/Tests/requirements.txt
+    - name: Clean up any lingering resources from previous run
+      ansible.builtin.command:
+        cmd: python3 /home/ubuntu/Tests/cleanup.py -c {{ cloud }} -p _scs-
+      failed_when: false
+      changed_when: true
 
     - name: Run compliance script
       ansible.builtin.command:

playbooks/pre.yaml

@@ -0,0 +1,37 @@
+---
+- name: Run compliance check tool
+  hosts: all
+  roles:
+    - role: ensure-pip  # https://zuul-ci.org/docs/zuul-jobs/latest/python-roles.html#role-ensure-pip
+  tasks:
+    - name: Create cloud config dir
+      ansible.builtin.file:
+        path: "~/.config/openstack"
+        state: directory
+        recurse: true
+        mode: "0700"
+
+    - name: Create cloud config file
+      ansible.builtin.template:
+        src: "clouds.yaml.j2"
+        dest: "~/.config/openstack/clouds.yaml"
+        mode: "0600"
+      no_log: true
+
+    - name: Copy ADRs on the node
+      ansible.builtin.copy:
+        src: "../Standards"
+        dest: "~/"
+        mode: 0500
+      no_log: false
+
+    - name: Copy Tests on the node
+      ansible.builtin.copy:
+        src: "../Tests"
+        dest: "~/"
+        mode: 0500
+      no_log: false
+
+    - name: Install dependencies
+      ansible.builtin.pip:
+        requirements: /home/ubuntu/Tests/requirements.txt