From 69eb3cb2c54b13410a71b13fc6f7bac720a53666 Mon Sep 17 00:00:00 2001 From: Kawika Avilla Date: Tue, 30 May 2023 23:25:00 +0000 Subject: [PATCH 01/11] Use chrome Signed-off-by: Kawika Avilla --- .github/workflows/cypress_workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cypress_workflow.yml b/.github/workflows/cypress_workflow.yml index a487ac774a7c..1039dac9a246 100644 --- a/.github/workflows/cypress_workflow.yml +++ b/.github/workflows/cypress_workflow.yml @@ -76,7 +76,7 @@ jobs: working-directory: ${{ env.FTR_PATH }} start: ${{ env.OPENSEARCH_SNAPSHOT_CMD }}, ${{ env.START_CMD }} wait-on: 'http://localhost:9200, http://localhost:5601' - command: ${{ env.CYPRESS_ENV }} yarn cypress:run-without-security --browser chromium --spec ${{ env.SPEC }} + command: ${{ env.CYPRESS_ENV }} yarn cypress:run-without-security --browser chrome --spec ${{ env.SPEC }} # Screenshots are only captured on failure, will change this once we do visual regression tests - uses: actions/upload-artifact@v3 From fc96f892c7ac267ced4918a5829d7024fbec3264 Mon Sep 17 00:00:00 2001 From: Kawika Avilla Date: Tue, 30 May 2023 23:26:16 +0000 Subject: [PATCH 02/11] DELETEME Signed-off-by: Kawika Avilla --- .github/workflows/cypress_workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cypress_workflow.yml b/.github/workflows/cypress_workflow.yml index 1039dac9a246..546671e01278 100644 --- a/.github/workflows/cypress_workflow.yml +++ b/.github/workflows/cypress_workflow.yml @@ -11,7 +11,7 @@ env: FTR_PATH: 'ftr' START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch' OPENSEARCH_SNAPSHOT_CMD: 'node ../scripts/opensearch snapshot' - SPEC: 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/**/*.js,' + SPEC: 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/vis_type_table/data.spec.js' CYPRESS_ENV: 'env CYPRESS_VISBUILDER_ENABLED=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=false' jobs: From 4bee9ed646515d7695403419fd36b525aa01038c Mon Sep 17 00:00:00 2001 From: Kawika Avilla Date: Tue, 30 May 2023 23:29:27 +0000 Subject: [PATCH 03/11] DELETEME Signed-off-by: Kawika Avilla --- .github/workflows/build_and_test_workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test_workflow.yml b/.github/workflows/build_and_test_workflow.yml index 8fd3a402d547..1fe856446c3b 100644 --- a/.github/workflows/build_and_test_workflow.yml +++ b/.github/workflows/build_and_test_workflow.yml @@ -6,12 +6,12 @@ name: Build and test # trigger on every commit push and PR for all branches except pushes for backport branches on: push: - branches: ['**', '!backport/**'] + branches: ['!**', '!backport/**'] paths-ignore: - '**/*.md' - 'docs/**' pull_request: - branches: ['**'] + branches: ['!**'] paths-ignore: - '**/*.md' - 'docs/**' From 646e0013c0f5c9a744cebcdd15d75a459efa14d8 Mon Sep 17 00:00:00 2001 From: Kawika Avilla Date: Tue, 30 May 2023 23:44:26 +0000 Subject: [PATCH 04/11] use github stuff Signed-off-by: Kawika Avilla --- .github/workflows/cypress_workflow.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/cypress_workflow.yml b/.github/workflows/cypress_workflow.yml index 546671e01278..af9ebc1b2906 100644 --- a/.github/workflows/cypress_workflow.yml +++ b/.github/workflows/cypress_workflow.yml @@ -17,9 +17,6 @@ env: jobs: cypress-tests: runs-on: ubuntu-latest - container: - image: docker://opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v2 - options: --user 1001 env: # prevents extra Cypress installation progress messages CI: 1 From cd7cfdda0c08e5bab819451ae2e9557d0522514f Mon Sep 17 00:00:00 2001 From: Kawika Avilla Date: Wed, 31 May 2023 12:36:22 +0000 Subject: [PATCH 05/11] use v5 Signed-off-by: Kawika Avilla --- .github/workflows/cypress_workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cypress_workflow.yml b/.github/workflows/cypress_workflow.yml index af9ebc1b2906..f0d49ec41c1c 100644 --- a/.github/workflows/cypress_workflow.yml +++ b/.github/workflows/cypress_workflow.yml @@ -68,12 +68,12 @@ jobs: - run: npx cypress cache path - name: Run tests - uses: cypress-io/github-action@v2 + uses: cypress-io/github-action@v5 with: working-directory: ${{ env.FTR_PATH }} start: ${{ env.OPENSEARCH_SNAPSHOT_CMD }}, ${{ env.START_CMD }} wait-on: 'http://localhost:9200, http://localhost:5601' - command: ${{ env.CYPRESS_ENV }} yarn cypress:run-without-security --browser chrome --spec ${{ env.SPEC }} + command: ${{ env.CYPRESS_ENV }} yarn cypress:run-without-security --browser chromium --spec ${{ env.SPEC }} # Screenshots are only captured on failure, will change this once we do visual regression tests - uses: actions/upload-artifact@v3 From d0a1c7a07661844a659d67c3056889241ac97e73 Mon Sep 17 00:00:00 2001 From: Kawika Avilla Date: Wed, 31 May 2023 12:56:23 +0000 Subject: [PATCH 06/11] set server host Signed-off-by: Kawika Avilla --- .github/workflows/cypress_workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cypress_workflow.yml b/.github/workflows/cypress_workflow.yml index f0d49ec41c1c..959482270624 100644 --- a/.github/workflows/cypress_workflow.yml +++ b/.github/workflows/cypress_workflow.yml @@ -9,7 +9,7 @@ on: env: FTR_PATH: 'ftr' - START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch' + START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch --server:host=0.0.0.0' OPENSEARCH_SNAPSHOT_CMD: 'node ../scripts/opensearch snapshot' SPEC: 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/vis_type_table/data.spec.js' CYPRESS_ENV: 'env CYPRESS_VISBUILDER_ENABLED=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=false' From cfa5a9493e2a1c52527cab17fed72b612b1ebf89 Mon Sep 17 00:00:00 2001 From: Kawika Avilla Date: Wed, 31 May 2023 13:09:34 +0000 Subject: [PATCH 07/11] localhost Signed-off-by: Kawika Avilla --- .github/workflows/cypress_workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cypress_workflow.yml b/.github/workflows/cypress_workflow.yml index 959482270624..c2948ec95c51 100644 --- a/.github/workflows/cypress_workflow.yml +++ b/.github/workflows/cypress_workflow.yml @@ -9,10 +9,10 @@ on: env: FTR_PATH: 'ftr' - START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch --server:host=0.0.0.0' + START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch --server.host=0.0.0.0' OPENSEARCH_SNAPSHOT_CMD: 'node ../scripts/opensearch snapshot' SPEC: 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/vis_type_table/data.spec.js' - CYPRESS_ENV: 'env CYPRESS_VISBUILDER_ENABLED=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=false' + CYPRESS_ENV: 'env CYPRESS_VISBUILDER_ENABLED=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=false --config "baseUrl=0.0.0.0:5601"' jobs: cypress-tests: From d52286093218ec519cf35822b34f4242c6314daf Mon Sep 17 00:00:00 2001 From: Kawika Avilla Date: Wed, 31 May 2023 13:26:28 +0000 Subject: [PATCH 08/11] config Signed-off-by: Kawika Avilla --- .github/workflows/cypress_workflow.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cypress_workflow.yml b/.github/workflows/cypress_workflow.yml index c2948ec95c51..b2b3721bb52d 100644 --- a/.github/workflows/cypress_workflow.yml +++ b/.github/workflows/cypress_workflow.yml @@ -12,7 +12,7 @@ env: START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch --server.host=0.0.0.0' OPENSEARCH_SNAPSHOT_CMD: 'node ../scripts/opensearch snapshot' SPEC: 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/vis_type_table/data.spec.js' - CYPRESS_ENV: 'env CYPRESS_VISBUILDER_ENABLED=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=false --config "baseUrl=0.0.0.0:5601"' + CYPRESS_ENV: 'env CYPRESS_VISBUILDER_ENABLED=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=false' jobs: cypress-tests: @@ -72,7 +72,8 @@ jobs: with: working-directory: ${{ env.FTR_PATH }} start: ${{ env.OPENSEARCH_SNAPSHOT_CMD }}, ${{ env.START_CMD }} - wait-on: 'http://localhost:9200, http://localhost:5601' + config: baseUrl=0.0.0.0:5601 + wait-on: 'http://localhost:9200, 0.0.0.0:5601' command: ${{ env.CYPRESS_ENV }} yarn cypress:run-without-security --browser chromium --spec ${{ env.SPEC }} # Screenshots are only captured on failure, will change this once we do visual regression tests From fcd33d919cf985d8f04c3754ac55773530dacbe2 Mon Sep 17 00:00:00 2001 From: Kawika Avilla Date: Wed, 31 May 2023 13:42:37 +0000 Subject: [PATCH 09/11] pass http Signed-off-by: Kawika Avilla --- .github/workflows/cypress_workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cypress_workflow.yml b/.github/workflows/cypress_workflow.yml index b2b3721bb52d..d064f822c095 100644 --- a/.github/workflows/cypress_workflow.yml +++ b/.github/workflows/cypress_workflow.yml @@ -73,7 +73,7 @@ jobs: working-directory: ${{ env.FTR_PATH }} start: ${{ env.OPENSEARCH_SNAPSHOT_CMD }}, ${{ env.START_CMD }} config: baseUrl=0.0.0.0:5601 - wait-on: 'http://localhost:9200, 0.0.0.0:5601' + wait-on: 'http://localhost:9200, http://0.0.0.0:5601' command: ${{ env.CYPRESS_ENV }} yarn cypress:run-without-security --browser chromium --spec ${{ env.SPEC }} # Screenshots are only captured on failure, will change this once we do visual regression tests From 51412540c9ec7f20d75213365411f787ec01703b Mon Sep 17 00:00:00 2001 From: Kawika Avilla Date: Wed, 31 May 2023 14:58:27 +0000 Subject: [PATCH 10/11] use my repo Signed-off-by: Kawika Avilla --- .github/workflows/cypress_workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cypress_workflow.yml b/.github/workflows/cypress_workflow.yml index d064f822c095..a70157a5573e 100644 --- a/.github/workflows/cypress_workflow.yml +++ b/.github/workflows/cypress_workflow.yml @@ -48,8 +48,8 @@ jobs: uses: actions/checkout@v2 with: path: ${{ env.FTR_PATH }} - repository: opensearch-project/opensearch-dashboards-functional-test - ref: '${{ github.base_ref }}' + repository: kavilla/opensearch-dashboards-functional-test + ref: 'avillk/add_range' - name: Get Cypress version id: cypress_version From b877ebd3220d8d3edefe68aaec81f15d9a245bc4 Mon Sep 17 00:00:00 2001 From: Kawika Avilla Date: Wed, 31 May 2023 15:11:48 +0000 Subject: [PATCH 11/11] test all Signed-off-by: Kawika Avilla --- .github/workflows/cypress_workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cypress_workflow.yml b/.github/workflows/cypress_workflow.yml index a70157a5573e..0a11a32be281 100644 --- a/.github/workflows/cypress_workflow.yml +++ b/.github/workflows/cypress_workflow.yml @@ -11,7 +11,7 @@ env: FTR_PATH: 'ftr' START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch --server.host=0.0.0.0' OPENSEARCH_SNAPSHOT_CMD: 'node ../scripts/opensearch snapshot' - SPEC: 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/vis_type_table/data.spec.js' + SPEC: 'cypress/integration/core-opensearch-dashboards/opensearch-dashboards/apps/vis_type_table/*.js' CYPRESS_ENV: 'env CYPRESS_VISBUILDER_ENABLED=true CYPRESS_DATASOURCE_MANAGEMENT_ENABLED=false' jobs: