diff --git a/src/mas/devops/data/catalogs/v9-master-amd64.yaml b/src/mas/devops/data/catalogs/v9-master-amd64.yaml new file mode 120000 index 00000000..832451ab --- /dev/null +++ b/src/mas/devops/data/catalogs/v9-master-amd64.yaml @@ -0,0 +1 @@ +v9-260625-amd64.yaml \ No newline at end of file diff --git a/src/mas/devops/templates/pipelinerun-update.yml.j2 b/src/mas/devops/templates/pipelinerun-update.yml.j2 index 1370379e..b957c398 100644 --- a/src/mas/devops/templates/pipelinerun-update.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-update.yml.j2 @@ -27,6 +27,10 @@ spec: # ------------------------------------------------------------------------- - name: mas_catalog_version value: "{{ mas_catalog_version }}" +{%- if mas_catalog_digest is defined and mas_catalog_digest != "" %} + - name: mas_catalog_digest + value: "{{ mas_catalog_digest }}" +{%- endif %} {%- if ibm_entitlement_key is defined and ibm_entitlement_key != "" %} # TODO: What even uses this, nothing in the update pipeline should be using this @@ -41,6 +45,12 @@ spec: - name: artifactory_token value: "{{ artifactory_token }}" {%- endif %} +{%- if mas_icr_cpopen is defined and mas_icr_cpopen != "" %} + # ICR registry override for dev mode + # ------------------------------------------------------------------------- + - name: mas_icr_cpopen + value: "{{ mas_icr_cpopen }}" +{%- endif %} {%- if skip_pre_check is defined and skip_pre_check != "" %} # Skip pre-check # ------------------------------------------------------------------------- diff --git a/src/mas/devops/templates/pipelinerun-upgrade.yml.j2 b/src/mas/devops/templates/pipelinerun-upgrade.yml.j2 index 86cf6726..258cd3fb 100644 --- a/src/mas/devops/templates/pipelinerun-upgrade.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-upgrade.yml.j2 @@ -41,6 +41,12 @@ spec: - name: skip_pre_check value: "{{ skip_pre_check }}" {%- endif %} +{%- if skip_compatibility_check is defined and skip_compatibility_check != "" %} + # Skip compatibility check + # ------------------------------------------------------------------------- + - name: skip_compatibility_check + value: "{{ skip_compatibility_check }}" +{%- endif %} {%- if artifactory_username is defined and artifactory_username != "" %} # Enable development catalogs diff --git a/test/src/test_data.py b/test/src/test_data.py index 40d59026..1d59d33c 100644 --- a/test/src/test_data.py +++ b/test/src/test_data.py @@ -32,7 +32,7 @@ def test_list_catalogs(): def test_get_newest_catalog_tag(): catalogTag = getNewestCatalogTag("amd64") # Reminder: update this test when adding a new catalog each month! - assert catalogTag == "v9-260730-amd64" + assert catalogTag == "v9-master-amd64" def test_get_newest_catalog_tag_fail():