From 6c7e6a3218c0bd2c4958ddef411ef859fdcd8406 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 30 May 2023 09:20:42 -0700 Subject: [PATCH] openqa: use updates-testing on prod and stg to get latest builds The 2023-05 git builds look good on stg, and are now in u-t, so drop the scratch repos on stg and enable u-t on prod so we get the builds from u-t everywhere. Signed-off-by: Adam Williamson --- inventory/group_vars/openqa | 2 ++ inventory/group_vars/openqa_lab | 2 -- inventory/group_vars/openqa_lab_workers | 2 -- inventory/group_vars/openqa_workers | 2 ++ 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inventory/group_vars/openqa b/inventory/group_vars/openqa index 41400966d4..8219221fec 100644 --- a/inventory/group_vars/openqa +++ b/inventory/group_vars/openqa @@ -16,6 +16,8 @@ openqa_env_suffix: openqa_key: "{{ prod_openqa_apikey }}" # all our workers need NFS access openqa_nfs_workers: "{{ groups['openqa_workers'] }}" +# use updates-testing for now to get 2023-05 updates +openqa_repo: updates-testing openqa_resultsdb_url: https://resultsdb.fedoraproject.org/api/v2.0/ openqa_resultsdb_user: "{{ prod_resultsdb_httpd_user }}" openqa_resultsdb_password: "{{ prod_resultsdb_httpd_password }}" diff --git a/inventory/group_vars/openqa_lab b/inventory/group_vars/openqa_lab index be3298d9f7..b97d180ca4 100644 --- a/inventory/group_vars/openqa_lab +++ b/inventory/group_vars/openqa_lab @@ -37,8 +37,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 -# 2023-05 update scratch builds for testing -openqa_scratch: ["101559263"] 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 }}" diff --git a/inventory/group_vars/openqa_lab_workers b/inventory/group_vars/openqa_lab_workers index 91dc8b2c75..2de4f878e1 100644 --- a/inventory/group_vars/openqa_lab_workers +++ b/inventory/group_vars/openqa_lab_workers @@ -21,8 +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 -# 2023-05 update scratch builds for testing -openqa_scratch: ["101559263", "101559975"] openqa_secret: "{{ stg_openqa_apisecret }}" openqa_workers: 4 primary_auth_source: ipa diff --git a/inventory/group_vars/openqa_workers b/inventory/group_vars/openqa_workers index ae6fe400e7..7513eada70 100644 --- a/inventory/group_vars/openqa_workers +++ b/inventory/group_vars/openqa_workers @@ -18,6 +18,8 @@ openqa_hostname: openqa01.iad2.fedoraproject.org openqa_key: "{{ prod_openqa_apikey }}" # we are all NFS workers for now at least openqa_nfs_worker: true +# use updates-testing for now to get 2023-05 updates +openqa_repo: updates-testing openqa_secret: "{{ prod_openqa_apisecret }}" openqa_workers: 4 primary_auth_source: ipa