From 5546164ada6af8f180b38ad2d7f54807af3724db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Thu, 14 Dec 2023 12:12:23 +0100 Subject: [PATCH] bodhi2/pungi.rpm.conf.j2: Remove deprecated option Sync with changes from https://pagure.io/pungi-fedora/pull-request/1227 ``` [WARNING ] Variant-type source repository is deprecated and will be ignored during 'OSTree' phase: Everything [OSTREE_INSTALLER] [WARNING ] Variant-type source repository is deprecated and will be ignored during 'OSTreeInstaller' phase: None ``` See: https://pagure.io/pungi-fedora/pull-request/1227#comment-196106 --- roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index 6c8d0abd2f..58898acc7a 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -147,7 +147,6 @@ ostree = { "config_url": "https://pagure.io/workstation-ostree-config.git", "config_branch": "f[[ release.version ]]", "repo": [ - "Everything", [% if request.name == 'testing' %] # In the case of testing, also inject the last stable updates "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/$basearch/os/", @@ -180,7 +179,6 @@ ostree = { "config_url": "https://pagure.io/workstation-ostree-config.git", "config_branch": "f[[ release.version ]]", "repo": [ - "Everything", [% if request.name == 'testing' %] # In the case of testing, also inject the last stable updates "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/$basearch/os/", @@ -213,7 +211,6 @@ ostree = { "config_url": "https://pagure.io/workstation-ostree-config.git", "config_branch": "f[[ release.version ]]", "repo": [ - "Everything", [% if request.name == 'testing' %] # In the case of testing, also inject the last stable updates "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/$basearch/os/", @@ -245,7 +242,6 @@ ostree = { "config_url": "https://pagure.io/workstation-ostree-config.git", "config_branch": "f[[ release.version ]]", "repo": [ - "Everything", [% if request.name == 'testing' %] # In the case of testing, also inject the last stable updates "https://kojipkgs{{ env_suffix }}.fedoraproject.org/compose/updates/f[[ release.version_int ]]-updates/compose/Everything/$basearch/os/",