From d4c23f1b98a66f6bf81174edd04a65743714e235 Mon Sep 17 00:00:00 2001 From: ginger Date: Nov 15 2021 16:05:34 +0000 Subject: Generalize testing-farm-run-test role --- diff --git a/roles/testing-farm-run-test/defaults/main.yml b/roles/testing-farm-run-test/defaults/main.yml index 1ffdb63..1b59908 100644 --- a/roles/testing-farm-run-test/defaults/main.yml +++ b/roles/testing-farm-run-test/defaults/main.yml @@ -1,2 +1,3 @@ --- api_url: "https://api.dev.testing-farm.io/v0.1" +base_url: "https://src.fedoraproject.org" diff --git a/roles/testing-farm-run-test/tasks/main.yml b/roles/testing-farm-run-test/tasks/main.yml index c018b92..ed33309 100644 --- a/roles/testing-farm-run-test/tasks/main.yml +++ b/roles/testing-farm-run-test/tasks/main.yml @@ -1,3 +1,4 @@ +# This role is also used in Centos Stream Zuul CI --- - name: trigger a Testing Farm test uri: @@ -6,10 +7,10 @@ body_format: json body: | { - "api_key": "{{ testing_farm_zuul_fedora_ci_key.apikey }}", + "api_key": "{{ testing_farm_zuul_ci_key.apikey }}", "test": { "{{ test_type | default('fmf') }}": { - "url": "https://src.fedoraproject.org/{{ zuul.project.name }}", + "url": "{{ base_url }}/{{ zuul.project.name }}", "ref": "{{ zuul.ref }}" } }, @@ -44,7 +45,7 @@ method: GET body_format: json body: - api_key: "{{ testing_farm_zuul_fedora_ci_key.apikey }}" + api_key: "{{ testing_farm_zuul_ci_key.apikey }}" status_code: 200 timeout: 30 register: response