openQA: use updates-testing but no scratch builds on both

The latest versions that were previously deployed as scratch
builds on lab are now in u-t, and ran fine on lab for a week, so
let's just deploy them from u-t to both instances now.

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

inventory/group_vars/openqa

@@ -29,5 +29,8 @@ openqa_update_arches: ['x86_64']
 # all our workers need NFS access
 openqa_nfs_workers: "{{ groups['openqa_workers'] }}"
 
+# 2021-07: deploying from u-t to get new builds that are tested on stg
+openqa_repo: updates-testing
+
 deployment_type: prod
 freezes: false

inventory/group_vars/openqa_lab

@@ -36,9 +36,6 @@ openqa_env: staging
 # ON THE EDGE (radical guitar riff)
 openqa_repo: updates-testing
 
-# 2021-06 git bump
-openqa_scratch: ["71201123", "71109332", "71103069"]
-
 wikitcms_token: "{{ private }}/files/openidc/staging/wikitcms.json"
 openqa_wikitcms_hostname: stg.fedoraproject.org
 openqa_resultsdb_url: http://resultsdb01.stg.iad2.fedoraproject.org/resultsdb_api/api/v2.0/

inventory/group_vars/openqa_lab_workers

@@ -16,9 +16,6 @@ openqa_env: staging
 # staging, we live ON THE EDGE (radical guitar riff)
 openqa_repo: updates-testing
 
-# 2021-06 git bump
-openqa_scratch: ["71201123", "71109332", "71103069"]
-
 # testing a feature from a branch
 openqa_createhdds_branch: desktop-upgrade-aarch64
 

inventory/group_vars/openqa_workers

@@ -15,6 +15,9 @@ openqa_env: production
 # we are all NFS workers for now at least
 openqa_nfs_worker: true
 
+# 2021-07: deploying from u-t to get new builds that are tested on stg
+openqa_repo: updates-testing
+
 deployment_type: prod
 freezes: false