Skip to content
4 changes: 3 additions & 1 deletion .github/workflows/auto-publish-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,9 @@ jobs:
overlay-root: ${{ github.workspace }}/overlay-repo/${{ needs.prepare.outputs.workspace }}
plugins-root: ${{ github.workspace }}/source-repo/${{ steps.source-config.outputs.plugins-root }}
target-backstage-version: ${{ steps.source-config.outputs.backstage-version }}
image-repository-prefix: ${{ needs.prepare.outputs.image-repository-prefix }}
# Metadata files in this repo intentionally use canonical upstream OCI refs.
# Validate against upstream prefix even when workflow runs from a fork.
image-repository-prefix: ghcr.io/redhat-developer/rhdh-plugin-export-overlays

- name: Extract metadata warnings from step summary
id: extract-metadata-warnings
Expand Down
21 changes: 14 additions & 7 deletions .github/workflows/run-workspace-smoke-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -127,19 +127,26 @@ jobs:

- name: Wait for RHDH to be ready
run: |
set -e
for i in $(seq 1 10); do
set -euo pipefail
TOTAL_ATTEMPTS=30
SLEEP_SECONDS=10

TOTAL_WAIT_SECONDS=$(( TOTAL_ATTEMPTS * SLEEP_SECONDS ))
TOTAL_WAIT_MINUTES=$(( TOTAL_WAIT_SECONDS / 60 ))
echo "Readiness window: ${TOTAL_ATTEMPTS} attempts x ${SLEEP_SECONDS}s (~${TOTAL_WAIT_MINUTES}m)"

for i in $(seq 1 "$TOTAL_ATTEMPTS"); do
if curl -fsS http://localhost:7007/health >/dev/null; then
echo "RHDH is ready"; exit 0; fi
echo "Waiting for RHDH... (Attempt ${i}/10)"
echo "Waiting for RHDH... (Attempt ${i}/${TOTAL_ATTEMPTS})"
# Check if container is still running
if ! docker ps | grep -q rhdh; then
echo "Container stopped unexpectedly."
exit 1
fi
sleep 10
sleep "$SLEEP_SECONDS"
done
echo "RHDH did not become ready in time."
echo "RHDH did not become ready in time after ${TOTAL_WAIT_SECONDS}s."
exit 1

- name: List installed plugins
Expand Down Expand Up @@ -180,8 +187,8 @@ jobs:
echo "===== Checking logs for plugin loaded messages"
for plugin in $PLUGINS; do
echo "Asserting plugin loaded: $plugin"
# Match either the unpack path or the canonical "loaded dynamic ... plugin '<pkg>' from" message
if echo "$LOGS" | grep -qiE "loaded dynamic .* plugin .*${plugin}(-dynamic)?'" ; then
# Match either canonical package log lines or unpack paths (including /alpha suffixes).
if echo "$LOGS" | grep -qiE "loaded dynamic .* plugin .*${plugin}" ; then
echo "Plugin loaded: $plugin"
else
echo "Plugin NOT loaded: $plugin"
Expand Down
10 changes: 10 additions & 0 deletions smoke-tests/app-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@ auth:
providers:
guest: {}

integrations:
gitlab:
- host: gitlab.example.com
apiBaseUrl: https://gitlab.example.com/api/v4
token: ${GITLAB_TOKEN}
bitbucketServer:
- host: bitbucket.example.com
apiBaseUrl: https://bitbucket.example.com/rest/api/1.0
token: ${BITBUCKET_TOKEN}

# Minimal catalog configuration.
catalog:
rules:
Expand Down
4 changes: 2 additions & 2 deletions workspaces/backstage/plugins-list.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ plugins/auth:
plugins/catalog-backend-module-aws:
plugins/catalog-backend-module-azure:
plugins/catalog-backend-module-backstage-openapi:
plugins/catalog-backend-module-bitbucket-cloud:
plugins/catalog-backend-module-bitbucket-cloud: --embed-package @backstage/plugin-bitbucket-cloud-common
plugins/catalog-backend-module-bitbucket-server:
plugins/catalog-backend-module-gcp: --embed-package @backstage/plugin-kubernetes-common
plugins/catalog-backend-module-gerrit:
Expand Down Expand Up @@ -82,7 +82,7 @@ plugins/proxy-backend:
#plugins/scaffolder: ==> Added as a static plugin in RHDH
#plugins/scaffolder-backend: ==> Added as a static plugin in RHDH
plugins/scaffolder-backend-module-azure:
plugins/scaffolder-backend-module-bitbucket-cloud:
plugins/scaffolder-backend-module-bitbucket-cloud: --embed-package @backstage/plugin-bitbucket-cloud-common
plugins/scaffolder-backend-module-bitbucket-server:
plugins/scaffolder-backend-module-confluence-to-markdown:
plugins/scaffolder-backend-module-cookiecutter:
Expand Down