From 875757fe554796002eb45295cf3fd83e85e44470 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Jul 26 2022 17:40:12 +0000
Subject: Merge branch 'cboltz-releasever' into 'production'


update repo paths for 15.4 and Tumbleweed

See merge request infra/salt!560
---

diff --git a/pillar/role/common/wiki.sls b/pillar/role/common/wiki.sls
index d00c767..6d1d4ec 100644
--- a/pillar/role/common/wiki.sls
+++ b/pillar/role/common/wiki.sls
@@ -8,7 +8,11 @@ sudoers:
 zypper:
   repositories:
     openSUSE:infrastructure:wiki:
+      {% if grains.get('osrelease') == '15.3' %}
       baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/wiki/openSUSE_Leap_$releasever/
+      {% else %}
+      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/wiki/$releasever/
+      {% endif %}
       gpgcheck: 0
       priority: 100
       refresh: True
diff --git a/pillar/role/ipsilon.sls b/pillar/role/ipsilon.sls
index c6618cf..8d84a5e 100644
--- a/pillar/role/ipsilon.sls
+++ b/pillar/role/ipsilon.sls
@@ -19,6 +19,6 @@ sudoers:
 zypper:
   repositories:
     openSUSE:infrastructure:ipsilon:
-      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/ipsilon/openSUSE_Leap_$releasever/
+      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/ipsilon/$releasever/
       priority: 100
       refresh: True
diff --git a/pillar/role/jekyll_master.sls b/pillar/role/jekyll_master.sls
index 088487c..396fe20 100644
--- a/pillar/role/jekyll_master.sls
+++ b/pillar/role/jekyll_master.sls
@@ -34,10 +34,10 @@ profile:
 zypper:
   repositories:
     openSUSE:infrastructure:jekyll:
-      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/jekyll/openSUSE_Leap_$releasever/
+      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/jekyll/$releasever/
       priority: 100
       refresh: True
     devel:languages:ruby:
-      baseurl: http://download.infra.opensuse.org/repositories/devel:/languages:/ruby/openSUSE_Leap_$releasever/
+      baseurl: http://download.infra.opensuse.org/repositories/devel:/languages:/ruby/$releasever/
       priority: 100
       refresh: True
diff --git a/pillar/role/matrix.sls b/pillar/role/matrix.sls
index 207de0e..0b89332 100644
--- a/pillar/role/matrix.sls
+++ b/pillar/role/matrix.sls
@@ -239,9 +239,9 @@ apparmor:
 zypper:
   repositories:
     openSUSE:infrastructure:matrix:
-      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/matrix/openSUSE_Leap_$releasever/
+      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/matrix/openSUSE_Tumbleweed/
       priority: 100
       refresh: True
-    devel:languages:python:backports:
-      baseurl: https://download.opensuse.org/repositories/devel:/languages:/python:/backports/openSUSE_Leap_$releasever/
-      refresh: True
+#   devel:languages:python:backports:
+#     baseurl: https://download.opensuse.org/repositories/devel:/languages:/python:/backports/openSUSE_Leap_$releasever/
+#     refresh: True
diff --git a/pillar/role/pagure.sls b/pillar/role/pagure.sls
index 95320f7..073f591 100644
--- a/pillar/role/pagure.sls
+++ b/pillar/role/pagure.sls
@@ -120,6 +120,6 @@ nginx:
 zypper:
   repositories:
     openSUSE:infrastructure:pagure:
-      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/pagure/openSUSE_Leap_$releasever/
+      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/pagure/$releasever/
       priority: 100
       refresh: True
diff --git a/pillar/role/postgresql.sls b/pillar/role/postgresql.sls
index 82aa3a3..ba4bdfb 100644
--- a/pillar/role/postgresql.sls
+++ b/pillar/role/postgresql.sls
@@ -35,6 +35,6 @@ zypper:
     monitoring-plugins-postgres: {}
   repositories:
     server_database_postgresql:
-      baseurl: http://download.infra.opensuse.org/repositories/server:/database:/postgresql/openSUSE_Leap_$releasever/
+      baseurl: http://download.infra.opensuse.org/repositories/server:/database:/postgresql/$releasever/
       priority: 99
       refresh: True
diff --git a/pillar/role/web_elections.sls b/pillar/role/web_elections.sls
index 7406e3a..9643d26 100644
--- a/pillar/role/web_elections.sls
+++ b/pillar/role/web_elections.sls
@@ -52,6 +52,6 @@ profile:
 zypper:
   repositories:
     openSUSE:infrastructure:elections.opensuse.org:
-      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/elections.opensuse.org/openSUSE_Leap_$releasever/
+      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/elections.opensuse.org/$releasever/
       priority: 100
       refresh: True
diff --git a/pillar/role/web_tsp.sls b/pillar/role/web_tsp.sls
index 574f603..a7c5938 100644
--- a/pillar/role/web_tsp.sls
+++ b/pillar/role/web_tsp.sls
@@ -46,6 +46,6 @@ sudoers:
 zypper:
   repositories:
     openSUSE:infrastructure:tsp:
-      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/tsp/openSUSE_Leap_$releasever/
+      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/tsp/$releasever/
       priority: 100
       refresh: True
diff --git a/pillar/salt_cluster/opensuse/osfullname/Leap.sls b/pillar/salt_cluster/opensuse/osfullname/Leap.sls
index 82d56d2..e666d7b 100644
--- a/pillar/salt_cluster/opensuse/osfullname/Leap.sls
+++ b/pillar/salt_cluster/opensuse/osfullname/Leap.sls
@@ -1,7 +1,11 @@
 zypper:
   repositories:
     openSUSE:infrastructure:
+      {% if grains.get('osrelease') in ('15.2', '15.3') %}
       baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure/openSUSE_Leap_$releasever/
+      {% else %}
+      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure/$releasever/
+      {% endif %}
       gpgautoimport: True
       priority: 100
       refresh: True