From 510fe6962bab77fad333125a903cb1dad6fec552 Mon Sep 17 00:00:00 2001
From: Matthew Oliver <matt@oliver.net.au>
Date: Thu, 27 May 2021 17:00:49 +1000
Subject: [PATCH] Add some more arm64 non-voting tests

Adds:
 - a centos-8 probe test on py36
 - an ubuntu-bionic functest on py38
 - an ubuntu-bionic functest with encryption on py38

Change-Id: Id835b49312ec04d7ce9094718b98d8e23ddba0b7
---
 .zuul.yaml | 44 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index ee6afe6bae..78518291bd 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -187,6 +187,30 @@
     vars:
       tox_envlist: func-encryption-py3
 
+- job:
+    name: swift-tox-func-encryption-py38-arm64
+    parent: swift-tox-func-encryption-py38
+    nodeset: ubuntu-focal-arm64
+    description: |
+      Run functional tests for swift under cPython version 3.8
+      on top of arm64 architecture.
+
+      Uses tox with the ``func-encryption-py3`` environment.
+      It sets TMPDIR to an XFS mount point created via
+      tools/test-setup.sh.
+
+- job:
+    name: swift-tox-func-py38-arm64
+    parent: swift-tox-func-py38
+    nodeset: ubuntu-focal-arm64
+    description: |
+      Run functional tests for swift under cPython version 3.8
+      on top of arm64 architecture.
+
+      Uses tox with the ``func-py3`` environment.
+      It sets TMPDIR to an XFS mount point created via
+      tools/test-setup.sh.
+
 - job:
     name: swift-tox-func-ec-py38
     parent: swift-tox-func-py38
@@ -327,6 +351,14 @@
     vars:
       bindep_profile: test py36
 
+- job:
+    name: swift-probetests-centos-8-arm64
+    parent: swift-probetests-centos-8
+    nodeset: centos-8-arm64
+    description: |
+      Setup a SAIO dev environment and run Swift's probe tests
+      under Python 3 on top of arm64 architecture.
+
 - job:
     name: swift-func-cors
     parent: swift-probetests-centos-7
@@ -534,9 +566,9 @@
     vars: *swift_image_vars_py3
 
 - project-template:
-   name: swift-tox-jobs-arm64
+   name: swift-jobs-arm64
    description: |
-     Runs unit tests for an OpenStack Python project under the CPython
+     Runs tests for an OpenStack Python project under the CPython
      version 3 releases designated for testing on top of ARM64 architecture.
    check-arm64:
      jobs:
@@ -544,6 +576,12 @@
            voting: false
        - swift-tox-py39-arm64:
            voting: false
+       - swift-probetests-centos-8-arm64:
+           voting: false
+       - swift-tox-func-encryption-py38-arm64:
+           voting: false
+       - swift-tox-func-py38-arm64:
+           voting: false
 
 - project:
     templates:
@@ -552,7 +590,7 @@
       - check-requirements
       - release-notes-jobs-python3
       - integrated-gate-object-storage
-      - swift-tox-jobs-arm64
+      - swift-jobs-arm64
     check:
       jobs:
         - swift-build-image: