From 4885558f330a7641e3b3402901cf4d4f73759b3e Mon Sep 17 00:00:00 2001 From: whitfiea Date: Thu, 5 Feb 2026 13:44:12 +0000 Subject: [PATCH 1/3] Add to backup pipelinerun --- .../templates/pipelinerun-backup.yml.j2 | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/src/mas/devops/templates/pipelinerun-backup.yml.j2 b/src/mas/devops/templates/pipelinerun-backup.yml.j2 index 0ba2f124..f2a968fc 100644 --- a/src/mas/devops/templates/pipelinerun-backup.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-backup.yml.j2 @@ -103,4 +103,64 @@ spec: {% if artifactory_repository is defined and artifactory_repository != "" %} - name: artifactory_repository value: "{{ artifactory_repository }}" + {% endif %} + + # Manage Application Backup Configuration + {% if backup_manage_app is defined and backup_manage_app != "" %} + - name: backup_manage_app + value: "{{ backup_manage_app }}" + {% endif %} + {% if backup_manage_db is defined and backup_manage_db != "" %} + - name: backup_manage_db + value: "{{ backup_manage_db }}" + {% endif %} + {% if mas_app_id is defined and mas_app_id != "" %} + - name: mas_app_id + value: "{{ mas_app_id }}" + {% endif %} + {% if mas_workspace_id is defined and mas_workspace_id != "" %} + - name: mas_workspace_id + value: "{{ mas_workspace_id }}" + {% endif %} + {% if mas_app_backup_version is defined and mas_app_backup_version != "" %} + - name: mas_app_backup_version + value: "{{ mas_app_backup_version }}" + {% endif %} + + # Db2 Backup Configuration + {% if db2_namespace is defined and db2_namespace != "" %} + - name: db2_namespace + value: "{{ db2_namespace }}" + {% endif %} + {% if db2_instance_name is defined and db2_instance_name != "" %} + - name: db2_instance_name + value: "{{ db2_instance_name }}" + {% endif %} + {% if db2_backup_version is defined and db2_backup_version != "" %} + - name: db2_backup_version + value: "{{ db2_backup_version }}" + {% endif %} + {% if backup_type is defined and backup_type != "" %} + - name: backup_type + value: "{{ backup_type }}" + {% endif %} + {% if backup_vendor is defined and backup_vendor != "" %} + - name: backup_vendor + value: "{{ backup_vendor }}" + {% endif %} + {% if backup_s3_endpoint is defined and backup_s3_endpoint != "" %} + - name: backup_s3_endpoint + value: "{{ backup_s3_endpoint }}" + {% endif %} + {% if backup_s3_bucket is defined and backup_s3_bucket != "" %} + - name: backup_s3_bucket + value: "{{ backup_s3_bucket }}" + {% endif %} + {% if backup_s3_access_key is defined and backup_s3_access_key != "" %} + - name: backup_s3_access_key + value: "{{ backup_s3_access_key }}" + {% endif %} + {% if backup_s3_secret_key is defined and backup_s3_secret_key != "" %} + - name: backup_s3_secret_key + value: "{{ backup_s3_secret_key }}" {% endif %} \ No newline at end of file From d684bb1a3b9a64cc4fe554dccfbca0187f601107 Mon Sep 17 00:00:00 2001 From: whitfiea Date: Thu, 5 Feb 2026 16:56:14 +0000 Subject: [PATCH 2/3] remove unneeded versions --- src/mas/devops/templates/pipelinerun-backup.yml.j2 | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/mas/devops/templates/pipelinerun-backup.yml.j2 b/src/mas/devops/templates/pipelinerun-backup.yml.j2 index f2a968fc..39a7259f 100644 --- a/src/mas/devops/templates/pipelinerun-backup.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-backup.yml.j2 @@ -122,10 +122,6 @@ spec: - name: mas_workspace_id value: "{{ mas_workspace_id }}" {% endif %} - {% if mas_app_backup_version is defined and mas_app_backup_version != "" %} - - name: mas_app_backup_version - value: "{{ mas_app_backup_version }}" - {% endif %} # Db2 Backup Configuration {% if db2_namespace is defined and db2_namespace != "" %} @@ -136,10 +132,6 @@ spec: - name: db2_instance_name value: "{{ db2_instance_name }}" {% endif %} - {% if db2_backup_version is defined and db2_backup_version != "" %} - - name: db2_backup_version - value: "{{ db2_backup_version }}" - {% endif %} {% if backup_type is defined and backup_type != "" %} - name: backup_type value: "{{ backup_type }}" From ea4ae4772b886c48017c1bb1e5afc96a7ea90b3a Mon Sep 17 00:00:00 2001 From: whitfiea Date: Fri, 6 Feb 2026 13:04:40 +0000 Subject: [PATCH 3/3] update pr --- .../templates/pipelinerun-backup.yml.j2 | 42 +++++++++---------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/src/mas/devops/templates/pipelinerun-backup.yml.j2 b/src/mas/devops/templates/pipelinerun-backup.yml.j2 index 39a7259f..ac7cc072 100644 --- a/src/mas/devops/templates/pipelinerun-backup.yml.j2 +++ b/src/mas/devops/templates/pipelinerun-backup.yml.j2 @@ -114,31 +114,27 @@ spec: - name: backup_manage_db value: "{{ backup_manage_db }}" {% endif %} - {% if mas_app_id is defined and mas_app_id != "" %} - - name: mas_app_id - value: "{{ mas_app_id }}" - {% endif %} - {% if mas_workspace_id is defined and mas_workspace_id != "" %} - - name: mas_workspace_id - value: "{{ mas_workspace_id }}" + {% if manage_workspace_id is defined and manage_workspace_id != "" %} + - name: manage_workspace_id + value: "{{ manage_workspace_id }}" {% endif %} - # Db2 Backup Configuration - {% if db2_namespace is defined and db2_namespace != "" %} - - name: db2_namespace - value: "{{ db2_namespace }}" - {% endif %} - {% if db2_instance_name is defined and db2_instance_name != "" %} - - name: db2_instance_name - value: "{{ db2_instance_name }}" - {% endif %} - {% if backup_type is defined and backup_type != "" %} - - name: backup_type - value: "{{ backup_type }}" - {% endif %} - {% if backup_vendor is defined and backup_vendor != "" %} - - name: backup_vendor - value: "{{ backup_vendor }}" + # Manage Db2 Backup Configuration + {% if manage_db2_namespace is defined and manage_db2_namespace != "" %} + - name: manage_db2_namespace + value: "{{ manage_db2_namespace }}" + {% endif %} + {% if manage_db2_instance_name is defined and manage_db2_instance_name != "" %} + - name: manage_db2_instance_name + value: "{{ manage_db2_instance_name }}" + {% endif %} + {% if manage_db2_backup_type is defined and manage_db2_backup_type != "" %} + - name: manage_db2_backup_type + value: "{{ manage_db2_backup_type }}" + {% endif %} + {% if manage_db2_backup_vendor is defined and manage_db2_backup_vendor != "" %} + - name: manage_db2_backup_vendor + value: "{{ manage_db2_backup_vendor }}" {% endif %} {% if backup_s3_endpoint is defined and backup_s3_endpoint != "" %} - name: backup_s3_endpoint