Skip to content

Commit 5354298

Browse files
syan-tibcosyan-tibco
authored
2025 week 20 update (#73)
1 parent 82d0bac commit 5354298

File tree

14 files changed

+68
-22
lines changed

14 files changed

+68
-22
lines changed

‎charts/provisioner-config-local/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ apiVersion: v2
88
name: provisioner-config-local
99
description: Platform Provisioner local config
1010
type: application
11-
version: "1.6.1"
11+
version: "1.6.4"
1212
appVersion: "2.0.1"
1313
home: https://github.com/TIBCOSoftware/tp-helm-charts
1414
maintainers:

‎charts/provisioner-config-local/recipes/pp-deploy-cp-core-on-prem.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ meta:
232232
CP_INSTALL_PLATFORM_BASE: ${GUI_CP_INSTALL_PLATFORM_BASE:-true}
233233
CP_INSTALL_TIBCOHUB_CONTRIB: ${GUI_CP_INSTALL_TIBCOHUB_CONTRIB:-true}
234234
CP_INSTALL_MSG_CONTRIB: ${GUI_CP_INSTALL_MSG_CONTRIB:-true}
235+
CP_INSTALL_MSG_RECIPES: ${GUI_CP_INSTALL_MSG_RECIPES:-true}
235236
CP_INSTALL_HAWK: ${GUI_CP_INSTALL_HAWK:-true}
236237
CP_INSTALL_RECIPES: ${GUI_CP_INSTALL_RECIPES:-true}
237238
CP_INSTALL_INTEGRATION: ${GUI_CP_INSTALL_INTEGRATION:-true}
@@ -708,6 +709,8 @@ helmCharts:
708709
enabled: ${CP_INSTALL_TIBCOHUB_CONTRIB}
709710
tp-cp-msg-contrib:
710711
enabled: ${CP_INSTALL_MSG_CONTRIB}
712+
tp-cp-msg-recipes:
713+
enabled: ${CP_INSTALL_MSG_RECIPES}
711714
tp-cp-hawk:
712715
enabled: ${CP_INSTALL_HAWK}
713716
tp-cp-hawk-infra-prometheus:

‎charts/provisioner-config-local/recipes/tp-base-on-prem-https.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ helmCharts:
413413
enabled: true
414414
image:
415415
repository: ghcr.io/tibcosoftware/platform-provisioner/platform-provisioner
416-
tag: 1.3.4-auto-on-prem-jammy
416+
tag: 1.3.5-auto-on-prem-jammy
417417
ports:
418418
http:
419419
enabled: true

‎charts/provisioner-config-local/recipes/tp-base-on-prem.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ helmCharts:
367367
enabled: true
368368
image:
369369
repository: ghcr.io/tibcosoftware/platform-provisioner/platform-provisioner
370-
tag: 1.3.4-auto-on-prem-jammy
370+
tag: 1.3.5-auto-on-prem-jammy
371371
ports:
372372
http:
373373
enabled: true

‎docker/Dockerfile‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2024 TIBCO Software Inc.
2+
# Copyright (c) 2024-2025 TIBCO Software Inc.
33
# All Rights Reserved. Confidential & Proprietary.
44
#
55

@@ -10,7 +10,7 @@
1010

1111
FROM python:3.11-alpine3.19 AS builder-aws
1212
ARG AWS_CLI_VERSION
13-
ENV AWS_CLI_VERSION=${AWS_CLI_VERSION:-"2.24.2"}
13+
ENV AWS_CLI_VERSION=${AWS_CLI_VERSION:-"2.24.21"}
1414

1515
# Install build dependencies
1616
RUN apk add --no-cache \
@@ -37,7 +37,7 @@ RUN apk add --no-cache \
3737

3838
FROM python:3.11-alpine3.19 AS builder-azure
3939
ARG AZURE_CLI_VERSION
40-
ENV AZURE_CLI_VERSION=${AZURE_CLI_VERSION:-"2.69.0"}
40+
ENV AZURE_CLI_VERSION=${AZURE_CLI_VERSION:-"2.72.0"}
4141
WORKDIR /azure
4242
RUN apk add --no-cache --update python3 py3-pip && \
4343
apk add --no-cache --update --virtual=build gcc musl-dev python3-dev libffi-dev openssl-dev cargo make && \
@@ -59,7 +59,7 @@ LABEL org.opencontainers.image.vendor="Cloud Software Group"
5959
ARG TARGETOS TARGETARCH
6060

6161
# base packages
62-
RUN apk add --no-cache --upgrade coreutils util-linux gettext bash curl wget envsubst jq \
62+
RUN apk add --no-cache --upgrade coreutils util-linux gettext bash gcompat curl wget envsubst jq \
6363
openssl openssh git python3 yq kubectl helm postgresql-client docker-cli && rm -rf /var/cache/apk/*
6464

6565
# COPY AWSCLI V2 to BASE_IMAGE
@@ -160,4 +160,15 @@ RUN CMD_NAME=kubectl && \
160160
chmod +x ./${CMD_NAME} && mv -f ./${CMD_NAME} /usr/local/bin/${CMD_NAME}-1.32 && \
161161
ln -sf /usr/local/bin/${CMD_NAME}-1.32 /usr/local/bin/kubectl
162162

163+
# OpenShift CLI
164+
ARG OC_VERSION
165+
ENV OC_VERSION=${OC_VERSION:-"4.18.13"}
166+
RUN if [ "${TARGETARCH}" == "arm64" ]; then \
167+
curl --silent --location "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OC_VERSION}/openshift-client-$(uname -s | awk '{print tolower($0)}')-${TARGETARCH}-${OC_VERSION}.tar.gz" | tar xz -C /tmp; \
168+
else \
169+
curl --silent --location "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OC_VERSION}/openshift-client-$(uname -s | awk '{print tolower($0)}')-${OC_VERSION}.tar.gz" | tar xz -C /tmp; \
170+
fi && \
171+
chmod +x /tmp/oc && mv -f /tmp/oc /usr/local/bin/oc && \
172+
oc version --client=true
173+
163174
CMD ["/bin/bash"]

‎docs/recipes/automation/tp-setup/bootstrap/case/k8s_provision_capability.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Copyright (c) 2025. Cloud Software Group, Inc. All Rights Reserved. Confidential & Proprietary
2+
13
from pathlib import Path
24
from utils.util import Util
35
from utils.env import ENV
@@ -33,6 +35,7 @@
3335
po_dp_bwce.goto_left_navbar_dataplane()
3436
po_dp_bwce.goto_dataplane(ENV.TP_AUTO_K8S_DP_NAME)
3537
po_dp_bwce.bwce_provision_capability(ENV.TP_AUTO_K8S_DP_NAME)
38+
po_dp_bwce.bwce_provision_connector(ENV.TP_AUTO_K8S_DP_NAME, ENV.BWCE_APP_NAME)
3639

3740
# for provision EMS capability
3841
if ENV.TP_AUTO_IS_PROVISION_EMS:
@@ -53,6 +56,7 @@
5356
po_dp_flogo.goto_left_navbar_dataplane()
5457
po_dp_flogo.goto_dataplane(ENV.TP_AUTO_K8S_DP_NAME)
5558
po_dp_flogo.flogo_provision_capability(ENV.TP_AUTO_K8S_DP_NAME)
59+
po_dp_flogo.flogo_provision_connector(ENV.TP_AUTO_K8S_DP_NAME, ENV.FLOGO_APP_NAME)
5660

5761
# for provision Pulsar capability
5862
if ENV.TP_AUTO_IS_PROVISION_PULSAR:

‎docs/recipes/automation/tp-setup/bootstrap/page_object/po_bmdp_config.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ def o11y_get_new_resource(self, dp_name):
156156
return add_new_resource_button
157157

158158
def o11y_config_switch_to_global(self, dp_name):
159+
ColorLogger.info(f"Switch dataplane {dp_name} configuration to Global...")
159160
self.goto_left_navbar_dataplane()
160161
self.goto_dataplane(dp_name)
161162
self.goto_dataplane_config()

‎docs/recipes/automation/tp-setup/bootstrap/page_object/po_dataplane.py‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -547,14 +547,30 @@ def k8s_delete_app(self, dp_name, capability, app_name):
547547
ColorLogger.warning(f"{capability} app '{app_name}' does not exist.")
548548

549549
def switch_to_global_config(self, dp_name):
550-
switch_to_global_button = self.page.locator(".switch-to-global")
551-
switch_to_global_button.wait_for(state="visible")
552-
if switch_to_global_button.is_visible() and switch_to_global_button.is_enabled():
553-
switch_to_global_button.click()
550+
if Util.check_dom_visibility(self.page, self.page.locator(".o11y-panel-actions .global-resource-name", has_text="View in Global Configuration"), 5, 30):
551+
ColorLogger.success(f"Linked {dp_name} to Global Observability Resource successfully.")
552+
return
553+
554+
if Util.check_dom_visibility(self.page, self.page.locator(".use-global-resource .o11y-btn"), 5, 30) and self.page.locator(".use-global-resource .o11y-btn").is_enabled():
555+
ColorLogger.info(f"Data Plane '{dp_name}' does not have configuration, Use Global Resource")
556+
self.page.locator(".use-global-resource .o11y-btn").click()
557+
print("Clicked 'Use Global Resource' button")
558+
self.page.locator(".confirmation .pl-modal__heading", has_text="Link Data plane to this resource ?").wait_for(state="visible")
559+
print("Confirmation dialog is visible")
560+
self.page.locator("#confirm-button", has_text="Link").click()
561+
print("Clicked 'Link' button in confirmation dialog")
562+
563+
elif Util.check_dom_visibility(self.page, self.page.locator(".switch-to-global"), 5, 30) and self.page.locator(".switch-to-global").is_enabled():
564+
ColorLogger.info(f"Switching current Data Plane '{dp_name}' configuration to Global Observability Resource")
565+
self.page.locator(".switch-to-global").click()
554566
print("Clicked 'Switch to Global' button")
555567
self.page.locator(".confirmation .pl-modal__heading", has_text="Switch to Global Observability Resource?").wait_for(state="visible")
556568
print("Confirmation dialog is visible")
557569
self.page.locator("#confirm-button", has_text="Yes").click()
558570
print("Clicked 'Yes' button in confirmation dialog")
559-
self.page.locator(".o11y-panel-actions .global-resource-name", has_text="View in Global Configuration").wait_for(state="visible")
571+
572+
573+
if Util.check_dom_visibility(self.page, self.page.locator(".o11y-panel-actions .global-resource-name", has_text="View in Global Configuration"), 5, 30):
560574
ColorLogger.success(f"Linked {dp_name} to Global Observability Resource successfully.")
575+
else:
576+
ColorLogger.warning(f"Linked {dp_name} to Global Observability Resource failed.")

‎docs/recipes/automation/tp-setup/bootstrap/page_object/po_dp_bwce.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Copyright (c) 2025. Cloud Software Group, Inc. All Rights Reserved. Confidential & Proprietary
2+
13
from utils.color_logger import ColorLogger
24
from utils.util import Util
35
from utils.helper import Helper
@@ -91,9 +93,9 @@ def bwce_provision_connector(self, dp_name, app_name):
9193
self.page.wait_for_timeout(3000)
9294

9395
plugins = [text.strip() for text in self.page.locator("#pkgsTbl-table-listPkg td:first-child").all_inner_texts()]
94-
# Note: check 3 times, because sometimes BWCE Plugins cannot be loaded in time
95-
# if plugin is empty, reload page, and check again, only check 3 times, if still empty, exit for loop
96-
for i in range(3):
96+
# Note: check 2 times, because sometimes BWCE Plugins cannot be loaded in time
97+
# if plugin is empty, reload page, and check again, only check 2 times, if still empty, exit for loop
98+
for i in range(2):
9799
if plugins:
98100
break
99101
Util.refresh_page(self.page)
@@ -153,6 +155,7 @@ def bwce_app_build_and_deploy(self, dp_name, app_file_name, app_name):
153155

154156
if is_app_build_created:
155157
ColorLogger.success(f"BWCE app build {app_name} is already created.")
158+
ReportYaml.set_capability(dp_name, capability)
156159
ReportYaml.set_capability_info(dp_name, capability, "appBuild", True)
157160
return
158161

‎docs/recipes/automation/tp-setup/bootstrap/page_object/po_dp_config.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ def dp_config_resources_storage(self, dp_name):
289289
self.page.locator("#resources-menu-item .menu-item-text", has_text="Resources").click()
290290
print("Clicked 'Resources' left side menu")
291291
print(f"Resource Name: {resource_name}")
292-
self.page.wait_for_timeout(2000)
292+
self.page.wait_for_timeout(5000)
293293
if self.page.locator("#storage-resource-table tr td:first-child", has_text=resource_name).is_visible():
294294
ColorLogger.success(f"Storage '{resource_name}' is already created.")
295295
ReportYaml.set_dataplane_info(ENV.TP_AUTO_K8S_DP_NAME, "storage", True)
@@ -318,6 +318,7 @@ def dp_config_resources_ingress(self, dp_name, ingress_controller, resource_name
318318
self.page.locator("#resources-menu-item .menu-item-text", has_text="Resources").wait_for(state="visible")
319319
self.page.locator("#resources-menu-item .menu-item-text", has_text="Resources").click()
320320
print("Clicked 'Resources' left side menu")
321+
self.page.wait_for_timeout(5000)
321322
self.page.locator("#toggle-ingress-expansion svg use").wait_for(state="visible")
322323
expected_icon = 'pl-icon-caret-right'
323324
if expected_icon in (self.page.query_selector("#toggle-ingress-expansion svg use") or {}).get_attribute("xlink:href"):

0 commit comments

Comments
 (0)