From 62c1ce2d1291c009ed4340cf4e6b7ceef0e28158 Mon Sep 17 00:00:00 2001 From: Parveen Kumar Date: Fri, 3 Jul 2026 22:54:47 +0530 Subject: [PATCH 1/3] [patch] Add mas_catalog_digest to pipelinerun-update template --- src/mas/devops/data/catalogs/v9-master-amd64.yaml | 1 + src/mas/devops/templates/pipelinerun-update.yml.j2 | 4 ++++ src/mas/devops/templates/pipelinerun-upgrade.yml.j2 | 6 ++++++ 3 files changed, 11 insertions(+) create mode 120000 src/mas/devops/data/catalogs/v9-master-amd64.yaml 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..d7ab15ce 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 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 From ec9115bc431be5be7aa64dd29f303f7c9b5d81a6 Mon Sep 17 00:00:00 2001 From: Parveen Kumar Date: Tue, 7 Jul 2026 14:25:58 +0530 Subject: [PATCH 2/3] [patch] Add mas_icr_cpopen env to pipelinerun template Add a conditional environment variable mas_icr_cpopen to src/mas/devops/templates/pipelinerun-update.yml.j2. When mas_icr_cpopen is defined and non-empty the template emits an env entry (ICR registry override for dev mode). No other behavior changed; the block is inserted before the existing skip_pre_check section. --- src/mas/devops/templates/pipelinerun-update.yml.j2 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/mas/devops/templates/pipelinerun-update.yml.j2 b/src/mas/devops/templates/pipelinerun-update.yml.j2 index d7ab15ce..b957c398 100644 --- a/src/mas/devops/templates/pipelinerun-update.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-update.yml.j2 @@ -45,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 # ------------------------------------------------------------------------- From 00870dcf4ff963a9a0ea9a1bed533b7a799bd81f Mon Sep 17 00:00:00 2001 From: Parveen Kumar Date: Tue, 7 Jul 2026 14:33:31 +0530 Subject: [PATCH 3/3] [patch] update assert catalogTag == "v9-master-amd64" --- test/src/test_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/src/test_data.py b/test/src/test_data.py index c7a7345e..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-260625-amd64" + assert catalogTag == "v9-master-amd64" def test_get_newest_catalog_tag_fail():