From d3f2b32a9e2222f73b8a54db89884057def464d3 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Jan 28 2020 15:52:08 +0000
Subject: [PATCH 1/2] rpm-test job better handling of STI test failure


---

diff --git a/playbooks/rpm/rpmtest-fetch-artifacts.yaml b/playbooks/rpm/rpmtest-fetch-artifacts.yaml
new file mode 100644
index 0000000..9db09cb
--- /dev/null
+++ b/playbooks/rpm/rpmtest-fetch-artifacts.yaml
@@ -0,0 +1,4 @@
+---
+- hosts: all
+  roles:
+    - fetch-tests-yml-artifacts
diff --git a/playbooks/rpm/rpmtest.yaml b/playbooks/rpm/rpmtest.yaml
index b84e44d..befbe69 100644
--- a/playbooks/rpm/rpmtest.yaml
+++ b/playbooks/rpm/rpmtest.yaml
@@ -3,7 +3,6 @@
   roles:
     - repo-setup
     - run-tests-yml
-    - fetch-tests-yml-artifacts
   pre_tasks:
     - name: install system deps
       yum:
diff --git a/roles/fetch-tests-yml-artifacts/tasks/main.yml b/roles/fetch-tests-yml-artifacts/tasks/main.yml
index 85af42f..e70d6fb 100644
--- a/roles/fetch-tests-yml-artifacts/tasks/main.yml
+++ b/roles/fetch-tests-yml-artifacts/tasks/main.yml
@@ -1,8 +1,3 @@
-- name: Ensure artifacts directory exists
-  file:
-    path: '{{ ansible_user_dir }}/{{ zuul.project.src_dir }}/tests/artifacts'
-    state: directory
-
 - name: Fetch test artifacts
   synchronize:
     src: '{{ ansible_user_dir }}/{{ zuul.project.src_dir }}/tests/artifacts'
diff --git a/roles/run-tests-yml/tasks/main.yaml b/roles/run-tests-yml/tasks/main.yaml
index 020a0d0..872f40c 100644
--- a/roles/run-tests-yml/tasks/main.yaml
+++ b/roles/run-tests-yml/tasks/main.yaml
@@ -25,3 +25,14 @@
   args:
     chdir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}"
   become: yes
+
+- name: Check a STI results.yml file exists in the artifacts
+  stat:
+    path: '{{ ansible_user_dir }}/{{ zuul.project.src_dir }}/tests/artifacts/results.yml'
+  register: sti_results_stat
+
+- name: Check for test failures in the STI results.yml file
+  shell: "grep 'result: fail' {{ ansible_user_dir }}/{{ zuul.project.src_dir }}/tests/artifacts/results.yml"
+  register: grep_failure
+  failed_when: grep_failure.rc == 0
+  when: sti_results_stat.stat.exists
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index f125618..cee08e5 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -8,6 +8,7 @@
       - zuul: zuul-distro-jobs
     requires: repo
     run: playbooks/rpm/rpmtest.yaml
+    post-run: playbooks/rpm/rpmtest-fetch-artifacts.yaml
 
 - job:
     name: rpm-test

From 96d16c1e715200ed808ea8b0c9ef4771deebf492 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Jan 28 2020 16:08:02 +0000
Subject: [PATCH 2/2] rpm-test job: set 1h30 timeout


---

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index cee08e5..3618206 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -4,6 +4,8 @@
     name: base-rpm-test
     description: Run the test.yml test
     parent: base-cloud-fedora-latest
+    # 1h30 timeout
+    timeout: 5400
     roles:
       - zuul: zuul-distro-jobs
     requires: repo