Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(migration): refactor hardcoded repo and images (#2172, #2181) #2174

Open
wants to merge 3 commits into
base: release-1.4
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion .ibm/pipelines/env_variables.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ HELM_IMAGE_NAME=backstage
HELM_REPO_NAME=rhdh-chart
HELM_REPO_URL="https://redhat-developer.github.io/rhdh-chart"
K8S_CLUSTER_TOKEN_ENCODED=$(printf "%s" $K8S_CLUSTER_TOKEN | base64 | tr -d '\n')
QUAY_REPO="${QUAY_REPO:-janus-idp/backstage-showcase}"
QUAY_REPO="${QUAY_REPO:-rhdh-community/rhdh}"

RELEASE_NAME=rhdh
RELEASE_NAME_RBAC=rhdh-rbac
Expand Down
12 changes: 7 additions & 5 deletions .ibm/pipelines/openshift-ci-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,8 @@ run_tests() {

project=${project%-pr-*} # Remove -pr- suffix if any set for main branchs pr's.
cd "${DIR}/../../e2e-tests"
local e2e_tests_dir
e2e_tests_dir=$(pwd)
yarn install
yarn playwright install chromium

Expand All @@ -283,16 +285,16 @@ run_tests() {

mkdir -p "${ARTIFACT_DIR}/${project}/test-results"
mkdir -p "${ARTIFACT_DIR}/${project}/attachments/screenshots"
cp -a /tmp/backstage-showcase/e2e-tests/test-results/* "${ARTIFACT_DIR}/${project}/test-results"
cp -a /tmp/backstage-showcase/e2e-tests/${JUNIT_RESULTS} "${ARTIFACT_DIR}/${project}/${JUNIT_RESULTS}"
cp -a "${e2e_tests_dir}/test-results/"* "${ARTIFACT_DIR}/${project}/test-results"
cp -a "${e2e_tests_dir}/${JUNIT_RESULTS}" "${ARTIFACT_DIR}/${project}/${JUNIT_RESULTS}"

if [ -d "/tmp/backstage-showcase/e2e-tests/screenshots" ]; then
cp -a /tmp/backstage-showcase/e2e-tests/screenshots/* "${ARTIFACT_DIR}/${project}/attachments/screenshots/"
if [ -d "${e2e_tests_dir}/screenshots" ]; then
cp -a "${e2e_tests_dir}/screenshots/"* "${ARTIFACT_DIR}/${project}/attachments/screenshots/"
fi

ansi2html <"/tmp/${LOGFILE}" >"/tmp/${LOGFILE}.html"
cp -a "/tmp/${LOGFILE}.html" "${ARTIFACT_DIR}/${project}"
cp -a /tmp/backstage-showcase/e2e-tests/playwright-report/* "${ARTIFACT_DIR}/${project}"
cp -a "${e2e_tests_dir}/playwright-report/"* "${ARTIFACT_DIR}/${project}"

droute_send "${release_name}" "${project}"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ catalog:
- allow: [API, Component, Group, Location, Resource, System, Template]
locations:
- type: url
target: https://github.com/janus-idp/backstage-showcase/blob/main/catalog-entities/all.yaml
target: https://github.com/redhat-developer/rhdh/blob/main/catalog-entities/all.yaml
- type: url
target: https://github.com/redhat-developer/red-hat-developer-hub-software-templates/blob/main/templates.yaml
- type: url
Expand Down
2 changes: 1 addition & 1 deletion .ibm/pipelines/resources/config_map/app-config-rhdh.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ catalog:
- allow: [API, Component, Group, Location, Resource, System, Template]
locations:
- type: url
target: https://github.com/janus-idp/backstage-showcase/blob/main/catalog-entities/all.yaml
target: https://github.com/redhat-developer/rhdh/blob/main/catalog-entities/all.yaml
- type: url
target: https://github.com/redhat-developer/red-hat-developer-hub-software-templates/blob/main/templates.yaml
- type: url
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ upstream:
image:
pullPolicy: Always
registry: quay.io
repository: janus-idp/backstage-showcase
repository: rhdh-community/rhdh
tag: next
appConfig:
app:
Expand Down
2 changes: 1 addition & 1 deletion .ibm/pipelines/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ droute_send() {
ARTIFACTS_URL="https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/pr-logs/pull/${REPO_OWNER}_${REPO_NAME}/${PULL_NUMBER}/${JOB_NAME}/${BUILD_ID}/artifacts/e2e-tests/${REPO_OWNER}-${REPO_NAME}/artifacts/${project}"
else
JOB_URL="${JOB_BASE_URL}/logs/${JOB_NAME}/${BUILD_ID}"
ARTIFACTS_URL="https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/logs/${JOB_NAME}/${BUILD_ID}/artifacts/${JOB_NAME##periodic-ci-janus-idp-backstage-showcase-main-}/${REPO_OWNER}-${REPO_NAME}/artifacts/${project}"
ARTIFACTS_URL="https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/logs/${JOB_NAME}/${BUILD_ID}/artifacts/${JOB_NAME##periodic-ci-redhat-developer-rhdh-main-}/${REPO_OWNER}-${REPO_NAME}/artifacts/${project}"
fi

# Remove properties (only used for skipped test and invalidates the file if empty)
Expand Down
10 changes: 5 additions & 5 deletions .ibm/pipelines/value_files/values_showcase-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ global:
# -- Array of YAML files listing dynamic plugins to include with those listed in the `plugins` field.
# Relative paths are resolved from the working directory of the initContainer that will install the plugins (`/opt/app-root/src`).
includes:
# -- List of dynamic plugins included inside the `janus-idp/backstage-showcase` container image, some of which are disabled by default.
# This file ONLY works with the `janus-idp/backstage-showcase` container image.
# -- List of dynamic plugins included inside the `rhdh-community/rhdh` container image, some of which are disabled by default.
# This file ONLY works with the `rhdh-community/rhdh` container image.
- 'dynamic-plugins.default.yaml'

# -- List of dynamic plugins, possibly overriding the plugins listed in `includes` files.
Expand Down Expand Up @@ -117,9 +117,9 @@ upstream:
backstage:
image:
pullPolicy: Always
# using test image from https://quay.io/repository/janus-idp/backstage-showcase
# using test image from https://quay.io/repository/rhdh-community/rhdh
registry: quay.io
repository: janus-idp/backstage-showcase
repository: rhdh-community/rhdh
tag: next
appConfig:
app:
Expand Down Expand Up @@ -205,7 +205,7 @@ upstream:
- name: install-dynamic-plugins
# -- Image used by the initContainer to install dynamic plugins into the `dynamic-plugins-root` volume mount.
# It could be replaced by a custom image based on this one.
# @default -- `quay.io/janus-idp/backstage-showcase:latest`
# @default -- `quay.io/rhdh-community/rhdh:latest`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no :latest tag, only :next

Suggested change
# @default -- `quay.io/rhdh-community/rhdh:latest`
# @default -- `quay.io/rhdh-community/rhdh:next`

image: '{{ include "backstage.image" . }}'
command:
- sh
Expand Down
6 changes: 3 additions & 3 deletions .ibm/pipelines/value_files/values_showcase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ global:
# -- Array of YAML files listing dynamic plugins to include with those listed in the `plugins` field.
# Relative paths are resolved from the working directory of the initContainer that will install the plugins (`/opt/app-root/src`).
includes:
# -- List of dynamic plugins included inside the `janus-idp/backstage-showcase` container image, some of which are disabled by default.
# This file ONLY works with the `janus-idp/backstage-showcase` container image.
# -- List of dynamic plugins included inside the `rhdh-community/rhdh` container image, some of which are disabled by default.
# This file ONLY works with the `rhdh-community/rhdh` container image.
- 'dynamic-plugins.default.yaml'

# -- List of dynamic plugins, possibly overriding the plugins listed in `includes` files.
Expand Down Expand Up @@ -124,7 +124,7 @@ upstream:
image:
pullPolicy: Always
registry: quay.io
repository: janus-idp/backstage-showcase
repository: rhdh-community/rhdh
tag: next
extraEnvVars:
- name: BACKEND_SECRET
Expand Down
4 changes: 2 additions & 2 deletions e2e-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"description": "Showcase E2E test",
"main": "index.js",
"type": "module",
"repository": "https://github.com/janus-idp/showcase-e2e",
"author": "janus-idp",
"repository": "https://github.com/redhat-developer/rhdh",
"author": "redhat-developer",
"license": "Apache-2.0",
"scripts": {
"showcase": "playwright test --project=showcase",
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/playwright/e2e/github-happy-path.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ test.describe.skip("GitHub Happy path", () => {
let backstageShowcase: BackstageShowcase;

const component =
"https://github.com/janus-idp/backstage-showcase/blob/main/catalog-entities/all.yaml";
"https://github.com/redhat-developer/rhdh/blob/main/catalog-entities/all.yaml";

test.beforeAll(async ({ browser }, testInfo) => {
page = (await setupBrowser(browser, testInfo)).page;
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/playwright/e2e/plugins/quay/quay.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Common } from "../../../utils/Common";
import { ImageRegistry } from "../../../utils/quay/quay";

test.describe.skip("Test Quay.io plugin", () => {
const QUAY_REPOSITORY = "janus-idp/backstage-showcase";
const QUAY_REPOSITORY = "rhdh-community/rhdh";
let uiHelper: UIhelper;

test.beforeEach(async ({ page }) => {
Expand Down
6 changes: 3 additions & 3 deletions e2e-tests/playwright/support/pages/CatalogImport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ export class BackstageShowcase {
paginated = false,
) {
return await APIHelper.getGitHubPRs(
"janus-idp",
"backstage-showcase",
"redhat-developer",
"rhdh",
state,
paginated,
);
Expand Down Expand Up @@ -120,7 +120,7 @@ export class BackstageShowcase {

async verifyAboutCardIsDisplayed() {
const url =
"https://github.com/janus-idp/backstage-showcase/tree/main/catalog-entities/components/";
"https://github.com/redhat-developer/rhdh/tree/main/catalog-entities/components/";
const isLinkVisible = await this.page
.locator(`a[href="${url}"]`)
.isVisible();
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/playwright/utils/APIEndpoints.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const getRepoUrl = (owner: string, repo: string) =>
`${BASE_API_URL}/repos/${owner}/${repo}`;
const getOrgUrl = (owner: string) => `${BASE_API_URL}/orgs/${owner}`;

const backstageShowcaseAPI = getRepoUrl("janus-idp", "backstage-showcase");
const backstageShowcaseAPI = getRepoUrl("redhat-developer", "rhdh");

export const githubAPIEndpoints = {
pull: (owner: string, repo: string, state: "open" | "closed" | "all") =>
Expand Down
Loading