Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .ci/pipelines/env_variables.sh
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ AZURE_DB_CERTIFICATES_PATH="/tmp/secrets/azure-db-certificates.pem"

JUNIT_RESULTS="junit-results.xml"

SLACK_DATA_ROUTER_WEBHOOK_URL=$(cat /tmp/secrets/SLACK_DATA_ROUTER_WEBHOOK_URL)
REDIS_USERNAME=temp
REDIS_USERNAME_ENCODED=$(printf "%s" $REDIS_USERNAME | base64 | tr -d '\n')
REDIS_PASSWORD=test123
Expand Down
1 change: 0 additions & 1 deletion .ci/pipelines/jobs/auth-providers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ source "$DIR"/lib/common.sh
handle_auth_providers() {
local retry_operator_installation="${1:-1}"
common::oc_login
wait_for_cluster_ready
configure_namespace "${OPERATOR_MANAGER}"
install_rhdh_operator "${OPERATOR_MANAGER}" "$retry_operator_installation"
wait_for_backstage_crd "default"
Expand Down
1 change: 0 additions & 1 deletion .ci/pipelines/jobs/ocp-nightly.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ handle_ocp_nightly() {
export NAME_SPACE_POSTGRES_DB="${NAME_SPACE_POSTGRES_DB:-postgress-external-db-nightly}"

common::oc_login
wait_for_cluster_ready

K8S_CLUSTER_ROUTER_BASE=$(oc get route console -n openshift-console -o=jsonpath='{.spec.host}' | sed 's/^[^.]*\.//')
export K8S_CLUSTER_ROUTER_BASE
Expand Down
3 changes: 0 additions & 3 deletions .ci/pipelines/jobs/ocp-operator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ initiate_operator_deployments() {
initiate_operator_deployments_osd_gcp() {
log::info "Initiating Operator-backed deployments on OSD-GCP (orchestrator disabled)"

prepare_operator

configure_namespace "${NAME_SPACE}"
deploy_test_backstage_customization_provider "${NAME_SPACE}"
local rhdh_base_url="https://backstage-${RELEASE_NAME}-${NAME_SPACE}.${K8S_CLUSTER_ROUTER_BASE}"
Expand Down Expand Up @@ -100,7 +98,6 @@ handle_ocp_operator() {
export NAME_SPACE_RUNTIME="${NAME_SPACE_RUNTIME:-showcase-runtime}"

common::oc_login
wait_for_cluster_ready

K8S_CLUSTER_ROUTER_BASE=$(oc get route console -n openshift-console -o=jsonpath='{.spec.host}' | sed 's/^[^.]*\.//')
export K8S_CLUSTER_ROUTER_BASE
Expand Down
2 changes: 0 additions & 2 deletions .ci/pipelines/jobs/ocp-pull.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ handle_ocp_pull() {

log::info "Configuring namespace: ${NAME_SPACE}"
common::oc_login
wait_for_cluster_ready
log::info "OCP version: $(oc version)"

K8S_CLUSTER_ROUTER_BASE=$(oc get route console -n openshift-console -o=jsonpath='{.spec.host}' | sed 's/^[^.]*\.//')
export K8S_CLUSTER_ROUTER_BASE
Expand Down
1 change: 0 additions & 1 deletion .ci/pipelines/jobs/upgrade.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ handle_ocp_helm_upgrade() {
export TAG_NAME_BASE=$previous_release_version

common::oc_login
wait_for_cluster_ready

K8S_CLUSTER_ROUTER_BASE=$(oc get route console -n openshift-console -o=jsonpath='{.spec.host}' | sed 's/^[^.]*\.//')
export K8S_CLUSTER_ROUTER_BASE
Expand Down
25 changes: 1 addition & 24 deletions .ci/pipelines/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ metadata:
name: dynamic-plugins
data:
dynamic-plugins.yaml: |" > ${final_file}
yq '.global.dynamic' ${base_file} | sed -e 's/^/ /' >> ${final_file}
yq '.global.dynamic' ${base_file} | sed -e 's/^/ /' -e 's/{{ "{{" }}inherit{{ "}}" }}/{{inherit}}/g' >> ${final_file}
}

create_conditional_policies_operator() {
Expand Down Expand Up @@ -1408,29 +1408,6 @@ force_delete_namespace() {
log::success "Namespace '${project}' successfully deleted."
}

# Wait for the cluster API server to be fully responsive after login.
# Clusters resuming from hibernation may accept login but have degraded API availability.
wait_for_cluster_ready() {
local max_attempts=${1:-20}
local wait_seconds=${2:-15}

log::info "Checking cluster API server readiness..."

for ((i = 1; i <= max_attempts; i++)); do
if oc get nodes &> /dev/null && oc get route console -n openshift-console &> /dev/null; then
log::success "Cluster API server is ready"
return 0
fi
if [[ $i -lt $max_attempts ]]; then
log::warn "Cluster API not fully ready (attempt ${i}/${max_attempts}). Retrying in ${wait_seconds}s..."
sleep "$wait_seconds"
fi
done

log::error "Cluster API server did not become ready after ${max_attempts} attempts ($((max_attempts * wait_seconds))s)"
return 1
}

is_openshift() {
oc get routes.route.openshift.io &> /dev/null || kubectl get routes.route.openshift.io &> /dev/null
}
Expand Down
26 changes: 25 additions & 1 deletion .ci/pipelines/value_files/diff-values_showcase-rbac_AKS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,31 @@ route:
enabled: false
global:
dynamic:
plugins: []
plugins:
# These plugins correspond to tests that are ignored in showcase-rbac-k8s project
# See e2e-tests/playwright.config.ts SHOWCASE_RBAC_K8S config

# Tekton not in showcase-rbac-k8s testMatch
- package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
disabled: true

# Adoption Insights not in showcase-rbac-k8s testMatch
- package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights
disabled: true
- package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights-backend-dynamic
disabled: true
- package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights-dynamic
disabled: true

# Orchestrator tests ignored on showcase-rbac-k8s: e2e-tests/playwright/e2e/plugins/orchestrator/*.spec.ts
- package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{ "{{" }}inherit{{ "}}" }}'
disabled: true
- package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-backend:{{ "{{" }}inherit{{ "}}" }}'
disabled: true
- package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator:{{ "{{" }}inherit{{ "}}" }}'
disabled: true
- package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets:{{ "{{" }}inherit{{ "}}" }}'
disabled: true
upstream:
backstage:
appConfig:
Expand Down
26 changes: 25 additions & 1 deletion .ci/pipelines/value_files/diff-values_showcase-rbac_EKS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,31 @@ route:
enabled: false
global:
dynamic:
plugins: []
plugins:
# These plugins correspond to tests that are ignored in showcase-rbac-k8s project
# See e2e-tests/playwright.config.ts SHOWCASE_RBAC_K8S config

# Tekton not in showcase-rbac-k8s testMatch
- package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
disabled: true

# Adoption Insights not in showcase-rbac-k8s testMatch
- package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights
disabled: true
- package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights-backend-dynamic
disabled: true
- package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights-dynamic
disabled: true

# Orchestrator tests ignored on showcase-rbac-k8s: e2e-tests/playwright/e2e/plugins/orchestrator/*.spec.ts
- package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{ "{{" }}inherit{{ "}}" }}'
disabled: true
- package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-backend:{{ "{{" }}inherit{{ "}}" }}'
disabled: true
- package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator:{{ "{{" }}inherit{{ "}}" }}'
disabled: true
- package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets:{{ "{{" }}inherit{{ "}}" }}'
disabled: true
upstream:
backstage:
appConfig:
Expand Down
32 changes: 30 additions & 2 deletions .ci/pipelines/value_files/diff-values_showcase-rbac_GKE.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,40 @@
# This file is for GKE installation only.
# It is applied by `helm upgrade` after the `values-showcase.yaml` is applied and only contains complementary differences for GKE.
# Note, that it overwrites the whole key that is present in this file.
# e.g. global.dynamic.plugins key is completely overwritten by the content of this file.
# The only exception is global.dynamic.plugins, that gets merged with the base file.
route:
enabled: false
global:
dynamic:
plugins: []
plugins:
# Disable plugins to save disk space on GKE
# These plugins correspond to tests that are ignored in showcase-rbac-k8s project
# See e2e-tests/playwright.config.ts SHOWCASE_RBAC_K8S config

# Tekton - not installed on K8s clusters (AKS/EKS/GKE)
# Not in showcase-rbac-k8s testMatch
- package: ./dynamic-plugins/dist/backstage-community-plugin-tekton
disabled: true

# Adoption Insights - large plugin (~300MB) causing disk space issues
# Not in showcase-rbac-k8s testMatch
- package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights
disabled: true
- package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-adoption-insights-backend-dynamic
disabled: true
- package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-analytics-module-adoption-insights-dynamic
disabled: true

# Orchestrator - large OCI plugins causing disk space issues
# Tests ignored on showcase-rbac-k8s: e2e-tests/playwright/e2e/plugins/orchestrator/*.spec.ts
- package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{ "{{" }}inherit{{ "}}" }}'
disabled: true
- package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-backend:{{ "{{" }}inherit{{ "}}" }}'
disabled: true
- package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator:{{ "{{" }}inherit{{ "}}" }}'
disabled: true
- package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets:{{ "{{" }}inherit{{ "}}" }}'
disabled: true
upstream:
backstage:
appConfig:
Expand Down
Loading
Loading