Merge pull request #6081 from sjug/fix-manage-repos

USHIFT-6457: Update manage-repos to handle latest repo path as well as ec builds

Author: openshift-merge-bot[bot]

ansible/roles/manage-repos/defaults/main.yml

@@ -1,11 +1,15 @@
 ---
 # manage-repos default vars
 
-microshift_version: 4.19
-ocp_version: "{{ microshift_version.split('.')[0] }}.{{ microshift_version.split('.')[1] }}"
+microshift_version: 4.20
+microshift_version_clean: "{{ microshift_version | regex_replace('^latest-', '') }}"
+ocp_version: "{{ microshift_version_clean.split('.')[0] }}.{{ microshift_version_clean.split('.')[1] }}"
+microshift_base_url: "{{ 'ocp-dev-preview' if 'ec' in microshift_version else 'ocp' }}"
 repo_list:
-  - { repo_name: 'microshift-{{ ocp_version }}-for-rhel-{{ ansible_distribution_major_version }}-mirrorbeta-{{ ansible_architecture }}-rpms', repo_url: "https://mirror.openshift.com/pub/openshift-v4/{{ ansible_architecture }}/microshift/ocp/{{ microshift_version }}/el9/os/"}
-  - { repo_name: 'microshift-{{ ocp_version }}-deps-for-rhel-{{ ansible_distribution_major_version }}-mirrorbeta-{{ ansible_architecture }}-rpms', repo_url: "https://mirror.openshift.com/pub/openshift-v4/{{ ansible_architecture }}/dependencies/rpms/{{ ocp_version }}-el9-beta/" }
+  - repo_name: 'microshift-{{ ocp_version }}-for-rhel-{{ ansible_distribution_major_version }}-mirrorbeta-{{ ansible_architecture }}-rpms'
+    repo_url: "https://mirror.openshift.com/pub/openshift-v4/{{ ansible_architecture }}/microshift/{{ microshift_base_url }}/{{ microshift_version }}/el9/os/"
+  - repo_name: 'microshift-{{ ocp_version }}-deps-for-rhel-{{ ansible_distribution_major_version }}-mirrorbeta-{{ ansible_architecture }}-rpms'
+    repo_url: "https://mirror.openshift.com/pub/openshift-v4/{{ ansible_architecture }}/dependencies/rpms/{{ ocp_version }}-el9-beta/"
 
 rhel_beta: ''
 rhel_repos:

ansible/roles/manage-repos/tasks/main.yml

@@ -38,7 +38,7 @@
 
   - name: Set microshift_prerelease if microshift_version is a prerelease
     ansible.builtin.set_fact:
-      microshift_prerelease: "{{ 'rc' in microshift_version or 'ec' in microshift_version }}"
+      microshift_prerelease: "{{ 'rc' in microshift_version or 'ec' in microshift_version or 'latest' in microshift_version }}"
 
   - name: Create microshift prerelease mirrors
     include_tasks: roles/manage-repos/tasks/create-mirrors.yaml

ansible/vars/microshift_versions.yml

@@ -17,4 +17,10 @@ microshift_versions:
     all_pods: 9 
   "4.19":
     expected_pods: 6
-    all_pods: 9 
+    all_pods: 9
+  "4.20":
+    expected_pods: 6
+    all_pods: 9
+  "4.21":
+    expected_pods: 6
+    all_pods: 9