5.0 branch should not point to 4.3

uyuni-project · Oct 7, 2024 · 8e69cb3 · 8e69cb3
1 parent 8a66303
commit 8e69cb3
Showing 1 changed file with 63 additions and 4 deletions.
diff --git a/salt/repos/client_tools.sls b/salt/repos/client_tools.sls
@@ -84,14 +84,24 @@ tools_pool_repo:
     - refresh: True
 {% endif %} {# Released Tools Repos #}
 
-{% if 'nightly' in grains.get('product_version') | default('', true) %} {# Devel Tools Repos #}
+{% if '4.3-nightly' in grains.get('product_version') | default('', true) %} {# Devel Tools Repos #}
 
 tools_additional_repo:
   pkgrepo.managed:
     - baseurl: http://{{ grains.get("mirror") | default("download.suse.de", true) }}/ibs/Devel:/Galaxy:/Manager:/4.3:/SLE12-SUSE-Manager-Tools/images/repo/SLE-12-Manager-Tools-POOL-x86_64-Media1/
     - refresh: True
     - priority: 98
 
+{# TODO due to shared client tools, we also need 5.0 tools in 4.3 branch #}
+
+{% elif '5.0-nightly' in grains.get('product_version') | default('', true) %}
+
+tools_additional_repo:
+  pkgrepo.managed:
+    - baseurl: http://{{ grains.get("mirror") | default("download.suse.de", true) }}/ibs/Devel:/Galaxy:/Manager:/5.0:/SLE12-SUSE-Manager-Tools/SLE_12/
+    - refresh: True
+    - priority: 98
+
 {% elif 'head' in grains.get('product_version') | default('', true) %}
 
 tools_additional_repo:
@@ -147,14 +157,24 @@ tools_pool_repo:
 
 {% endif %} {# Released Tools repos #}
 
-{% if 'nightly' in grains.get('product_version') | default('', true) %} {# Devel Tools Repos #}
+{% if '4.3-nightly' in grains.get('product_version') | default('', true) %} {# Devel Tools Repos #}
 
 tools_additional_repo:
   pkgrepo.managed:
   - baseurl: http://{{ grains.get("mirror") | default("download.suse.de", true) }}/ibs/Devel:/Galaxy:/Manager:/4.3:/SLE15-SUSE-Manager-Tools/images/repo/SLE-15-Manager-Tools-POOL-x86_64-Media1/
   - refresh: True
   - priority: 98
 
+{# TODO due to shared client tools, we also need 5.0 tools in 4.3 branch #}
+
+{% elif '5.0-nightly' in grains.get('product_version') | default('', true) %}
+
+tools_additional_repo:
+  pkgrepo.managed:
+  - baseurl: http://{{ grains.get("mirror") | default("download.suse.de", true) }}/ibs/Devel:/Galaxy:/Manager:/5.0:/SLE15-SUSE-Manager-Tools/images/repo/SLE-15-Manager-Tools-POOL-x86_64-Media1/
+  - refresh: True
+  - priority: 98
+
 {% elif 'head' in grains.get('product_version') | default('', true) %}
 
 tools_additional_repo:
@@ -212,14 +232,24 @@ tools_pool_repo:
 
 {% endif %} {# Released Tools repos #}
 
-{% if 'nightly' in grains.get('product_version') | default('', true) %} {# Devel Tools Repos #}
+{% if '4.3-nightly' in grains.get('product_version') | default('', true) %} {# Devel Tools Repos #}
 
 tools_additional_repo:
   pkgrepo.managed:
   - baseurl: http://{{ grains.get("mirror") | default("download.suse.de", true) }}/ibs/Devel:/Galaxy:/Manager:/4.3:/SLE15-SUSE-Manager-Tools/images/repo/SLE-15-Manager-Tools-POOL-x86_64-Media1/
   - refresh: True
   - priority: 98
 
+{# TODO due to shared client tools, we also need 5.0 tools in 4.3 branch #}
+
+{% elif '5.0-nightly' in grains.get('product_version') | default('', true) %}
+
+tools_additional_repo:
+  pkgrepo.managed:
+  - baseurl: http://{{ grains.get("mirror") | default("download.suse.de", true) }}/ibs/Devel:/Galaxy:/Manager:/5.0:/SLE15-SUSE-Manager-Tools/images/repo/SLE-15-Manager-Tools-POOL-x86_64-Media1/
+  - refresh: True
+  - priority: 98
+
 {% elif 'head' in grains.get('product_version') | default('', true) %}
 
 tools_additional_repo:
@@ -300,7 +330,7 @@ tools_pool_repo:
       - cmd: uyuni_key
 {% endif %} {# Released Tools Repos #}
 
-{% if 'nightly' in grains.get('product_version') | default('', true) %} {# Devel Tools Repos #}
+{% if '4.3-nightly' in grains.get('product_version') | default('', true) %} {# Devel Tools Repos #}
 
 {% set rhlike_client_tools_prefix = 'EL' %}
 {% if release < 9 %}
@@ -320,6 +350,28 @@ tools_update_repo:
       - cmd: suse_res7_key
     {% endif %}
 
+{# TODO due to shared client tools, we also need 5.0 tools in 4.3 branch (RES 7 and CentOS 7 only) #}
+
+{% elif '5.0-nightly' in grains.get('product_version') | default('', true) %}
+
+{% set rhlike_client_tools_prefix = 'EL' %}
+{% if release < 9 %}
+{% set rhlike_client_tools_prefix = 'RES' %}
+{% endif %}
+
+tools_update_repo:
+  pkgrepo.managed:
+    - humanname: tools_update_repo
+    - baseurl: http://{{ grains.get("mirror") | default("download.suse.de", true) }}/ibs/Devel:/Galaxy:/Manager:/5.0:/{{ rhlike_client_tools_prefix }}{{ release }}-SUSE-Manager-Tools/SUSE_{{ rhlike_client_tools_prefix }}-{{ release }}_Update_standard/
+    - refresh: True
+    - require:
+      - cmd: galaxy_key
+    {% if release >= 9 %}
+      - cmd: suse_el9_key
+    {% else %}
+      - cmd: suse_res7_key
+    {% endif %}
+
 {% elif 'head' in grains.get('product_version') | default('', true) %}
 
 {% set rhlike_client_tools_prefix = 'EL' %}
@@ -517,6 +569,8 @@ tools_update_repo:
 {% set tools_repo_url = 'http://' + grains.get("mirror") | default("download.suse.de/ibs", true) + '/SUSE/Updates/Debian/' + release + '-CLIENT-TOOLS/x86_64/update/' %}
 {% elif '4.3-VM-released' in grains.get('product_version') | default('', true) %}
 {% set tools_repo_url = 'http://' + grains.get("mirror") | default("download.suse.de/ibs", true) + '/SUSE/Updates/Debian/' + release + '-CLIENT-TOOLS/x86_64/update/' %}
+{% elif '5.0-released' in grains.get('product_version') | default('', true) %}
+{% set tools_repo_url = 'http://' + grains.get("mirror") | default("download.suse.de/ibs", true) + '/SUSE/Updates/Debian/' + release + '-CLIENT-TOOLS/x86_64/update/' %}
 {% elif 'uyuni-master' in grains.get('product_version') | default('', true) %}
 {% set tools_repo_url = 'http://' + grains.get("mirror") | default("download.opensuse.org", true) + '/repositories/systemsmanagement:/Uyuni:/Master:/Debian' + release + '-Uyuni-Client-Tools/Debian_' + release %}
 {% else %}
@@ -549,6 +603,11 @@ tools_update_repo_raised_priority:
         Package: *
         Pin: release l=SUSE:Updates:Debian:{{ release }}-CLIENT-TOOLS:x86_64:update
         Pin-Priority: 800
+{% elif '5.0-released' in grains.get('product_version') | default('', true) %}
+    - contents: |
+        Package: *
+        Pin: release l=SUSE:Updates:Debian:{{ release }}-CLIENT-TOOLS:x86_64:update
+        Pin-Priority: 800
 {% elif 'uyuni-master' in grains.get('product_version') | default('', true) %}
     - contents: |
         Package: *