copr-builder: unregister the s390x machines, too

roles/copr/backend/files/provision/vm-delete

@@ -14,7 +14,11 @@ case "$RESALLOC_POOL_ID" in
     exec /usr/bin/resalloc-aws-delete --aws-profile default
     exit 1
     ;;
-
+*s390x*)
+    # Delegate the rest of the task to the IBM Cloud specific script.
+    exec /var/lib/resallocserver/resalloc_provision/ibm-cloud-vm --log-level debug delete "$RESALLOC_NAME"
+    exit 1
+    ;;
 *copr_hv_x86_64_*)
     pool_id=${RESALLOC_POOL_ID//copr_hv_x86_64_/}
     pool_id=${pool_id//_dev/}

roles/copr/backend/templates/resalloc/pools.yaml

@@ -150,7 +150,7 @@ copr_ibm_cloud_s390x_tokyo_{% if devel %}dev{% else %}prod{% endif %}:
     - ibm_cloud
     - tokyo
   cmd_new: '/var/lib/resallocserver/resalloc_provision/ibm-cloud-vm --log-level debug create "$RESALLOC_NAME"'
-  cmd_delete: '/var/lib/resallocserver/resalloc_provision/ibm-cloud-vm --log-level debug delete "$RESALLOC_NAME"'
+  cmd_delete: "/var/lib/resallocserver/provision/vm-delete"
   cmd_livecheck: "resalloc-check-vm-ip"
   cmd_release: "/var/lib/resallocserver/resalloc_provision/vm-release"
   livecheck_period: 180