openshift: use candidate version instead of dev-preview

karmab · Jan 21, 2025 · ac6c12e · ac6c12e
1 parent 3fbdc2f
commit ac6c12e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/kvirt/baseconfig.py b/kvirt/baseconfig.py
@@ -1138,7 +1138,7 @@ def download_openshift_installer(self, overrides={}):
             nightly = version == 'nightly'
             run = openshift.get_ci_installer(pull_secret, tag=tag, macosx=macosx, debug=self.debug, nightly=nightly,
                                              baremetal=baremetal)
-        elif version in ['dev-preview', 'stable', 'latest']:
+        elif version in ['candidate', 'stable', 'latest']:
             run = openshift.get_downstream_installer(version=version, tag=tag, macosx=macosx, debug=self.debug,
                                                      pull_secret=pull_secret, baremetal=baremetal)
         else:

diff --git a/kvirt/cluster/openshift/disconnected/mirror-config.yaml b/kvirt/cluster/openshift/disconnected/mirror-config.yaml
@@ -13,10 +13,10 @@ mirror:
     release: registry.ci.openshift.org/ocp/release:{{ tag }}
 {% else %}
     channels:
-    - name: {{ version }}-{{ release }}
+    - name: {{ 'candidate' if 'rc' in version }}-{{ release }}
 {% if tag|count('.') > 1 %}
-      minVersion: {{ disconnected_extra_release|default(tag)|min_ocp_version(tag) }}
-      maxVersion: {{ disconnected_extra_release|default(tag)|max_ocp_version(tag) }}
+      minVersion: {{ (disconnected_extra_release or tag)|min_ocp_version(tag) }}
+      maxVersion: {{ (disconnected_extra_release or tag)|max_ocp_version(tag) }}
 {% endif %}
 {% endif %}
     architectures:

diff --git a/kvirt/common/__init__.py b/kvirt/common/__init__.py
@@ -2600,7 +2600,7 @@ def detect_openshift_version(tag, OPENSHIFT_TAG):
     if 'rc' in tag:
         version = 'stable'
     elif '0-ec.' in str(tag):
-        version = 'dev-preview'
+        version = 'candidate'
     elif int(str(tag).split('.')[1]) > int(OPENSHIFT_TAG.split('.')[1]):
         version = 'ci'
     else:

diff --git a/kvirt/examples.py b/kvirt/examples.py
@@ -639,16 +639,16 @@
 $ kcli download openshift-install
 
 # Download older stable version
-$ kcli download openshift-install -P version=tag -P tag=4.14
+$ kcli download openshift-install -P version=stable -P tag=4.14
 
 # Download specific tag
-$ kcli download openshift-install -P version=tag -P tag=4.16.4
+$ kcli download openshift-install -P version=stable -P tag=4.16.4
 
 # Download nightly
 $ kcli download openshift-install -P version=nightly -P tag=4.16
 
-# Download dev-preview version
-$ kcli download openshift-install -P version=dev-preview -P tag=4.17
+# Download candidate version
+$ kcli download openshift-install -P tag=4.18.0-rc.5
 
 # Download older version from CI
 $ kcli download openshift-install -P version=ci -P tag=4.14