Skip to content

Commit bacaed3

Browse files
chore(e2e): fix gcp osd operator job (#2344)
* fix osd operator job * fix osd operator job * fix osd operator job
1 parent f733e20 commit bacaed3

File tree

5 files changed

+19
-22
lines changed

5 files changed

+19
-22
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
#!/bin/bash
22
set -e
33

4-
export OC_URL=https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest/openshift-client-linux.tar.gz
5-
export OI_URL=https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest/openshift-install-linux.tar.gz
6-
7-
export PATH=$WORKSPACE:$PATH
8-
94
CLUSTER_NAME=${CLUSTER_NAME:-osdgcp}
105

116
ocm login --client-id=$CLIENT_ID --client-secret=$CLIENT_SECRET
@@ -14,9 +9,12 @@ echo "Logged in as $(ocm whoami | jq -rc '.username')"
149

1510
echo "Looking for clusters that matches '$CLUSTER_NAME'"
1611
CLUSTER_ID=$(ocm list clusters | awk -v name="$CLUSTER_NAME" '$2 == name {print $1}')
12+
13+
ocm describe cluster $CLUSTER_ID
14+
1715
ocm delete /api/clusters_mgmt/v1/clusters/$CLUSTER_ID
1816

19-
while [[ -z $(ocm cluster status $CLUSTER_ID 2>&1 | grep "not found") ]]; do
20-
echo "Waiting for cluster $CLUSTER_ID to be completely uninstalled...";
21-
sleep 30;
22-
done
17+
# while [[ -z $(ocm cluster status $CLUSTER_ID 2>&1 | grep "not found") ]]; do
18+
# echo "Waiting for cluster $CLUSTER_ID to be completely uninstalled...";
19+
# sleep 30;
20+
# done

e2e-tests/playwright/e2e/plugins/bulk-import.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111

1212
// Pre-req : plugin-bulk-import & plugin-bulk-import-backend-dynamic
1313
test.describe.serial("Bulk Import plugin", () => {
14-
test.skip(() => process.env.JOB_NAME.endsWith("osd-gcp-helm-nightly")); // skipping due to RHIDP-5704 on OSD Env
14+
test.skip(() => process.env.JOB_NAME.includes("osd-gcp")); // skipping due to RHIDP-5704 on OSD Env
1515
let page: Page;
1616
let uiHelper: UIhelper;
1717
let common: Common;
@@ -236,7 +236,7 @@ test.describe.serial("Bulk Import plugin", () => {
236236

237237
test.describe
238238
.serial("Bulk Import - Verify existing repo are displayed in bulk import Added repositories", () => {
239-
test.skip(() => process.env.JOB_NAME.endsWith("osd-gcp-helm-nightly")); // skipping due to RHIDP-5704 on OSD Env
239+
test.skip(() => process.env.JOB_NAME.includes("osd-gcp")); // skipping due to RHIDP-5704 on OSD Env
240240
let page: Page;
241241
let uiHelper: UIhelper;
242242
let common: Common;
@@ -294,7 +294,7 @@ test.describe
294294

295295
test.describe
296296
.serial("Bulk Import - Ensure users without bulk import permissions cannot access the bulk import plugin", () => {
297-
test.skip(() => process.env.JOB_NAME.endsWith("osd-gcp-helm-nightly")); // skipping due to RHIDP-5704 on OSD Env
297+
test.skip(() => process.env.JOB_NAME.includes("osd-gcp")); // skipping due to RHIDP-5704 on OSD Env
298298
let page: Page;
299299
let uiHelper: UIhelper;
300300
let common: Common;

e2e-tests/playwright/e2e/plugins/dynamic-plugins-info/dynamic-plugins-info.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ test.describe("dynamic-plugins-info UI tests", () => {
5757
await page
5858
.getByPlaceholder("Search")
5959
.pressSequentially("plugin-3scale-backend-dynamic\n", {
60-
delay: 300,
60+
delay: 100,
6161
});
6262
const row = await page.locator(
6363
UI_HELPER_ELEMENTS.rowByText(

e2e-tests/playwright/e2e/plugins/topology/topology.spec.ts

+6-7
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ test.describe("Test Topology Plugin", () => {
1919
});
2020

2121
test("Verify pods visibility in the Topology tab", async ({ page }) => {
22+
test.setTimeout(150000);
2223
await catalog.goToBackstageJanusProject();
2324
await uiHelper.clickTab("Topology");
2425
await uiHelper.verifyText("backstage-janus");
@@ -71,14 +72,12 @@ test.describe("Test Topology Plugin", () => {
7172
);
7273
await uiHelper.clickTab("Resources");
7374
await uiHelper.verifyText("P");
74-
expect(await page.getByTestId("icon-with-title-Running")).toBeVisible();
75-
expect(
76-
await page.getByTestId("icon-with-title-Running").locator("svg"),
75+
await expect(page.getByTestId("icon-with-title-Running")).toBeVisible();
76+
await expect(
77+
page.getByTestId("icon-with-title-Running").locator("svg"),
7778
).toBeVisible();
78-
expect(
79-
await page
80-
.getByTestId("icon-with-title-Running")
81-
.getByTestId("status-text"),
79+
await expect(
80+
page.getByTestId("icon-with-title-Running").getByTestId("status-text"),
8281
).toHaveText("Running");
8382
await uiHelper.verifyHeading("PipelineRuns");
8483
await uiHelper.verifyText("PL");

e2e-tests/playwright/utils/ui-helper.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ export class UIhelper {
619619
}
620620

621621
async verifyTextInTooltip(text: string | RegExp) {
622-
const tooltip = await this.page.getByRole("tooltip").getByText(text);
623-
expect(tooltip).toBeVisible();
622+
const tooltip = this.page.getByRole("tooltip").getByText(text);
623+
await expect(tooltip).toBeVisible();
624624
}
625625
}

0 commit comments

Comments
 (0)