Skip to content

Commit bdf42eb

Browse files
authored
Merge pull request #489 from josunect/cypress-core
[CI] Replace @core by @core-1 & @Core-2
2 parents d86f7fe + 342cf82 commit bdf42eb

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

plugin/cypress/integration/openshift/featureFiles/istio_config.feature

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,50 +14,50 @@ Feature: Kiali Istio Config page
1414
And user selects the "bookinfo" project
1515

1616
@bookinfo-app
17-
@core
17+
@core-2
1818
Scenario: See all Istio Config objects in the bookinfo namespace.
1919
Then user sees all the Istio Config objects in the bookinfo namespace
2020
And user sees Name information for Istio objects in ossmc
2121
And user sees Namespace information for Istio objects in ossmc
2222
And user sees Type information for Istio objects in ossmc
2323
And user sees Configuration information for Istio objects in ossmc
2424

25-
@core
25+
@core-2
2626
Scenario: Filter Istio Config objects by Istio Name
2727
When the user filters for "bookinfo-gateway"
2828
Then user only sees "bookinfo-gateway"
2929

30-
@core
30+
@core-2
3131
Scenario: Ability to create an AuthorizationPolicy object
3232
Then the user can create a "authorizationPolicy" Istio object in ossmc
3333

34-
@core
34+
@core-2
3535
Scenario: Ability to create a Gateway object
3636
Then the user can create a "gateway" Istio object in ossmc
3737

3838
@gateway-api
39-
@core
39+
@core-2
4040
Scenario: Ability to create a K8sGateway object
4141
Then the user can create a "k8sGateway" K8s Istio object in ossmc
4242

4343
@gateway-api
44-
@core
44+
@core-2
4545
Scenario: Ability to create a K8sReferenceGrant object
4646
Then the user can create a "k8sReferenceGrant" K8s Istio object in ossmc
4747

48-
@core
48+
@core-2
4949
Scenario: Ability to create a PeerAuthentication object
5050
Then the user can create a "peerAuthentication" Istio object in ossmc
5151

52-
@core
52+
@core-2
5353
Scenario: Ability to create a RequestAuthentication object
5454
Then the user can create a "requestAuthentication" Istio object in ossmc
5555

56-
@core
56+
@core-2
5757
Scenario: Ability to create a ServiceEntry object
5858
Then the user can create a "serviceEntry" Istio object in ossmc
5959

60-
@core
60+
@core-2
6161
Scenario: Ability to create a Sidecar object
6262
Then the user can create a "sidecar" Istio object in ossmc
6363

plugin/cypress/integration/openshift/featureFiles/sidebar_navigation.feature

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ Feature: Kiali sidebar integration with OCP Console
2020
Then user sees istio-system overview card
2121

2222
@bookinfo-app
23-
@core
23+
@core-1
2424
Scenario: Graph page is displayed correctly
2525
When user navigates to the OSSMC "Graph" page
2626
And user selects the "bookinfo" namespace in the graph
2727
Then user sees the "bookinfo" graph summary
2828

29-
@core
29+
@core-1
3030
Scenario: Istio Config page is displayed correctly
3131
When user navigates to the OSSMC "Istio Config" page
3232
Then user sees Istio Config page elements from Kiali
3333

34-
@core
34+
@core-1
3535
Scenario: Mesh page is displayed correctly
3636
When user navigates to the OSSMC "Mesh" page
3737
Then user sees the mesh side panel

plugin/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
"build:dev": "yarn clean && sh -ac '. ./.env.development; yarn ts-node node_modules/.bin/webpack'",
1313
"start": "sh -ac '. ./.env.development; yarn ts-node node_modules/.bin/webpack serve'",
1414
"start-console": "./start-console.sh",
15-
"cypress": "cypress open -e TAGS=\"@ossmc and @core and not @skip-ossmc\"",
16-
"cypress:run": "cypress run -e TAGS=\"@ossmc and @smoke\" && cypress run -e TAGS=\"@ossmc and @core and not @smoke and not @skip-ossmc\" && cypress run -e TAGS=\"@ossmc and @crd-validation\"",
17-
"cypress:run:junit": "cypress run --reporter cypress-multi-reporters --reporter-options configFile=reporter-config.json -e TAGS=\"@ossmc and @core and not @skip-ossmc\" && cypress run --reporter cypress-multi-reporters --reporter-options configFile=reporter-config.json -e TAGS=\"@ossmc and @crd-validation\"",
15+
"cypress": "cypress open -e TAGS=\"@ossmc and (@core-1 or @core-2) and not @skip-ossmc\"",
16+
"cypress:run": "cypress run -e TAGS=\"@ossmc and @smoke\" && cypress run -e TAGS=\"@ossmc and (@core-1 or @core-2) and not @smoke and not @skip-ossmc\" && cypress run -e TAGS=\"@ossmc and @crd-validation\"",
17+
"cypress:run:junit": "cypress run --reporter cypress-multi-reporters --reporter-options configFile=reporter-config.json -e TAGS=\"@ossmc and (@core-1 or @core-2) and not @skip-ossmc\" && cypress run --reporter cypress-multi-reporters --reporter-options configFile=reporter-config.json -e TAGS=\"@ossmc and @crd-validation\"",
1818
"cypress:run:test-group:junit": "cypress run --reporter cypress-multi-reporters --reporter-options configFile=reporter-config.json -e TAGS=\"${TEST_GROUP}\"",
1919
"cypress:run:ambient": "cypress run -e TAGS=\"@ambient and not @skip-ossmc\" && cypress run -e TAGS=\"@waypoint and not @skip-ossmc\" && cypress run -e TAGS=\"@waypoint-tracing and not @skip-ossmc\"",
2020
"cypress:run:ambient:junit": "cypress run --reporter cypress-multi-reporters --reporter-options configFile=reporter-config.json -e TAGS=\"@ambient and not @skip-ossmc\" && cypress run --reporter cypress-multi-reporters --reporter-options configFile=reporter-config.json -e TAGS=\"@waypoint and not @skip-ossmc\" && cypress run --reporter cypress-multi-reporters --reporter-options configFile=reporter-config.json -e TAGS=\"@waypoint-tracing and not @skip-ossmc\"",

0 commit comments

Comments
 (0)