Skip to content

Commit ef3aaa6

Browse files
committed
fix(cypress): Correct oc namespace commands and add regression test script
- Fix oc label commands to use singular 'namespace' instead of 'namespaces' - Remove --ignore-not-found flag from cluster-admin role removal - Add test-cypress-incidents-regression npm script - Update dependencies (package-lock files)
1 parent 140a141 commit ef3aaa6

4 files changed

Lines changed: 2306 additions & 2213 deletions

File tree

package-lock.json

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/cypress/support/commands/operator-commands.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ const operatorUtils = {
192192
'Operator installed successfully',
193193
);
194194
cy.exec(
195-
`oc label namespaces ${MCP.namespace} openshift.io/cluster-monitoring=true --overwrite=true --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
195+
`oc label namespace ${MCP.namespace} openshift.io/cluster-monitoring=true --overwrite=true --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
196196
);
197197
} else if (Cypress.env('KONFLUX_COO_BUNDLE_IMAGE')) {
198198
cy.log('KONFLUX_COO_BUNDLE_IMAGE is set. COO operator will be installed from Konflux bundle.');
@@ -204,7 +204,7 @@ const operatorUtils = {
204204
`oc create namespace ${MCP.namespace} --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
205205
);
206206
cy.exec(
207-
`oc label namespaces ${MCP.namespace} openshift.io/cluster-monitoring=true --overwrite=true --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
207+
`oc label namespace ${MCP.namespace} openshift.io/cluster-monitoring=true --overwrite=true --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
208208
);
209209
cy.exec(
210210
`operator-sdk run bundle --timeout=10m --namespace ${MCP.namespace} ${Cypress.env('KONFLUX_COO_BUNDLE_IMAGE')} --kubeconfig ${Cypress.env('KUBECONFIG_PATH')} --verbose `,
@@ -220,7 +220,7 @@ const operatorUtils = {
220220
`oc create namespace ${MCP.namespace} --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
221221
);
222222
cy.exec(
223-
`oc label namespaces ${MCP.namespace} openshift.io/cluster-monitoring=true --overwrite=true --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
223+
`oc label namespace ${MCP.namespace} openshift.io/cluster-monitoring=true --overwrite=true --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
224224
);
225225
cy.exec(
226226
`operator-sdk run bundle --timeout=10m --namespace ${MCP.namespace} ${Cypress.env('CUSTOM_COO_BUNDLE_IMAGE')} --kubeconfig ${Cypress.env('KUBECONFIG_PATH')} --verbose `,
@@ -323,7 +323,7 @@ const operatorUtils = {
323323
cy.exec(`oc apply -f ./cypress/fixtures/coo/thanos-querier-datasource.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
324324

325325
cy.exec(
326-
`oc label namespaces ${MCP.namespace} openshift.io/cluster-monitoring=true --overwrite=true --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
326+
`oc label namespace ${MCP.namespace} openshift.io/cluster-monitoring=true --overwrite=true --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
327327
);
328328

329329
cy.log('Create Monitoring UI Plugin instance.');
@@ -488,7 +488,7 @@ const operatorUtils = {
488488
RemoveClusterAdminRole(): void {
489489
cy.log('Remove cluster-admin role from user.');
490490
cy.executeAndDelete(
491-
`oc adm policy remove-cluster-role-from-user cluster-admin ${Cypress.env('LOGIN_USERNAME')} --ignore-not-found --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
491+
`oc adm policy remove-cluster-role-from-user cluster-admin ${Cypress.env('LOGIN_USERNAME')} --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
492492
);
493493
},
494494

0 commit comments

Comments
 (0)