From 6637e06ad07c713aaa9a7ea0737e3adaffa34f82 Mon Sep 17 00:00:00 2001 From: Jaydip Golviya Date: Fri, 10 Jul 2026 12:24:25 +0530 Subject: [PATCH 01/13] Update gitops_aiservice_tenant --- image/cli/mascli/functions/gitops_aiservice_tenant | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/image/cli/mascli/functions/gitops_aiservice_tenant b/image/cli/mascli/functions/gitops_aiservice_tenant index b742c68e8f..bd1239a545 100644 --- a/image/cli/mascli/functions/gitops_aiservice_tenant +++ b/image/cli/mascli/functions/gitops_aiservice_tenant @@ -482,14 +482,14 @@ fi WATSONXAI_APIKEY_VALUE=$(sm_get_secret_value "$WATSONX_SECRET" "watsonxai_apikey") if [[ -z "$WATSONXAI_APIKEY_VALUE" || "$WATSONXAI_APIKEY_VALUE" == "null" ]]; then echo_warning "Watson AI API key not found in secret: ${WATSONX_SECRET}" - exit 1 + # exit 1 fi export SECRET_KEY_WATSONXAI_APIKEY=${WATSONX_SECRET}#watsonxai_apikey WATSONXAI_PROJECT_ID_VALUE=$(sm_get_secret_value "$WATSONX_SECRET" "watsonxai_project_id") if [[ -z "$WATSONXAI_PROJECT_ID_VALUE" || "$WATSONXAI_PROJECT_ID_VALUE" == "null" ]]; then echo_warning "Watson AI project ID not found in secret: ${WATSONX_SECRET}" - exit 1 + # exit 1 fi export AISERVICE_WATSONXAI_PROJECT_ID=${WATSONX_SECRET}#watsonxai_project_id @@ -510,15 +510,16 @@ fi # check for those variables present into the aws sm sm_verify_secret_exists ${SECRETS_PREFIX}ibm_entitlement "image_pull_secret_b64,entitlement_key" + if [[ "${IS_GITOPS_FVT_ENV}" != "true" ]]; then sm_verify_secret_exists ${SECRETS_PREFIX}dro "dro_api_token,dro_ca_b64enc" + sm_verify_secret_exists ${SECRETS_PREFIX}watsonx "watsonxai_apikey,watsonxai_project_id" if [ -z "$STANDALONE_SLS_SERVICE" ]; then # In GitOps FVT environment, skip SLS secret verification as they will be created by postSync job sm_verify_secret_exists ${SLS_SECRETS_PREFIX}sls "slscfg_registration_key,slscfg_ca_b64enc" else sm_verify_secret_exists ${SLS_SECRETS_PREFIX}sls "registration_key,ca_b64,sls_url" fi - sm_verify_secret_exists ${SECRETS_PREFIX}watsonx "watsonxai_apikey,watsonxai_project_id" else echo "GitOps FVT Environment: Skipping SLS secret verification (will be created by postSync job)" fi From 09287255f108d8b592bf12ba27b1c4d8b97b424f Mon Sep 17 00:00:00 2001 From: Jaydip Golviya Date: Thu, 16 Jul 2026 12:25:59 +0530 Subject: [PATCH 02/13] Update gitops_aiservice_tenant --- .../cli/mascli/functions/gitops_aiservice_tenant | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/image/cli/mascli/functions/gitops_aiservice_tenant b/image/cli/mascli/functions/gitops_aiservice_tenant index bd1239a545..a3654bfc3d 100644 --- a/image/cli/mascli/functions/gitops_aiservice_tenant +++ b/image/cli/mascli/functions/gitops_aiservice_tenant @@ -478,19 +478,7 @@ fi #watsonx WATSONX_SECRET="${ACCOUNT_ID}${SECRETS_KEY_SEPERATOR}${CLUSTER_ID}${SECRETS_KEY_SEPERATOR}${AISERVICE_INSTANCE_ID}${SECRETS_KEY_SEPERATOR}${TENANT_ID}${SECRETS_KEY_SEPERATOR}watsonx" - - WATSONXAI_APIKEY_VALUE=$(sm_get_secret_value "$WATSONX_SECRET" "watsonxai_apikey") - if [[ -z "$WATSONXAI_APIKEY_VALUE" || "$WATSONXAI_APIKEY_VALUE" == "null" ]]; then - echo_warning "Watson AI API key not found in secret: ${WATSONX_SECRET}" - # exit 1 - fi export SECRET_KEY_WATSONXAI_APIKEY=${WATSONX_SECRET}#watsonxai_apikey - - WATSONXAI_PROJECT_ID_VALUE=$(sm_get_secret_value "$WATSONX_SECRET" "watsonxai_project_id") - if [[ -z "$WATSONXAI_PROJECT_ID_VALUE" || "$WATSONXAI_PROJECT_ID_VALUE" == "null" ]]; then - echo_warning "Watson AI project ID not found in secret: ${WATSONX_SECRET}" - # exit 1 - fi export AISERVICE_WATSONXAI_PROJECT_ID=${WATSONX_SECRET}#watsonxai_project_id # Check if watsonx secret contains watsonxai_ca_crt key and export if it has a value @@ -510,16 +498,15 @@ fi # check for those variables present into the aws sm sm_verify_secret_exists ${SECRETS_PREFIX}ibm_entitlement "image_pull_secret_b64,entitlement_key" - if [[ "${IS_GITOPS_FVT_ENV}" != "true" ]]; then sm_verify_secret_exists ${SECRETS_PREFIX}dro "dro_api_token,dro_ca_b64enc" - sm_verify_secret_exists ${SECRETS_PREFIX}watsonx "watsonxai_apikey,watsonxai_project_id" if [ -z "$STANDALONE_SLS_SERVICE" ]; then # In GitOps FVT environment, skip SLS secret verification as they will be created by postSync job sm_verify_secret_exists ${SLS_SECRETS_PREFIX}sls "slscfg_registration_key,slscfg_ca_b64enc" else sm_verify_secret_exists ${SLS_SECRETS_PREFIX}sls "registration_key,ca_b64,sls_url" fi + sm_verify_secret_exists ${WATSONX_SECRET} "watsonxai_apikey,watsonxai_project_id" else echo "GitOps FVT Environment: Skipping SLS secret verification (will be created by postSync job)" fi From 52e0fffcfdca0d10843d56fc7e97358ca725b69e Mon Sep 17 00:00:00 2001 From: Richa Joshi Date: Thu, 16 Jul 2026 13:00:25 +0530 Subject: [PATCH 03/13] Added is_gitops_fvt_env var to tenant level fvt --- .../appset-configs/cluster/instance/ibm-aiservice-tenant.yaml.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-aiservice-tenant.yaml.j2 b/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-aiservice-tenant.yaml.j2 index 668762eff7..37270f5e6f 100644 --- a/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-aiservice-tenant.yaml.j2 +++ b/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-aiservice-tenant.yaml.j2 @@ -9,6 +9,7 @@ ibm_aiservice_tenant: catalog_source: "{{ CATALOG_SOURCE }}" aiservice_tenant_install_plan_approval: "{{ AISERVICE_TENANT_INSTALL_PLAN_APPROVAL }}" tenantNamespace: "{{ TENANT_NAMESPACE }}" + is_gitops_fvt_env: "{{IS_GITOPS_FVT_ENV}}" {% if AISERVICE_ENABLE_DEPROVISIONING is defined and AISERVICE_ENABLE_DEPROVISIONING != '' %} enable_deprovisioning: {{ AISERVICE_ENABLE_DEPROVISIONING }} {% endif %} From 289062e52d88a403f6f18ff8ad75603fe9420383 Mon Sep 17 00:00:00 2001 From: Jaydip Golviya Date: Thu, 16 Jul 2026 17:34:54 +0530 Subject: [PATCH 04/13] Update gitops_mas_fvt_preparer --- image/cli/mascli/functions/gitops_mas_fvt_preparer | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/image/cli/mascli/functions/gitops_mas_fvt_preparer b/image/cli/mascli/functions/gitops_mas_fvt_preparer index 0ed89efec6..59fb4dd9b4 100644 --- a/image/cli/mascli/functions/gitops_mas_fvt_preparer +++ b/image/cli/mascli/functions/gitops_mas_fvt_preparer @@ -88,7 +88,18 @@ function gitops_mas_fvt_preparer() { export SET_FINISHED=false fi export DEPROVISION=false - + + # For AI Service FVT flow: ensure AISERVICE_INSTANCE_ID drives the pipelines namespace + # start_pipeline defaults read pipelines_namespace from FVT_ENVIRONMENT + # FVT_ENVIRONMENT is already set to AISERVICE_INSTANCE_ID by the Tekton task env, + # but we also explicitly export it here for clarity and for non-Tekton invocations + if [[ -n "${AISERVICE_INSTANCE_ID}" ]]; then + export FVT_ENVIRONMENT=${AISERVICE_INSTANCE_ID} + export SYNC_WITH_UPDATE=false + export SYNC_WITH_UPGRADE=false + export SYNC_WITH_UNINSTALL=false + fi + #FVT pipeline to run export PIPELINE_NAME=$FVT_PIPELINE_NAME export ROLE_NAME="setup_pipeline" From d5854653896ce5f7ab893a461eb0dea0bf175378 Mon Sep 17 00:00:00 2001 From: Jaydip Golviya Date: Thu, 16 Jul 2026 20:20:00 +0530 Subject: [PATCH 05/13] [patch] WatsonX secret related changes --- image/cli/mascli/functions/gitops_aiservice | 15 ------------ .../mascli/functions/gitops_aiservice_tenant | 24 ++++++++++++++++++- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/image/cli/mascli/functions/gitops_aiservice b/image/cli/mascli/functions/gitops_aiservice index a4de64daf9..4efd34a316 100644 --- a/image/cli/mascli/functions/gitops_aiservice +++ b/image/cli/mascli/functions/gitops_aiservice @@ -287,21 +287,6 @@ function gitops_aiservice_fvt_prepare() { SECRETS_PREFIX="${ACCOUNT_ID}${SECRETS_KEY_SEPERATOR}${CLUSTER_ID}${SECRETS_KEY_SEPERATOR}" - WATSONXAI_APIKEY=${WATSONXAI_APIKEY:-"watsonxai-apikey"} - WATSONXAI_PROJECT_ID=${WATSONXAI_PROJECT_ID:-"watsonxai-project-id"} - - SECRET_NAME_WATSONXAI=${SECRETS_PREFIX}watsonx - - TAGS="[{\"Key\": \"watsonxai_apikey\", \"Value\": \"watsonxai_apikey\"}, {\"Key\": \"watsonxai_project_id\", \"Value\": \"watsonxai_project_id\"}]" - - sm_update_secret \ - "$SECRET_NAME_WATSONXAI" \ - "{\"watsonxai_apikey\":\"$WATSONXAI_APIKEY\",\"watsonxai_project_id\":\"$WATSONXAI_PROJECT_ID\"}" \ - "$TAGS" || { - echo "Failed to update WatsonX secret" - return 1 - } - SM_S3_ACCESSKEY=${SM_S3_ACCESSKEY:-"sm_s3_accesskey"} SM_S3_SECRETKEY=${SM_S3_SECRETKEY:-"sm_s3_secretkey"} SM_S3_HOST=${SM_S3_HOST:-"sm_s3_host"} diff --git a/image/cli/mascli/functions/gitops_aiservice_tenant b/image/cli/mascli/functions/gitops_aiservice_tenant index a3654bfc3d..a277b29b6e 100644 --- a/image/cli/mascli/functions/gitops_aiservice_tenant +++ b/image/cli/mascli/functions/gitops_aiservice_tenant @@ -349,6 +349,27 @@ function gitops_aiservice_tenant_noninteractive() { fi } +function gitops_aiservice_tenant_fvt_prepare() { + + SECRETS_PREFIX="${ACCOUNT_ID}${SECRETS_KEY_SEPERATOR}${CLUSTER_ID}${SECRETS_KEY_SEPERATOR}${AISERVICE_INSTANCE_ID}${SECRETS_KEY_SEPERATOR}${TENANT_ID}${SECRETS_KEY_SEPERATOR}" + + WATSONXAI_APIKEY=${WATSONXAI_APIKEY:-"watsonxai-apikey"} + WATSONXAI_PROJECT_ID=${WATSONXAI_PROJECT_ID:-"watsonxai-project-id"} + + SECRET_NAME_WATSONXAI=${SECRETS_PREFIX}watsonx + + TAGS="[{\"Key\": \"watsonxai_apikey\", \"Value\": \"watsonxai_apikey\"}, {\"Key\": \"watsonxai_project_id\", \"Value\": \"watsonxai_project_id\"}]" + + sm_update_secret \ + "$SECRET_NAME_WATSONXAI" \ + "{\"watsonxai_apikey\":\"$WATSONXAI_APIKEY\",\"watsonxai_project_id\":\"$WATSONXAI_PROJECT_ID\"}" \ + "$TAGS" || { + echo "Failed to update WatsonX secret" + return 1 + } + echo "AI Service Tenant FVT secret creating function end" +} + function gitops_aiservice_tenant() { # Take the first parameter off (it will be create-gitops) shift @@ -508,7 +529,8 @@ fi fi sm_verify_secret_exists ${WATSONX_SECRET} "watsonxai_apikey,watsonxai_project_id" else - echo "GitOps FVT Environment: Skipping SLS secret verification (will be created by postSync job)" + echo "IS_GITOPS_FVT_ENV is true - Skipping DRO, sls, and watsonx secret validation" + gitops_aiservice_tenant_fvt_prepare fi # Load scheduling config file From f0180437b18a6e72b7512dd590cab74c679f01ae Mon Sep 17 00:00:00 2001 From: Jaydip Golviya Date: Tue, 21 Jul 2026 11:34:21 +0530 Subject: [PATCH 06/13] Update gitops-aiservice-fvt-preparer.yml.j2 --- tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 b/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 index dcde39d240..02929f6c7b 100644 --- a/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 +++ b/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 @@ -97,7 +97,7 @@ spec: - name: AISERVICE_INSTANCE_ID value: $(params.aiservice_instance_id) - name: MAS_INSTANCE_ID - value: "" + value: $(params.aiservice_instance_id) - name: FVT_ENVIRONMENT value: $(params.aiservice_instance_id) - name: PIPELINE_STORAGE_CLASS From 5b6ef186c3c21fb55a349be421721e5042474f29 Mon Sep 17 00:00:00 2001 From: Jaydip Golviya Date: Tue, 21 Jul 2026 18:36:04 +0530 Subject: [PATCH 07/13] Update gitops-aiservice-fvt-preparer.yml.j2 --- tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 b/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 index 02929f6c7b..976277346e 100644 --- a/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 +++ b/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 @@ -361,7 +361,7 @@ spec: # First check the POSTSYNCJOBS_APP is healthy so we know the initial users job has run already (and so will exist) POSTSYNCJOBS_APP="postsyncjobs.${CLUSTER_NAME}.${AISERVICE_INSTANCE_ID}" - check_argo_app_healthy "${POSTSYNCJOBS_APP}" 20 || return $? + # check_argo_app_healthy "${POSTSYNCJOBS_APP}" 20 || return $? IU_SECRET_NAME="${ACCOUNT_ID}/${CLUSTER_NAME}/${AISERVICE_INSTANCE_ID}/initial_users" IU_SECRET_VALUE="{\"$(get_random_email)\": \"primary,john,smith\", \"$(get_random_email)\": \"primary,jane,doe\", \"$(get_random_email)\": \"secondary,joe,bloggs\", \"$(get_random_email)\": \"secondary,billy,bob\"}" @@ -386,7 +386,7 @@ spec: # Force a resync of the postsyncjobs app echo "Forcing ${POSTSYNCJOBS_APP} to resync" argocd_sync "${POSTSYNCJOBS_APP}" || return $? - check_argo_app_healthy "${POSTSYNCJOBS_APP}" 20 || return $? + # check_argo_app_healthy "${POSTSYNCJOBS_APP}" 20 || return $? } From 5ea81b30d8d4bbfd671be6976448650a73026f6c Mon Sep 17 00:00:00 2001 From: Jaydip Golviya Date: Wed, 22 Jul 2026 23:13:03 +0530 Subject: [PATCH 08/13] [patch] AI Service related changes --- .../gitops-aiservice-fvt-preparer-pipeline.yml.j2 | 11 ++++++++++- .../gitops/gitops-aiservice-fvt-preparer.yml.j2 | 14 ++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/tekton/src/pipelines/gitops/gitops-aiservice-fvt-preparer-pipeline.yml.j2 b/tekton/src/pipelines/gitops/gitops-aiservice-fvt-preparer-pipeline.yml.j2 index 09e07f9c90..4fe40d9605 100644 --- a/tekton/src/pipelines/gitops/gitops-aiservice-fvt-preparer-pipeline.yml.j2 +++ b/tekton/src/pipelines/gitops/gitops-aiservice-fvt-preparer-pipeline.yml.j2 @@ -42,6 +42,12 @@ spec: type: string - name: fvt_ansible_version type: string + - name: fvt_version_core + type: string + default: "" + - name: ivt_version_core + type: string + default: "" - name: aiservice_channel type: string @@ -105,7 +111,10 @@ spec: value: $(params.artifactory_generic_logs_url) - name: fvt_ansible_version value: $(params.fvt_ansible_version) - + - name: fvt_version_core + value: $(params.fvt_version_core) + - name: ivt_version_core + value: $(params.ivt_version_core) - name: aiservice_channel value: $(params.aiservice_channel) diff --git a/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 b/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 index 976277346e..f5c998cf52 100644 --- a/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 +++ b/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 @@ -28,6 +28,12 @@ spec: type: string - name: fvt_config type: string + - name: fvt_version_core + type: string + default: "" + - name: ivt_version_core + type: string + default: "" - name: artifactory_generic_release_url type: string @@ -112,6 +118,10 @@ spec: value: $(params.fvt_config) - name: FVT_IMAGE_REGISTRY value: $(params.fvt_image_registry) + - name: FVT_VERSION_CORE + value: $(params.fvt_version_core) + - name: IVT_VERSION_CORE + value: $(params.ivt_version_core) - name: ARTIFACTORY_GENERIC_RELEASE_URL value: $(params.artifactory_generic_release_url) - name: ARTIFACTORY_GENERIC_LOGS_URL @@ -368,7 +378,7 @@ spec: IU_SECRET_TAGS="[{\"Key\": \"source\", \"Value\": \"gitops-mas-fvt-preparer\"}, {\"Key\": \"account\", \"Value\": \"${ACCOUNT_ID}\"}, {\"Key\": \"cluster\", \"Value\": \"${CLUSTER_NAME}\"}]" echo "Creating ${IU_SECRET_NAME} secret" - sm_update_secret "${IU_SECRET_NAME}" "${IU_SECRET_VALUE}" "${IU_SECRET_TAGS}" || return $? + # sm_update_secret "${IU_SECRET_NAME}" "${IU_SECRET_VALUE}" "${IU_SECRET_TAGS}" || return $? # The Job will have already run when MAS Core was installed during the first phase of our FVT process # Since no initial_users secret existed at that time, it will not have done anything @@ -385,7 +395,7 @@ spec: # Force a resync of the postsyncjobs app echo "Forcing ${POSTSYNCJOBS_APP} to resync" - argocd_sync "${POSTSYNCJOBS_APP}" || return $? + # argocd_sync "${POSTSYNCJOBS_APP}" || return $? # check_argo_app_healthy "${POSTSYNCJOBS_APP}" 20 || return $? } From f7bdc337557250da0efcd3301d07ac32ee106498 Mon Sep 17 00:00:00 2001 From: Jaydip Golviya Date: Thu, 23 Jul 2026 14:21:10 +0530 Subject: [PATCH 09/13] Update gitops-aiservice-fvt-preparer.yml.j2 --- tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 b/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 index f5c998cf52..4ed68915bc 100644 --- a/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 +++ b/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 @@ -480,7 +480,7 @@ spec: if [[ "$LAUNCHER_ID" == "aiservice" ]]; then ACCOUNT_ROOT_APP="root.${ACCOUNT_ID}" CLUSTER_ROOT_APP="cluster.${CLUSTER_NAME}" - INSTANCE_ROOT_APP="instance.${CLUSTER_NAME}.${AISERVICE_INSTANCE_ID}" + INSTANCE_ROOT_APP="aiservice.${CLUSTER_NAME}.${AISERVICE_INSTANCE_ID}" argocd app set ${ACCOUNT_ROOT_APP} --parameter auto_delete=true --grpc-web From 4d872bd3d6c8cd21ef408e2ebd94d4032edb2e4b Mon Sep 17 00:00:00 2001 From: Jaydip Golviya Date: Thu, 23 Jul 2026 15:00:43 +0530 Subject: [PATCH 10/13] [patch] FVT Version of AI Service variable added --- .../gitops/gitops-aiservice-fvt-preparer-pipeline.yml.j2 | 6 ++++++ .../src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/tekton/src/pipelines/gitops/gitops-aiservice-fvt-preparer-pipeline.yml.j2 b/tekton/src/pipelines/gitops/gitops-aiservice-fvt-preparer-pipeline.yml.j2 index 4fe40d9605..b9c8068da7 100644 --- a/tekton/src/pipelines/gitops/gitops-aiservice-fvt-preparer-pipeline.yml.j2 +++ b/tekton/src/pipelines/gitops/gitops-aiservice-fvt-preparer-pipeline.yml.j2 @@ -49,6 +49,10 @@ spec: type: string default: "" + - name: fvt_version_aiservice + type: string + default: "" + - name: aiservice_channel type: string @@ -115,6 +119,8 @@ spec: value: $(params.fvt_version_core) - name: ivt_version_core value: $(params.ivt_version_core) + - name: fvt_version_aiservice + value: $(params.fvt_version_aiservice) - name: aiservice_channel value: $(params.aiservice_channel) diff --git a/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 b/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 index 4ed68915bc..b06df9f85a 100644 --- a/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 +++ b/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 @@ -55,6 +55,9 @@ spec: - name: aiservice_channel type: string default: "" + - name: fvt_version_aiservice + type: string + default: "" - name: launchfvt_aiservice type: string default: "true" @@ -130,6 +133,8 @@ spec: value: $(params.fvt_ansible_version) - name: AISERVICE_CHANNEL value: $(params.aiservice_channel) + - name: FVT_VERSION_AISERVICE + value: $(params.fvt_version_aiservice) - name: LAUNCHFVT_AISERVICE value: $(params.launchfvt_aiservice) From 801e56b7e60a7c2ccaf7cfa4e7a4d5522a6ba6ae Mon Sep 17 00:00:00 2001 From: Richa Joshi Date: Thu, 30 Jul 2026 17:34:21 +0530 Subject: [PATCH 11/13] slack_token and slack_channel envs added --- tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 b/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 index b06df9f85a..456db75475 100644 --- a/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 +++ b/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 @@ -257,6 +257,10 @@ spec: export ARTIFACTORY_TOKEN=${FVT_ARTIFACTORY_TOKEN} export ARTIFACTORY_UPLOAD_DIR=${ARTIFACTORY_GENERIC_LOGS_URL}/mas-fvt/${AISERVICE_INSTANCE_ID}/${DEVOPS_BUILD_NUMBER} + # Pass Slack values from secure-properties through to the downstream FVT preparer/setup flow + export FVT_SLACK_TOKEN=${SLACK_TOKEN} + export FVT_SLACK_CHANNEL=${SLACK_CHANNEL} + CLI_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" . $CLI_DIR/functions/gitops_utils From 5f0916879d97a4662b99a4d6f06998782847e0ed Mon Sep 17 00:00:00 2001 From: Richa Joshi Date: Thu, 30 Jul 2026 17:54:25 +0530 Subject: [PATCH 12/13] update secrets --- .secrets.baseline | 44 ++++++++++++-------------------------------- 1 file changed, 12 insertions(+), 32 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index 8dcdf20718..abb1da58ee 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "build/bin/config/oscap/ssg-rhel9-ds.xml|^.secrets.baseline$|^docs/catalogs/", "lines": null }, - "generated_at": "2026-07-09T02:31:07Z", + "generated_at": "2026-07-30T12:23:32Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -248,29 +248,29 @@ "type": "Secret Keyword", "verified_result": null }, - { - "hashed_secret": "d8a1d01c81ccc3a024b078bd0af28e40cb38cdc4", - "is_secret": true, - "is_verified": false, - "line_number": 290, - "type": "Secret Keyword", - "verified_result": null - }, { "hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa", "is_secret": false, "is_verified": false, - "line_number": 359, + "line_number": 344, "type": "Secret Keyword", "verified_result": null } ], "image/cli/mascli/functions/gitops_aiservice_tenant": [ + { + "hashed_secret": "d8a1d01c81ccc3a024b078bd0af28e40cb38cdc4", + "is_secret": true, + "is_verified": false, + "line_number": 356, + "type": "Secret Keyword", + "verified_result": null + }, { "hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa", "is_secret": false, "is_verified": false, - "line_number": 387, + "line_number": 408, "type": "Secret Keyword", "verified_result": null } @@ -365,16 +365,6 @@ "verified_result": null } ], - "image/cli/mascli/functions/gitops_deprovision_kmodel": [ - { - "hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa", - "is_secret": false, - "is_verified": false, - "line_number": 173, - "type": "Secret Keyword", - "verified_result": null - } - ], "image/cli/mascli/functions/gitops_deprovision_mongo": [ { "hashed_secret": "2582aea6f911bd00fc04cb25e0ec16d5ead62068", @@ -443,16 +433,6 @@ "verified_result": null } ], - "image/cli/mascli/functions/gitops_kmodel": [ - { - "hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa", - "is_secret": false, - "is_verified": false, - "line_number": 335, - "type": "Secret Keyword", - "verified_result": null - } - ], "image/cli/mascli/functions/gitops_license": [ { "hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa", @@ -720,7 +700,7 @@ "hashed_secret": "fee2d55ad9a49a95fc89abe8f414dad66704ebfd", "is_secret": false, "is_verified": false, - "line_number": 48, + "line_number": 49, "type": "Secret Keyword", "verified_result": null } From 0f4087627c1832aa38625a99bbce08db35cab08d Mon Sep 17 00:00:00 2001 From: Richa Joshi Date: Wed, 5 Aug 2026 17:16:55 +0530 Subject: [PATCH 13/13] REmove slack related configs --- .../src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 b/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 index 456db75475..ff3cd89206 100644 --- a/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 +++ b/tekton/src/tasks/gitops/gitops-aiservice-fvt-preparer.yml.j2 @@ -257,11 +257,7 @@ spec: export ARTIFACTORY_TOKEN=${FVT_ARTIFACTORY_TOKEN} export ARTIFACTORY_UPLOAD_DIR=${ARTIFACTORY_GENERIC_LOGS_URL}/mas-fvt/${AISERVICE_INSTANCE_ID}/${DEVOPS_BUILD_NUMBER} - # Pass Slack values from secure-properties through to the downstream FVT preparer/setup flow - export FVT_SLACK_TOKEN=${SLACK_TOKEN} - export FVT_SLACK_CHANNEL=${SLACK_CHANNEL} - - CLI_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + CLI_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" . $CLI_DIR/functions/gitops_utils ROSA_CONFIG=/workspace/configs/tmp-rosa/rosa-$(params.cluster_name)-details.yaml