Skip to content

Commit fcad18b

Browse files
committed
better selectors
2 parents 9283ce3 + c83176f commit fcad18b

47 files changed

Lines changed: 229 additions & 234 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.tekton/pipeline-ref.yaml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ spec:
151151
- name: name
152152
value: prefetch-dependencies-oci-ta
153153
- name: bundle
154-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.3@sha256:2229dbc5e15acc0a6d8aec526465aeb0ad54e269c311ac3d0aba88013845e308
154+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.3@sha256:9917d11f0a38c844184042d504b3d5605c009e6e43785fa113caae8b4c99b75e
155155
- name: kind
156156
value: task
157157
resolver: bundles
@@ -210,18 +210,14 @@ spec:
210210
- name: name
211211
value: buildah-remote-oci-ta
212212
- name: bundle
213-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.9@sha256:a9ca472e297388d6ef8d1f51ee205abee6076aed7c5356ec0df84f14a2e78ad8
213+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.9@sha256:4b3b76822c67fb734a9b3a5112e3810e271ee09d2777720a277a33870d3b038b
214214
- name: kind
215215
value: task
216216
resolver: bundles
217217
- name: build-image-index
218218
params:
219219
- name: IMAGE
220220
value: $(params.output-image)
221-
- name: COMMIT_SHA
222-
value: $(tasks.clone-repository.results.commit)
223-
- name: IMAGE_EXPIRES_AFTER
224-
value: $(params.image-expires-after)
225221
- name: ALWAYS_BUILD_INDEX
226222
value: "true"
227223
- name: IMAGES
@@ -236,7 +232,7 @@ spec:
236232
- name: name
237233
value: build-image-index
238234
- name: bundle
239-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.2@sha256:c7b0f7e1f743040d99a3532abbdfddc9484f80fd559a75171c97499c3eb5d163
235+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.3@sha256:ae3fa44f005054d4901d33413972227b5642d376968a67791535cdcc2e98473d
240236
- name: kind
241237
value: task
242238
resolver: bundles
@@ -299,7 +295,7 @@ spec:
299295
- name: name
300296
value: rpms-signature-scan
301297
- name: bundle
302-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:3d48fa2fcc898bae9ce730a71789c34758a767b44bc36fd24938779deef4ee96
298+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:7f2e8ed5c2d8b2433cc9a7779ce7c617de7eb0dc8f16d07d2a792cee816ed503
303299
- name: kind
304300
value: task
305301
resolver: bundles
@@ -326,7 +322,7 @@ spec:
326322
- name: name
327323
value: clair-scan
328324
- name: bundle
329-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:3fa03be0280f33d7070ea53f26d53e727199737a7a2b9a59a95071ae40a999ac
325+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:89924756c91ded746cf9ccc9f07907595e5b2454ddda0219132913a4875a5f59
330326
- name: kind
331327
value: task
332328
resolver: bundles
@@ -374,7 +370,7 @@ spec:
374370
- name: name
375371
value: sast-snyk-check-oci-ta
376372
- name: bundle
377-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:d83becbfefe2aa39971c3d37bdc23489b745e22fd86cf4872455a133f8cb274f
373+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:2ad986f28d0b724dabcf76c4de649f058f0e66998c7d2f61b66de46533bdbcad
378374
- name: kind
379375
value: task
380376
resolver: bundles
@@ -400,7 +396,7 @@ spec:
400396
- name: name
401397
value: sast-shell-check-oci-ta
402398
- name: bundle
403-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:6f047f52c04ee6e4d2cb25af46e3ea92b235f6c5e02da540fb7ef0b90718bc0a
399+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:c4ef47e3b4e0508572d266fb745be7e374c29dc02580328cbe9f4d472a8aca57
404400
- name: kind
405401
value: task
406402
resolver: bundles
@@ -426,7 +422,7 @@ spec:
426422
- name: name
427423
value: sast-unicode-check-oci-ta
428424
- name: bundle
429-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.4@sha256:55006815522c57c1f83451dc0cba723ff7427dbac48553538b75cda7bf886d79
425+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.4@sha256:0854d9261760b2dc8f092569739685a5ab0a5c620e9cb8c1b78fef9e2d077a29
430426
- name: kind
431427
value: task
432428
resolver: bundles

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ COPY pkg/ pkg/
1616

1717
RUN CGO_ENABLED=0 GOARCH=$TARGETARCH go build -ldflags "$LDFLAGS" -mod vendor -o plugin-backend cmd/plugin-backend.go
1818

19-
FROM --platform=linux/$TARGETARCH registry.access.redhat.com/ubi9/ubi-minimal:9.7-1773939694
19+
FROM --platform=linux/$TARGETARCH registry.access.redhat.com/ubi9/ubi-minimal:9.7-1775623882
2020

2121
COPY --from=web-builder /opt/app-root/web/dist ./web/dist
2222
COPY --from=go-builder /opt/app-root/plugin-backend ./

Dockerfile.cypress

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ COPY pkg/ pkg/
3434

3535
RUN CGO_ENABLED=0 go build -ldflags "$LDFLAGS" -mod vendor -o plugin-backend cmd/plugin-backend.go
3636

37-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1773939694
37+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1775623882
3838

3939
COPY --from=web-builder /opt/app-root/web/dist ./web/dist
4040
COPY --from=go-builder /opt/app-root/plugin-backend ./

Dockerfile.downstream

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG BUILDVERSION
22
ARG BUILDVERSION_Y
33

4-
FROM registry.access.redhat.com/ubi9/nodejs-22:9.7-1775152218 as web-builder
4+
FROM registry.access.redhat.com/ubi9/nodejs-22:9.7-1775695872 as web-builder
55

66
WORKDIR /opt/app-root
77

@@ -34,7 +34,7 @@ COPY pkg/ pkg/
3434
ENV GOEXPERIMENT strictfipsruntime
3535
RUN go build -tags strictfipsruntime -ldflags "-X 'main.buildVersion=$BUILDVERSION' -X 'main.buildDate=`date +%Y-%m-%d\ %H:%M`'" -mod vendor -o plugin-backend cmd/plugin-backend.go
3636

37-
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1773939694
37+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1775623882
3838
ARG BUILDVERSION
3939
ARG BUILDVERSION_Y
4040

web/cypress/e2e/topology/topology.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ describe('netflow-topology', () => {
4545
cy.get('#elementPanel-drawer-body').should('exist');
4646
cy.get('#drawer-tabs').click();
4747
cy.get('.element-metrics-container').should('exist');
48-
cy.get('.element-metrics-container svg').should('exist');
48+
cy.get('.pf-v5-c-chart').should('exist');
4949

5050
//close drawer
51-
cy.get('[aria-label="Close drawer panel"]').click();
52-
cy.get('#elementPanel-drawer-body').should('not.exist');
51+
cy.get('.pf-v5-c-drawer__close').click();
52+
cy.get('.pf-v5-c-drawer__panel-main').should('not.exist');
5353
});
5454

5555
it('update options', () => {

web/cypress/integration-tests/client_performance.cy.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ describe("(OCP-67725, memodi) Network_Observability Client Performances", { brow
4949
})
5050

5151
it("(OCP-67725, memodi, Network_Observability) should measure table page load times", function () {
52-
cy.get('#tabs-container li:nth-child(2)').click()
52+
cy.get('#tabs-container').contains('Traffic flows').click()
5353
netflowPage.clearAllFilters()
5454
const start = performance.now()
5555
const url = '**/backend/api/flow/metrics*'
@@ -71,7 +71,7 @@ describe("(OCP-67725, memodi) Network_Observability Client Performances", { brow
7171
})
7272

7373
it("(OCP-67725, memodi, Network_Observability) should measure topology page load times", function () {
74-
cy.get('#tabs-container li:nth-child(3)').click()
74+
cy.get('#tabs-container').contains('Topology').click()
7575
netflowPage.clearAllFilters()
7676
const start = performance.now()
7777
cy.intercept('GET', getTopologyScopeURL("namespace"), {

web/cypress/integration-tests/dns_dashboards.cy.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ describe('(OCP-67087 Network_Observability) DNSTracking test', { tags: ['Network
3636

3737
it("(OCP-67087, aramesha, Network_Observability) Validate DNSLatencies edge label and Query Summary stats", function () {
3838
netflowPage.visit()
39-
cy.get('#tabs-container li:nth-child(3)').click()
39+
cy.get('#tabs-container').contains('Topology').click()
4040
cy.get('#drawer').should('not.be.empty')
4141
cy.get(filterSelectors.filterInput).type("dns_latency>=0" + '{enter}')
4242

@@ -56,7 +56,7 @@ describe('(OCP-67087 Network_Observability) DNSTracking test', { tags: ['Network
5656
cy.byTestID("scope-dropdown").click().get("#host").click()
5757
cy.contains('Display options').should('exist').click()
5858

59-
cy.get('[data-test-id=edge-handler]').should('exist').each((g) => {
59+
cy.byLegacyTestID('edge-handler').should('exist').each((g) => {
6060
expect(g.text()).to.match(/\d+\s*ms/);
6161
});
6262

web/cypress/integration-tests/dns_tracking.cy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ describe('(OCP-67087 Network_Observability) DNSTracking test', { tags: ['Network
4848
})
4949

5050
it("(OCP-67087, aramesha) Validate DNSTracking columns and DNSName", function () {
51-
cy.get('#tabs-container li:nth-child(2)').click()
51+
cy.get('#tabs-container').contains('Traffic flows').click()
5252
cy.byTestID("table-composable").should('exist')
5353
netflowPage.stopAutoRefresh()
5454

web/cypress/integration-tests/flowRTT.cy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ describe('(OCP-68246 Network_Observability) FlowRTT test', { tags: ['Network_Obs
4747
})
4848

4949
it("(OCP-68246, aramesha, Network_Observability) Verify default flowRTT column", function () {
50-
cy.get('#tabs-container li:nth-child(2)').click()
50+
cy.get('#tabs-container').contains('Traffic flows').click()
5151
cy.byTestID("table-composable").should('exist')
5252
netflowPage.stopAutoRefresh()
5353

web/cypress/integration-tests/flowRTT_dashboards.cy.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ describe('(OCP-68246 Network_Observability) FlowRTT test', { tags: ['Network_Obs
3333

3434
it("(OCP-68246, aramesha, Network_Observability) Validate flowRTT edge labels and Query Summary stats", function () {
3535
netflowPage.visit()
36-
cy.get('#tabs-container li:nth-child(3)').click()
36+
cy.get('#tabs-container').contains('Topology').click()
3737
cy.get('#drawer').should('not.be.empty')
3838

3939
cy.byTestID("show-view-options-button").should('exist').click().then(views => {
@@ -55,7 +55,7 @@ describe('(OCP-68246 Network_Observability) FlowRTT test', { tags: ['Network_Obs
5555
// filter on TCP protocol
5656
cy.get(filterSelectors.filterInput).type("protocol=TCP" + '{enter}').click()
5757

58-
cy.get('[data-test-id=edge-handler]').each((g) => {
58+
cy.byLegacyTestID('edge-handler').each((g) => {
5959
expect(g.text()).to.match(/\d+\s*ms/);
6060
});
6161
netflowPage.clearAllFilters()
@@ -73,7 +73,7 @@ describe('(OCP-68246 Network_Observability) FlowRTT test', { tags: ['Network_Obs
7373
dashboard.visitDashboard("netobserv-main")
7474

7575
// verify 'TCP latency,p99' panel
76-
cy.get('[data-test="tcp-latency,-p99-chart"]').find(graphSelector.graphBody).should('not.have.class', 'graph-empty-state')
76+
cy.checkDashboards(['tcp-latency,-p99-chart'])
7777

7878
cy.checkDashboards(flowRTTPanels)
7979
})

0 commit comments

Comments
 (0)