From bec4411ce62612f7a1f3c1bd1ca835bb4bfe5565 Mon Sep 17 00:00:00 2001
From: ginger <ginger@redhat.com>
Date: Nov 15 2021 16:06:08 +0000
Subject: Change Testing-Farm secret key


---

diff --git a/zuul.d/jobs.dhall b/zuul.d/jobs.dhall
index e5e1adf..317c40c 100644
--- a/zuul.d/jobs.dhall
+++ b/zuul.d/jobs.dhall
@@ -251,8 +251,8 @@ let generateSTITestsJob =
         , requires = Some [ "repo" ]
         , secrets = Some
           [ Zuul.Job.Secret::{
-            , name = "testing_farm_zuul_fedora_ci_key"
-            , secret = "testing_farm_zuul_fedora_ci_key"
+            , name = "testing_farm_zuul_ci_key"
+            , secret = "testing_farm_zuul_ci_key"
             }
           ]
         , run = Some "playbooks/testing-farm/run.yaml"
@@ -281,8 +281,8 @@ let generateTMTTestsJob =
         , requires = Some [ "repo" ]
         , secrets = Some
           [ Zuul.Job.Secret::{
-            , name = "testing_farm_zuul_fedora_ci_key"
-            , secret = "testing_farm_zuul_fedora_ci_key"
+            , name = "testing_farm_zuul_ci_key"
+            , secret = "testing_farm_zuul_ci_key"
             }
           ]
         , run = Some "playbooks/testing-farm/run.yaml"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 61c9c12..6142058 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -564,8 +564,8 @@
       - zuul: zuul-distro-jobs
       - zuul: fedora-zuul-jobs
     secrets:
-      - name: testing_farm_zuul_fedora_ci_key
-        secret: testing_farm_zuul_fedora_ci_key
+      - name: testing_farm_zuul_ci_key
+        secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
       compose: Fedora-Rawhide
@@ -587,8 +587,8 @@
       - zuul: zuul-distro-jobs
       - zuul: fedora-zuul-jobs
     secrets:
-      - name: testing_farm_zuul_fedora_ci_key
-        secret: testing_farm_zuul_fedora_ci_key
+      - name: testing_farm_zuul_ci_key
+        secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
       compose: Fedora-35
@@ -610,8 +610,8 @@
       - zuul: zuul-distro-jobs
       - zuul: fedora-zuul-jobs
     secrets:
-      - name: testing_farm_zuul_fedora_ci_key
-        secret: testing_farm_zuul_fedora_ci_key
+      - name: testing_farm_zuul_ci_key
+        secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
       compose: Fedora-34
@@ -633,8 +633,8 @@
       - zuul: zuul-distro-jobs
       - zuul: fedora-zuul-jobs
     secrets:
-      - name: testing_farm_zuul_fedora_ci_key
-        secret: testing_farm_zuul_fedora_ci_key
+      - name: testing_farm_zuul_ci_key
+        secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
       compose: Fedora-33
@@ -656,8 +656,8 @@
       - zuul: zuul-distro-jobs
       - zuul: fedora-zuul-jobs
     secrets:
-      - name: testing_farm_zuul_fedora_ci_key
-        secret: testing_farm_zuul_fedora_ci_key
+      - name: testing_farm_zuul_ci_key
+        secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
       compose: Fedora-epel8
@@ -680,8 +680,8 @@
       - zuul: zuul-distro-jobs
       - zuul: fedora-zuul-jobs
     secrets:
-      - name: testing_farm_zuul_fedora_ci_key
-        secret: testing_farm_zuul_fedora_ci_key
+      - name: testing_farm_zuul_ci_key
+        secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
       compose: Fedora-Rawhide
@@ -703,8 +703,8 @@
       - zuul: zuul-distro-jobs
       - zuul: fedora-zuul-jobs
     secrets:
-      - name: testing_farm_zuul_fedora_ci_key
-        secret: testing_farm_zuul_fedora_ci_key
+      - name: testing_farm_zuul_ci_key
+        secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
       compose: Fedora-35
@@ -726,8 +726,8 @@
       - zuul: zuul-distro-jobs
       - zuul: fedora-zuul-jobs
     secrets:
-      - name: testing_farm_zuul_fedora_ci_key
-        secret: testing_farm_zuul_fedora_ci_key
+      - name: testing_farm_zuul_ci_key
+        secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
       compose: Fedora-34
@@ -749,8 +749,8 @@
       - zuul: zuul-distro-jobs
       - zuul: fedora-zuul-jobs
     secrets:
-      - name: testing_farm_zuul_fedora_ci_key
-        secret: testing_farm_zuul_fedora_ci_key
+      - name: testing_farm_zuul_ci_key
+        secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
       compose: Fedora-33
@@ -772,8 +772,8 @@
       - zuul: zuul-distro-jobs
       - zuul: fedora-zuul-jobs
     secrets:
-      - name: testing_farm_zuul_fedora_ci_key
-        secret: testing_farm_zuul_fedora_ci_key
+      - name: testing_farm_zuul_ci_key
+        secret: testing_farm_zuul_ci_key
     timeout: 21600
     vars:
       compose: Fedora-epel8
diff --git a/zuul.d/testing_farm_zuul_fedora_ci.secret.yaml b/zuul.d/testing_farm_zuul_fedora_ci.secret.yaml
index 6494b2b..31dd588 100644
--- a/zuul.d/testing_farm_zuul_fedora_ci.secret.yaml
+++ b/zuul.d/testing_farm_zuul_fedora_ci.secret.yaml
@@ -1,6 +1,6 @@
 ---
 - secret:
-    name: testing_farm_zuul_fedora_ci_key
+    name: testing_farm_zuul_ci_key
     data:
       apikey: !encrypted/pkcs1-oaep
         - lHC3iX9kFYconVbRleWHuCklX97ap/kzrCtF+DQM6BkkHTAciscsoeqZY0csoRJqTvOT7