From 2b0e6cdd4214098faf1bcc3bf52f71b0def7a0ed Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Thu, 22 Apr 2021 07:10:24 -0400
Subject: [PATCH] Separate jobs for build and test for openlab/arm64

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
---
 .zuul.yaml                                    | 10 ++++++++++
 .zuul/playbooks/containerd-build/run.yaml     |  1 -
 .../playbooks/containerd-build/unit-test.yaml | 20 +++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 .zuul/playbooks/containerd-build/unit-test.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index dd47ffe76..33d4d820f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -4,6 +4,7 @@
     check:
       jobs:
         - containerd-build-arm64
+        - containerd-test-arm64
 
 - job:
     name: containerd-build-arm64
@@ -13,3 +14,12 @@
     run: .zuul/playbooks/containerd-build/run.yaml
     nodeset: ubuntu-xenial-arm64-openlab
     voting: false
+
+- job:
+    name: containerd-test-arm64
+    parent: init-test
+    description: |
+      Containerd unit tests in openlab cluster.
+    run: .zuul/playbooks/containerd-build/unit-test.yaml
+    nodeset: ubuntu-xenial-arm64-openlab
+    voting: false
diff --git a/.zuul/playbooks/containerd-build/run.yaml b/.zuul/playbooks/containerd-build/run.yaml
index 913824327..ee78847d6 100644
--- a/.zuul/playbooks/containerd-build/run.yaml
+++ b/.zuul/playbooks/containerd-build/run.yaml
@@ -15,7 +15,6 @@
 
         go version
         make | tee $LOGS_PATH/make.txt
-        make test | tee $LOGS_PATH/make_test.txt
 
         cp -r ./bin $RESULTS_PATH
       chdir: '{{ zuul.project.src_dir }}'
diff --git a/.zuul/playbooks/containerd-build/unit-test.yaml b/.zuul/playbooks/containerd-build/unit-test.yaml
new file mode 100644
index 000000000..03f8b67f4
--- /dev/null
+++ b/.zuul/playbooks/containerd-build/unit-test.yaml
@@ -0,0 +1,20 @@
+- hosts: all
+  become: yes
+  roles:
+  - role: config-golang
+    go_version: '1.16.3'
+    arch: arm64
+  tasks:
+  - name: Build and test containerd
+    shell:
+      cmd: |
+        set -xe
+        set -o pipefail
+        apt-get update
+        apt-get install -y btrfs-tools libseccomp-dev git pkg-config
+
+        go version
+        make build test | tee $LOGS_PATH/make_test.txt
+      chdir: '{{ zuul.project.src_dir }}'
+      executable: /bin/bash
+    environment: '{{ global_env }}'