From 0f66eaef16f85e314202b92b4ff340f94450e209 Mon Sep 17 00:00:00 2001
From: terc1997 <64480693+terc1997@users.noreply.github.com>
Date: Mon, 18 May 2026 11:41:10 -0300
Subject: [PATCH 1/4] [patch] add DB2 license file support to FVT update task

---
 tekton/src/tasks/fvt/mas-fvt-start-update.yml.j2 | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tekton/src/tasks/fvt/mas-fvt-start-update.yml.j2 b/tekton/src/tasks/fvt/mas-fvt-start-update.yml.j2
index ffd223e3dcc..ed319049e38 100644
--- a/tekton/src/tasks/fvt/mas-fvt-start-update.yml.j2
+++ b/tekton/src/tasks/fvt/mas-fvt-start-update.yml.j2
@@ -11,7 +11,11 @@ spec:
     - name: start-update
       script: |
         #!/usr/bin/env bash
-        mas update --catalog $MAS_CATALOG_VERSION_UPDATE $CLI_UPDATE_EXTRA_FLAGS --no-confirm
+        if [[ -n "DB2_LICENSE" ]]; then
+          mas update --catalog $MAS_CATALOG_VERSION_UPDATE $CLI_UPDATE_EXTRA_FLAGS --no-confirm
+        else
+          mas update --catalog $MAS_CATALOG_VERSION_UPDATE $CLI_UPDATE_EXTRA_FLAGS --db2-license-file $DB2_LICENSE --no-confirm
+        fi
         RESULT=$1
         echo 'MAS LOG'
         echo '--------------------------------------------------------------------------------'
@@ -35,3 +39,9 @@ spec:
               name: mas-fvt-update
               key: CLI_UPDATE_EXTRA_FLAGS
               optional: true
+        - name: DB2_LICENSE
+          valueFrom:
+            secretKeyRef:
+              name: mas-fvt-update
+              key: DB2_LICENSE
+              optional: true

From e1288b3d699736e076e9be54ac483c3c7a77ee96 Mon Sep 17 00:00:00 2001
From: terc1997 <64480693+terc1997@users.noreply.github.com>
Date: Tue, 19 May 2026 17:53:28 -0300
Subject: [PATCH 2/4] [patch] correct DB2 license file handling in FVT update
 task

---
 tekton/src/tasks/fvt/mas-fvt-start-update.yml.j2 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tekton/src/tasks/fvt/mas-fvt-start-update.yml.j2 b/tekton/src/tasks/fvt/mas-fvt-start-update.yml.j2
index ed319049e38..d692600a765 100644
--- a/tekton/src/tasks/fvt/mas-fvt-start-update.yml.j2
+++ b/tekton/src/tasks/fvt/mas-fvt-start-update.yml.j2
@@ -11,10 +11,11 @@ spec:
     - name: start-update
       script: |
         #!/usr/bin/env bash
-        if [[ -n "DB2_LICENSE" ]]; then
+        if [[ -n "$DB2_LICENSE" ]]; then
           mas update --catalog $MAS_CATALOG_VERSION_UPDATE $CLI_UPDATE_EXTRA_FLAGS --no-confirm
         else
-          mas update --catalog $MAS_CATALOG_VERSION_UPDATE $CLI_UPDATE_EXTRA_FLAGS --db2-license-file $DB2_LICENSE --no-confirm
+          echo $DB2_LICENSE >> $(pwd)/db2_license.lic
+          mas update --catalog $MAS_CATALOG_VERSION_UPDATE $CLI_UPDATE_EXTRA_FLAGS --db2-license-file $(pwd)/db2_license.lic --no-confirm
         fi
         RESULT=$1
         echo 'MAS LOG'

From b8144eeab327bfecbfc40bd3b3ec9ea879b793cd Mon Sep 17 00:00:00 2001
From: terc1997 <64480693+terc1997@users.noreply.github.com>
Date: Wed, 20 May 2026 15:04:57 -0300
Subject: [PATCH 3/4] [patch] decode base64 DB2 license before writing to file

---
 tekton/src/tasks/fvt/mas-fvt-start-update.yml.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tekton/src/tasks/fvt/mas-fvt-start-update.yml.j2 b/tekton/src/tasks/fvt/mas-fvt-start-update.yml.j2
index d692600a765..2d1432040c6 100644
--- a/tekton/src/tasks/fvt/mas-fvt-start-update.yml.j2
+++ b/tekton/src/tasks/fvt/mas-fvt-start-update.yml.j2
@@ -14,7 +14,7 @@ spec:
         if [[ -n "$DB2_LICENSE" ]]; then
           mas update --catalog $MAS_CATALOG_VERSION_UPDATE $CLI_UPDATE_EXTRA_FLAGS --no-confirm
         else
-          echo $DB2_LICENSE >> $(pwd)/db2_license.lic
+          echo $DB2_LICENSE | base64 -d >> $(pwd)/db2_license.lic
           mas update --catalog $MAS_CATALOG_VERSION_UPDATE $CLI_UPDATE_EXTRA_FLAGS --db2-license-file $(pwd)/db2_license.lic --no-confirm
         fi
         RESULT=$1

From ac9ffebbd66ebc5c227dcb7d35d52847e6f2be3f Mon Sep 17 00:00:00 2001
From: terc1997 <64480693+terc1997@users.noreply.github.com>
Date: Wed, 20 May 2026 17:33:46 -0300
Subject: [PATCH 4/4] [patch] correct DB2 license file handling and condition
 check

---
 tekton/src/tasks/fvt/mas-fvt-start-update.yml.j2 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tekton/src/tasks/fvt/mas-fvt-start-update.yml.j2 b/tekton/src/tasks/fvt/mas-fvt-start-update.yml.j2
index 2d1432040c6..3611ed3e5ee 100644
--- a/tekton/src/tasks/fvt/mas-fvt-start-update.yml.j2
+++ b/tekton/src/tasks/fvt/mas-fvt-start-update.yml.j2
@@ -11,13 +11,13 @@ spec:
     - name: start-update
       script: |
         #!/usr/bin/env bash
-        if [[ -n "$DB2_LICENSE" ]]; then
-          mas update --catalog $MAS_CATALOG_VERSION_UPDATE $CLI_UPDATE_EXTRA_FLAGS --no-confirm
+        if [[ -n "$DB2_LICENSE" && "$CLI_UPDATE_EXTRA_FLAGS" == *"--db2-v12-upgrade"* ]]; then
+          echo "$DB2_LICENSE" | base64 -d > "$(pwd)/db2_license.lic"
+          mas update --catalog "$MAS_CATALOG_VERSION_UPDATE" $CLI_UPDATE_EXTRA_FLAGS --db2-license-file "$(pwd)/db2_license.lic" --no-confirm
         else
-          echo $DB2_LICENSE | base64 -d >> $(pwd)/db2_license.lic
-          mas update --catalog $MAS_CATALOG_VERSION_UPDATE $CLI_UPDATE_EXTRA_FLAGS --db2-license-file $(pwd)/db2_license.lic --no-confirm
+          mas update --catalog "$MAS_CATALOG_VERSION_UPDATE" $CLI_UPDATE_EXTRA_FLAGS --no-confirm
         fi
-        RESULT=$1
+        RESULT=$?
         echo 'MAS LOG'
         echo '--------------------------------------------------------------------------------'
         cat mas.log