From 35da4e428d2ca4ce9aca4f5ee7110236be3916f9 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Jan 16 2020 14:32:48 +0000
Subject: [PATCH 1/3] Revert "Simplify template to allow real composition"


This reverts commit 6f81cece31ed2325a4e59f5bee3eb9c09c65b9fb.

---

diff --git a/zuul.d/templates.yaml b/zuul.d/templates.yaml
index b631048..bf751c3 100644
--- a/zuul.d/templates.yaml
+++ b/zuul.d/templates.yaml
@@ -5,6 +5,7 @@
       jobs:
        - rpm-scratch-build
 
+<<<<<<< HEAD
 # test fbo #
 
 - project-template:
@@ -41,6 +42,8 @@
 
 ##
 
+=======
+>>>>>>> parent of 6f81cec... Simplify template to allow real composition
 - project-template:
     name: build-lint
     check:

From f4e2d79ba7a0e22b533406e9003de971b70ef64c Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Jan 16 2020 14:32:51 +0000
Subject: [PATCH 2/3] Revert "Fix lint template"


This reverts commit e9943fc59967155db8b55a409a7f8c1ef87b7e1a.

---

diff --git a/zuul.d/templates.yaml b/zuul.d/templates.yaml
index bf751c3..a7e2ae5 100644
--- a/zuul.d/templates.yaml
+++ b/zuul.d/templates.yaml
@@ -9,18 +9,23 @@
 # test fbo #
 
 - project-template:
-    name: lint
+    name: rpminspect
     check:
       jobs:
-       - rpm-linter:
-           dependencies:
-             - rpm-scratch-build
        - rpm-rpminspect:
            voting: False
            dependencies:
              - rpm-scratch-build
 
 - project-template:
+    name: linter
+    check:
+      jobs:
+       - rpm-linter:
+           dependencies:
+             - rpm-scratch-build
+
+- project-template:
     name: test
     check:
       jobs:

From ef1d71f87be7460a37c4cb825ee85e21fc3ac5bf Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Jan 16 2020 14:35:32 +0000
Subject: [PATCH 3/3] fix bad revert


---

diff --git a/zuul.d/templates.yaml b/zuul.d/templates.yaml
index a7e2ae5..35afdb8 100644
--- a/zuul.d/templates.yaml
+++ b/zuul.d/templates.yaml
@@ -5,50 +5,6 @@
       jobs:
        - rpm-scratch-build
 
-<<<<<<< HEAD
-# test fbo #
-
-- project-template:
-    name: rpminspect
-    check:
-      jobs:
-       - rpm-rpminspect:
-           voting: False
-           dependencies:
-             - rpm-scratch-build
-
-- project-template:
-    name: linter
-    check:
-      jobs:
-       - rpm-linter:
-           dependencies:
-             - rpm-scratch-build
-
-- project-template:
-    name: test
-    check:
-      jobs:
-       - rpm-test:
-           dependencies:
-             - rpm-scratch-build
-
-- project-template:
-    name: gate
-    gate:
-      jobs:
-        - noop
-
-- project-template:
-    name: promote
-    promote:
-      jobs:
-        - rpm-build
-
-##
-
-=======
->>>>>>> parent of 6f81cec... Simplify template to allow real composition
 - project-template:
     name: build-lint
     check: