From 5880d1a6eb220d8eeb5097ac58c197a94d9483ef Mon Sep 17 00:00:00 2001
From: Tristan Cacqueray <tdecacqu@redhat.com>
Date: Feb 04 2021 13:49:53 +0000
Subject: Freeze dhall-zuul dependency to version 0.5.0


This change prevents failure when the zuul binding is updated.

Depends-On: https://pagure.io/fedora-project-config/pull-request/128

---

diff --git a/zuul.d/FZCI.dhall b/zuul.d/FZCI.dhall
new file mode 100644
index 0000000..96274cc
--- /dev/null
+++ b/zuul.d/FZCI.dhall
@@ -0,0 +1 @@
+~/git/pagure.io/fedora-project-config/FZCI.dhall/package.dhall
diff --git a/zuul.d/jobs.dhall b/zuul.d/jobs.dhall
index e4cc16f..3b0457a 100644
--- a/zuul.d/jobs.dhall
+++ b/zuul.d/jobs.dhall
@@ -12,14 +12,11 @@ Install dhall by following https://docs.dhall-lang.org/tutorials/Getting-started
 Install zuulfmt by running: `python3 -mpip install --user zuulfmt`
 
 -}
-let Zuul =
-        ~/git/softwarefactory-project.io/software-factory/dhall-zuul/package.dhall
-      ? https://softwarefactory-project.io/cgit/software-factory/dhall-zuul/plain/package.dhall
+let FZCI = ./FZCI.dhall
 
-let Prelude =
-      https://prelude.dhall-lang.org/v17.0.0/package.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
+let Zuul = FZCI.Zuul
 
-let FZCI = ~/git/pagure.io/fedora-project-config/FZCI.dhall/package.dhall
+let Prelude = FZCI.Prelude
 
 let Nodesets = FZCI.Nodesets
 
diff --git a/zuul.d/nodesets.dhall b/zuul.d/nodesets.dhall
index afae952..bcee8c7 100644
--- a/zuul.d/nodesets.dhall
+++ b/zuul.d/nodesets.dhall
@@ -11,15 +11,11 @@ Install dhall by following https://docs.dhall-lang.org/tutorials/Getting-started
 Install zuulfmt by running: `python3 -mpip install --user zuulfmt`
 
 -}
+let FZCI = ./FZCI.dhall
 
-let Zuul =
-        ~/git/softwarefactory-project.io/software-factory/dhall-zuul/package.dhall
-      ? https://raw.githubusercontent.com/softwarefactory-project/dhall-zuul/master/package.dhall
+let Prelude = FZCI.Prelude
 
-let Prelude =
-      https://prelude.dhall-lang.org/v17.0.0/package.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
-
-let FZCI = ~/git/pagure.io/fedora-project-config/FZCI.dhall/package.dhall
+let Zuul = FZCI.Zuul
 
 let Nodesets = FZCI.Nodesets
 
diff --git a/zuul.d/templates.dhall b/zuul.d/templates.dhall
index 43b80f4..6ab0dc3 100644
--- a/zuul.d/templates.dhall
+++ b/zuul.d/templates.dhall
@@ -12,15 +12,11 @@ Install dhall by following https://docs.dhall-lang.org/tutorials/Getting-started
 Install zuulfmt by running: `python3 -mpip install --user zuulfmt`
 
 -}
+let FZCI = ./FZCI.dhall
 
-let Zuul =
-        ~/git/softwarefactory-project.io/software-factory/dhall-zuul/package.dhall
-      ? https://softwarefactory-project.io/cgit/software-factory/dhall-zuul/plain/package.dhall
+let Prelude = FZCI.Prelude
 
-let Prelude =
-      https://prelude.dhall-lang.org/v17.0.0/package.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
-
-let FZCI = ~/git/pagure.io/fedora-project-config/FZCI.dhall/package.dhall
+let Zuul = FZCI.Zuul
 
 let build =
       let createSBJobsForArches =
@@ -42,7 +38,7 @@ let build =
             { name = Zuul.ProjectTemplate.Name "build"
             , check =
                 Zuul.ProjectTemplate.Pipeline
-                  Zuul.ProjectPipeline::{
+                  Zuul.Project.PipelineConfig::{
                   , jobs =
                         [ Zuul.Job.Name "check-for-arches" ]
                       # createSBJobsForArches
@@ -54,7 +50,7 @@ let lint =
         { name = Zuul.ProjectTemplate.Name "lint"
         , check =
             Zuul.ProjectTemplate.Pipeline
-              Zuul.ProjectPipeline::{
+              Zuul.Project.PipelineConfig::{
               , jobs =
                 [ Zuul.Job.Inline
                     Zuul.Job::{
@@ -78,7 +74,7 @@ let test =
         { name = Zuul.ProjectTemplate.Name "test"
         , check =
             Zuul.ProjectTemplate.Pipeline
-              Zuul.ProjectPipeline::{
+              Zuul.Project.PipelineConfig::{
               , jobs =
                 [ Zuul.Job.Inline
                     Zuul.Job::{
@@ -111,10 +107,12 @@ let publish =
         { name = Zuul.ProjectTemplate.Name "publish"
         , gate =
             Zuul.ProjectTemplate.Pipeline
-              Zuul.ProjectPipeline::{ jobs = [ Zuul.Job.Name "noop" ] }
+              Zuul.Project.PipelineConfig::{ jobs = [ Zuul.Job.Name "noop" ] }
         , promote =
             Zuul.ProjectTemplate.Pipeline
-              Zuul.ProjectPipeline::{ jobs = [ Zuul.Job.Name "rpm-build" ] }
+              Zuul.Project.PipelineConfig::{
+              , jobs = [ Zuul.Job.Name "rpm-build" ]
+              }
         }
 
 let testTestsDef =
@@ -122,7 +120,9 @@ let testTestsDef =
         { name = Zuul.ProjectTemplate.Name "test-tests-def"
         , check =
             Zuul.ProjectTemplate.Pipeline
-              Zuul.ProjectPipeline::{ jobs = [ Zuul.Job.Name "rpm-test" ] }
+              Zuul.Project.PipelineConfig::{
+              , jobs = [ Zuul.Job.Name "rpm-test" ]
+              }
         }
 
 in  Zuul.ProjectTemplate.wrap [ build, lint, test, publish, testTestsDef ]