From 623f4c2ebe0805bac627334088bfa216948dae42 Mon Sep 17 00:00:00 2001
From: ginger <ginger@redhat.com>
Date: Jul 14 2022 10:43:58 +0000
Subject: [PATCH 1/4] Add 2 vars for Testing Farm role that are required for the new rpm-rebuild-job


---

diff --git a/roles/testing-farm-run-test/tasks/main.yml b/roles/testing-farm-run-test/tasks/main.yml
index 1a7b3eb..077e09b 100644
--- a/roles/testing-farm-run-test/tasks/main.yml
+++ b/roles/testing-farm-run-test/tasks/main.yml
@@ -20,6 +20,8 @@
               "trigger": "commit",
               "arch": "x86_64",
               "distro": "{{ distro }}"
+              "component": "{{ zuul.playbook_context{}.playbook_projects{}.canonical_name }}"
+              "fedora_release": "{{ zuul.items[].branch }}"
             }
           },
           "arch": "x86_64",

From 2d610bba07c4be4cc478da3495bf0ccf09dd0ce0 Mon Sep 17 00:00:00 2001
From: ginger <ginger@redhat.com>
Date: Jul 18 2022 09:27:33 +0000
Subject: [PATCH 2/4] correct Zull vars


---

diff --git a/roles/testing-farm-run-test/tasks/main.yml b/roles/testing-farm-run-test/tasks/main.yml
index 077e09b..584f071 100644
--- a/roles/testing-farm-run-test/tasks/main.yml
+++ b/roles/testing-farm-run-test/tasks/main.yml
@@ -19,9 +19,9 @@
             "context": {
               "trigger": "commit",
               "arch": "x86_64",
-              "distro": "{{ distro }}"
-              "component": "{{ zuul.playbook_context{}.playbook_projects{}.canonical_name }}"
-              "fedora_release": "{{ zuul.items[].branch }}"
+              "distro": "{{ distro }}",
+              "component": "{{ zuul.project.short_name }}",
+              "fedora_release": "{{ zuul.branch }}"
             }
           },
           "arch": "x86_64",

From a759663b7a08fa115a1b4811b6aea7226a65f8c0 Mon Sep 17 00:00:00 2001
From: ginger <ginger@redhat.com>
Date: Jul 20 2022 08:41:25 +0000
Subject: [PATCH 3/4] move tmt vars from context to variables


---

diff --git a/roles/testing-farm-run-test/tasks/main.yml b/roles/testing-farm-run-test/tasks/main.yml
index 584f071..7061ccc 100644
--- a/roles/testing-farm-run-test/tasks/main.yml
+++ b/roles/testing-farm-run-test/tasks/main.yml
@@ -19,15 +19,17 @@
             "context": {
               "trigger": "commit",
               "arch": "x86_64",
-              "distro": "{{ distro }}",
-              "component": "{{ zuul.project.short_name }}",
-              "fedora_release": "{{ zuul.branch }}"
             }
           },
           "arch": "x86_64",
           "os": {
             "compose": "{{ compose }}",
           },
+          "variables": {
+              "distro": "{{ distro }}",
+              "component": "{{ zuul.project.short_name }}",
+              "fedora_release": "{{ zuul.branch }}"
+          },
           "artifacts": [
       {%- for repo in zuul.artifacts -%}
       {%- if repo.name == 'repo' -%}

From 6e9297dc54971f39a27f19e50ba3c373e16dfd85 Mon Sep 17 00:00:00 2001
From: ginger <ginger@redhat.com>
Date: Jul 24 2022 09:32:13 +0000
Subject: [PATCH 4/4] fix variables


---

diff --git a/roles/testing-farm-run-test/tasks/main.yml b/roles/testing-farm-run-test/tasks/main.yml
index 7061ccc..b97e39e 100644
--- a/roles/testing-farm-run-test/tasks/main.yml
+++ b/roles/testing-farm-run-test/tasks/main.yml
@@ -19,6 +19,7 @@
             "context": {
               "trigger": "commit",
               "arch": "x86_64",
+              "distro": "{{ distro }}"
             }
           },
           "arch": "x86_64",
@@ -26,9 +27,9 @@
             "compose": "{{ compose }}",
           },
           "variables": {
-              "distro": "{{ distro }}",
-              "component": "{{ zuul.project.short_name }}",
-              "fedora_release": "{{ zuul.branch }}"
+              "DISTRO": "{{ distro }}",
+              "COMPONENT": "{{ zuul.project.short_name }}",
+              "TARGET_BRANCH": "{{ zuul.branch }}"
           },
           "artifacts": [
       {%- for repo in zuul.artifacts -%}