Update ROSA urls, reenable, remove EOLed distros

Author: mikhailnov

repos.d/rpm/rosa.yaml

@@ -2,12 +2,9 @@
 # Rosa
 ###########################################################################
 # As per rosalinux Mikhail Novosyolov:
-# abf-downloads.rosalinux.ru is primary repository location
-# mirror.rosalab.ru is secondary mirror which does not contain unreleased repos (ROSA 2019.x ATOW)
-# XXX: check how abf-downloads behave, then switch all repos to it
-# NOTE: regarding valid_till, according to http://wiki.rosalab.ru/ru/index.php/Политика_выпуска_ROSA_Desktop,
-# releases are numbered <YEAR>.<HALF YEAR>, and are supported for 2 years. So for YYYY.1 we assume support
-# until <YYYY+2>.06.30. We've tried to contact rosa support regarding EoL dates, but with no success.
+# abf-downloads.rosa.ru is primary repository location, may be temporary inconsistent
+# mirror.rosa.ru is production repo which mirrors from abf-downloads.rosa.ru
+# Each platform (rosa2021.1, rosa13 etc.) is supported ~5 years.
 
 # Note: rosa2021.1+ does not have urpmi-compatible metadata
 # Note: rosa2019.1 was renamed to rosa2021.1, keeping old "name"
@@ -18,27 +15,27 @@
   family: rosa
   ruleset: [rosa, rpm]
   color: '3757a1'
-  #valid_till: 2023-06-30  # expected EoL, but in fact still supported
+  #valid_till: 2026-12-31  # probable EoL date
   minpackages: 11000
   sources:
     - name: [ main/release, non-free/release, contrib/release ]
       fetcher:
         class: RepodataFetcher
-        url: 'http://abf-downloads.rosalinux.ru/rosa2021.1/repository/SRPMS/{source}/'
+        url: 'http://mirror.rosa.ru/rosa/rosa2021.1/repository/SRPMS/{source}/'
       parser:
         class: RepodataParser
       subrepo: '{source}'
   repolinks:
     - desc: Rosa Linux home
-      url: http://en.rosalinux.com/
+      url: https://rosa.ru
   packagelinks:
     - type: PACKAGE_SOURCES
       url: 'https://abf.io/import/{srcname}/tree/rosa2021.1'
     - type: PACKAGE_RECIPE
       url: 'https://abf.io/import/{srcname}/blob/rosa2021.1/{srcname}.spec'
     - type: PACKAGE_RECIPE_RAW
       url: 'https://abf.io/import/{srcname}/raw/rosa2021.1/{srcname}.spec'
-  groups: [ all, rosa ]
+  groups: [ all, production, rosa ]
 
 - name: rosa_13
   sortname: rosa_2023_1
@@ -53,109 +50,19 @@
     - name: [ main/release, non-free/release, contrib/release ]
       fetcher:
         class: RepodataFetcher
-        url: 'http://abf-downloads.rosa.ru/rosa13/repository/SRPMS/{source}/'
+        url: 'http://mirror.rosa.ru/rosa/rosa13/repository/SRPMS/{source}/'
       parser:
         class: RepodataParser
       subrepo: '{source}'
   repolinks:
     - desc: Rosa Linux home
-      url: https://rosa.ru/
+      url: https://rosa.ru
   packagelinks:
     - type: PACKAGE_SOURCES
       url: 'https://abf.io/import/{srcname}/tree/rosa2023.1'
     - type: PACKAGE_RECIPE
       url: 'https://abf.io/import/{srcname}/blob/rosa2023.1/{srcname}.spec'
     - type: PACKAGE_RECIPE_RAW
       url: 'https://abf.io/import/{srcname}/raw/rosa2023.1/{srcname}.spec'
-  groups: [ all, rosa ]
-
-- name: rosa_server_6_9
-  type: repository
-  desc: Rosa Server 6.9
-  statsgroup: Rosa Server
-  family: centos
-  ruleset: [centos, rpm, rosa]
-  color: '3757a1'
-  minpackages: 3000
-  default_maintainer: fallback-mnt-rosa@repology
-  sources:
-    - name: [ base/release, base/updates, contrib/release, contrib/updates, extra/release, extra/updates ]
-      fetcher:
-        class: RepodataFetcher
-        url: 'http://mirror.rosalab.ru/rosa/server/6.9/repository/SRPMS/{source}/'
-      parser:
-        class: RepodataParser
-        vertags: res
-      subrepo: '{source}'
-  repolinks:
-    - desc: Rosa Linux home
-      url: http://en.rosalinux.com/
-  # 75% of these broken, no such branch
-  #packagelinks:
-  #  - type: PACKAGE_SOURCES
-  #    url: 'https://abf.io/server/{srcname}/tree/rosa-server69'
-  #  - type: PACKAGE_RECIPE
-  #    url: 'https://abf.io/server/{srcname}/blob/rosa-server69/{srcname}.spec'
-  #  - type: PACKAGE_RECIPE_RAW
-  #    url: 'https://abf.io/server/{srcname}/raw/rosa-server69/{srcname}.spec'
   groups: [ all, production, rosa ]
 
-- name: rosa_server_7_3
-  type: repository
-  desc: Rosa Server 7.3
-  statsgroup: Rosa Server
-  family: centos
-  ruleset: [centos, rpm, rosa]
-  color: '3757a1'
-  minpackages: 3000
-  default_maintainer: fallback-mnt-rosa@repology
-  sources:
-    - name: [ base/release, extra/release ]
-      fetcher:
-        class: RepodataFetcher
-        url: 'http://mirror.rosalab.ru/rosa/server/7.3/repository/SRPMS/{source}/'
-      parser:
-        class: RepodataParser
-        vertags: res
-      subrepo: '{source}'
-  repolinks:
-    - desc: Rosa Linux home
-      url: http://en.rosalinux.com/
-  packagelinks:
-    - type: PACKAGE_SOURCES
-      url: 'https://abf.io/server7/{srcname}/tree/rosa-server73'
-    - type: PACKAGE_RECIPE
-      url: 'https://abf.io/server7/{srcname}/blob/rosa-server73/{srcname}.spec'
-    - type: PACKAGE_RECIPE_RAW
-      url: 'https://abf.io/server7/{srcname}/raw/rosa-server73/{srcname}.spec'
-  groups: [ all, production, rosa ]
-
-- name: rosa_server_7_5
-  type: repository
-  desc: Rosa Server 7.5
-  statsgroup: Rosa Server
-  family: centos
-  ruleset: [centos, rpm, rosa]
-  color: '3757a1'
-  minpackages: 4200 # XXX
-  default_maintainer: fallback-mnt-rosa@repology
-  sources:
-    - name: [ base/release, extra/release ]
-      fetcher:
-        class: RepodataFetcher
-        url: 'http://mirror.rosalab.ru/rosa/server/7.5/repository/SRPMS/{source}/'
-      parser:
-        class: RepodataParser
-        vertags: res
-      subrepo: '{source}'
-  repolinks:
-    - desc: Rosa Linux home
-      url: http://en.rosalinux.com/
-  packagelinks:
-    - type: PACKAGE_SOURCES
-      url: 'https://abf.io/server7/{srcname}/tree/rosa-server75'
-    - type: PACKAGE_RECIPE
-      url: 'https://abf.io/server7/{srcname}/blob/rosa-server75/{srcname}.spec'
-    - type: PACKAGE_RECIPE_RAW
-      url: 'https://abf.io/server7/{srcname}/raw/rosa-server75/{srcname}.spec'
-  groups: [ all, production, rosa ]