From 5b58f06111e6e70ea99b8881b61b2e8e14683e43 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Jul 16 2021 10:17:08 +0000
Subject: Attempt to fix tmt role for Zuul context


---

diff --git a/roles/testing-farm-run-test/tasks/main.yml b/roles/testing-farm-run-test/tasks/main.yml
index 1d9b83f..df5ffce 100644
--- a/roles/testing-farm-run-test/tasks/main.yml
+++ b/roles/testing-farm-run-test/tasks/main.yml
@@ -1,20 +1,26 @@
 ---
-- name: generate request template for the POST request
-  template:
-    src: request_body.yml.j2
-    dest: request_body.yml
-
-- name: read the request variable
-  include_vars:
-    file: request_body.yml
-    name: request_body
-
 - name: trigger a Testing Farm test
   uri:
     url: "{{ api_url }}/requests"
     method: POST
     body_format: json
-    body: "{{ request_body }}"
+    body: |
+      api_key: "{{ testing_farm_zuul_fedora_ci_key.apikey }}"
+      test:
+        fmf:
+          url: "https://src.fedoraproject.org/{{ zuul.project.name }}"
+          ref: "{{ zuul.ref }}"
+      environments:
+        - os:
+            compose: "{{ compose }}"
+          arch: x86_64
+          artifacts:
+      {% for repo in zuul.artifacts %}
+      {% if repo.name == 'repo' %}
+            - type: "repository"
+              id: "{{ repo.url }}"
+      {% endif %}
+      {% endfor %}
     status_code: 200, 201
     timeout: 30
   register: id
@@ -28,7 +34,7 @@
     method: GET
     body_format: json
     body:
-      api_key: "{{ request_body.api_key }}"
+      api_key: "{{ testing_farm_zuul_fedora_ci_key.apikey }}"
     status_code: 200
     timeout: 30
   register: response
diff --git a/roles/testing-farm-run-test/templates/request_body.yml.j2 b/roles/testing-farm-run-test/templates/request_body.yml.j2
deleted file mode 100644
index 6a70084..0000000
--- a/roles/testing-farm-run-test/templates/request_body.yml.j2
+++ /dev/null
@@ -1,19 +0,0 @@
----
-api_key: "{{ testing_farm_zuul_fedora_ci_key.apikey }}"
-test:
-  fmf:
-    # NOTE: See https://zuul-ci.org/docs/zuul/reference/jobs.html#zuul-variables
-    url: "https://src.fedoraproject.org/{{ zuul.project.name }}"
-    ref: "{{ zuul.ref }}"
-environments:
-  - os:
-      # NOTE: See https://pagure.io/fedora-zuul-jobs-config/blob/master/f/zuul.d/jobs.yaml
-      compose: "{{ compose }}"
-    arch: x86_64
-    artifacts:
-{% for repo in zuul.artifacts %}
-{% if repo.name == 'repo' %}
-      - type: "repository"
-        id: "{{ repo.url }}"
-{% endif %}
-{% endfor %}