From 86c747de99c1b06e243a421f27e74eb634d5ca00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Tue, 7 Sep 2021 16:55:56 +0200 Subject: [PATCH] retrace: Update and clean up inventory files * Only support one Fedora release (34) on staging retrace. * Update list of removed versions on staging. * Support CentOS 7 and 8 on production instance. * Update repository URLs, remove dead links. --- .../retrace-stg.aws.fedoraproject.org | 40 +++++++++---------- .../retrace03.rdu-cc.fedoraproject.org | 40 ++++++++++++------- 2 files changed, 44 insertions(+), 36 deletions(-) diff --git a/inventory/host_vars/retrace-stg.aws.fedoraproject.org b/inventory/host_vars/retrace-stg.aws.fedoraproject.org index 945aece9bf..d55126ced5 100644 --- a/inventory/host_vars/retrace-stg.aws.fedoraproject.org +++ b/inventory/host_vars/retrace-stg.aws.fedoraproject.org @@ -12,9 +12,10 @@ public_hostname: retrace-stg.aws.fedoraproject.org faf_server_name: retrace-stg.aws.fedoraproject.org/faf rs_use_faf_packages: true -# we do not have enough storage on stg -rs_internal_fedora_vers: [34, rawhide] -rs_internal_fedora_vers_removed: [31, 32, 33] +# Staging only has a little storage, so we only support one release at a time. +rs_internal_fedora_vers: [34] +rs_internal_fedora_vers_removed: [31, 32, 33, rawhide] +rs_internal_centos_vers: [] rs_internal_arch_list: [source, x86_64] # List of supported operating systems @@ -56,34 +57,16 @@ faf_repos: - name: 'fedora-34-source' url: - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/source/tree/' - - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/34/Everything/source/tree/' arch: 'src' opsys: 'Fedora 34' - name: 'fedora-34-x86_64' url: - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/x86_64/os/' - - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/34/Everything/x86_64/os/' arch: 'x86_64' opsys: 'Fedora 34' - name: 'fedora-34-x86_64-debug' url: - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/x86_64/debug/tree/' - - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/34/Everything/x86_64/debug/tree/' - arch: 'x86_64' - opsys: 'Fedora 34' - - name: 'fedora-34-x86_64-testing-debug' - url: - - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/34/Everything/x86_64/debug/' - arch: 'x86_64' - opsys: 'Fedora 34' - - name: 'fedora-34-x86_64-testing' - url: - - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/34/Everything/x86_64/' - arch: 'x86_64' - opsys: 'Fedora 34' - - name: 'fedora-34-x86_64-updates-debug' - url: - - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/34/Everything/x86_64/debug/' arch: 'x86_64' opsys: 'Fedora 34' - name: 'fedora-34-x86_64-updates' @@ -91,4 +74,19 @@ faf_repos: - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/34/Everything/x86_64/' arch: 'x86_64' opsys: 'Fedora 34' + - name: 'fedora-34-x86_64-updates-debug' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/34/Everything/x86_64/debug/' + arch: 'x86_64' + opsys: 'Fedora 34' + - name: 'fedora-34-x86_64-testing' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/34/Everything/x86_64/' + arch: 'x86_64' + opsys: 'Fedora 34' + - name: 'fedora-34-x86_64-testing-debug' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/34/Everything/x86_64/debug/' + arch: 'x86_64' + opsys: 'Fedora 34' ... diff --git a/inventory/host_vars/retrace03.rdu-cc.fedoraproject.org b/inventory/host_vars/retrace03.rdu-cc.fedoraproject.org index 53fbc487b3..69829e4c3f 100644 --- a/inventory/host_vars/retrace03.rdu-cc.fedoraproject.org +++ b/inventory/host_vars/retrace03.rdu-cc.fedoraproject.org @@ -7,6 +7,7 @@ rs_use_faf_packages: true # we do not have enough storage on stg rs_internal_fedora_vers: [33, 34, 35, rawhide] rs_internal_fedora_vers_removed: [30, 31, 32] +rs_internal_centos_vers: [7, 8] rs_internal_arch_list: [source, x86_64] # consumed by roles/copr/certbot @@ -47,19 +48,16 @@ faf_repos: - name: 'fedora-33-source' url: - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/33/Everything/source/tree/' - - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/33/Everything/source/tree/' arch: 'src' opsys: 'Fedora 33' - name: 'fedora-33-x86_64' url: - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/33/Everything/x86_64/os/' - - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/33/Everything/x86_64/os/' arch: 'x86_64' opsys: 'Fedora 33' - name: 'fedora-33-x86_64-debug' url: - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/33/Everything/x86_64/debug/tree/' - - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/33/Everything/x86_64/debug/tree/' arch: 'x86_64' opsys: 'Fedora 33' - name: 'fedora-33-x86_64-testing-debug' @@ -86,29 +84,21 @@ faf_repos: - name: 'fedora-34-source' url: - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/source/tree/' - - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/34/Everything/source/tree/' arch: 'src' opsys: 'Fedora 34' - name: 'fedora-34-x86_64' url: - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/x86_64/os/' - - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/34/Everything/x86_64/os/' arch: 'x86_64' opsys: 'Fedora 34' - name: 'fedora-34-x86_64-debug' url: - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/x86_64/debug/tree/' - - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/34/Everything/x86_64/debug/tree/' arch: 'x86_64' opsys: 'Fedora 34' - - name: 'fedora-34-x86_64-testing-debug' + - name: 'fedora-34-x86_64-updates' url: - - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/34/Everything/x86_64/debug/' - arch: 'x86_64' - opsys: 'Fedora 34' - - name: 'fedora-34-x86_64-testing' - url: - - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/34/Everything/x86_64/' + - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/34/Everything/x86_64/' arch: 'x86_64' opsys: 'Fedora 34' - name: 'fedora-34-x86_64-updates-debug' @@ -116,9 +106,14 @@ faf_repos: - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/34/Everything/x86_64/debug/' arch: 'x86_64' opsys: 'Fedora 34' - - name: 'fedora-34-x86_64-updates' + - name: 'fedora-34-x86_64-testing' url: - - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/34/Everything/x86_64/' + - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/34/Everything/x86_64/' + arch: 'x86_64' + opsys: 'Fedora 34' + - name: 'fedora-34-x86_64-testing-debug' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/34/Everything/x86_64/debug/' arch: 'x86_64' opsys: 'Fedora 34' # Fedora 35 repositories ------------------------------------------------ @@ -160,4 +155,19 @@ faf_repos: - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/35/Everything/x86_64/' arch: 'x86_64' opsys: 'Fedora 35' + # Fedora Rawhide repositories ------------------------------------------- + - name: 'fedora-rawhide-source' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/' + arch: 'src' + opsys: 'Fedora Rawhide' + - name: 'fedora-rawhide-x86_64' + url: + arch: 'x86_64' + opsys: 'Fedora Rawhide' + - name: 'fedora-rawhide-x86_64-debug' + url: + - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/debug/tree/' + arch: 'x86_64' + opsys: 'Fedora Rawhide' ...