openqa: use updates-testing builds on all prod/stg

We don't need the scratch builds on stg any more now we've sent
the new builds to updates-testing. We *do* want to use the builds
from u-t on prod now (I don't want to wait a week for the stable
push).

Signed-off-by: Adam Williamson <awilliam@redhat.com>

inventory/group_vars/openqa

@@ -16,6 +16,9 @@ openqa_env_suffix:
 openqa_key: "{{ prod_openqa_apikey }}"
 # all our workers need NFS access
 openqa_nfs_workers: "{{ groups['openqa_workers'] }}"
+# install openQA from updates-testing, as of 2022-06 we want
+# the builds that have been tested on stg on prod too
+openqa_repo: updates-testing
 openqa_resultsdb_url: http://resultsdb01.iad2.fedoraproject.org/resultsdb_api/api/v2.0/
 openqa_secret: "{{ prod_openqa_apisecret }}"
 openqa_update_arches: ['x86_64']

inventory/group_vars/openqa_lab

@@ -40,8 +40,6 @@ openqa_nfs_workers: "{{ groups['openqa_lab_workers'] }}"
 # install openQA from updates-testing - this is staging, we live
 # ON THE EDGE (radical guitar riff)
 openqa_repo: updates-testing
-# use 2022-05 git scratch builds
-openqa_scratch: ["87748214"]
 openqa_resultsdb_url: https://resultsdb.stg.fedoraproject.org/api/v2.0/
 openqa_resultsdb_user: "{{ stg_resultsdb_httpd_user }}"
 openqa_resultsdb_password: "{{ stg_resultsdb_httpd_password }}"

inventory/group_vars/openqa_lab_workers

@@ -21,7 +21,6 @@ openqa_nfs_worker: true
 # install openQA and os-autoinst from updates-testing - this is
 # staging, we live ON THE EDGE (radical guitar riff)
 openqa_repo: updates-testing
-openqa_scratch: ["87702622", "87748214"]
 openqa_secret: "{{ stg_openqa_apisecret }}"
 openqa_workers: 4
 # We want stg workers to use this createhdds branch to test rawhide

inventory/group_vars/openqa_workers

@@ -18,6 +18,9 @@ openqa_hostname: openqa01.iad2.fedoraproject.org
 openqa_key: "{{ prod_openqa_apikey }}"
 # we are all NFS workers for now at least
 openqa_nfs_worker: true
+# install openQA from updates-testing, as of 2022-06 we want
+# the builds that have been tested on stg on prod too
+openqa_repo: updates-testing
 openqa_secret: "{{ prod_openqa_apisecret }}"
 openqa_workers: 4
 primary_auth_source: ipa