From 982ce1009abd50021b9b628f2c0def72c85ba0e4 Mon Sep 17 00:00:00 2001 From: Robert Oskamp Date: Mon, 11 Nov 2019 10:18:43 +0100 Subject: [PATCH 1/3] Make navigation service more stable --- .../services/machine_learning/navigation.ts | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/x-pack/test/functional/services/machine_learning/navigation.ts b/x-pack/test/functional/services/machine_learning/navigation.ts index a55eae9122485..06ab99b3dcb9f 100644 --- a/x-pack/test/functional/services/machine_learning/navigation.ts +++ b/x-pack/test/functional/services/machine_learning/navigation.ts @@ -32,12 +32,10 @@ export function MachineLearningNavigationProvider({ }, async navigateToArea(linkSubject: string, pageSubject: string) { - await retry.tryForTime(2 * 60 * 1000, async () => { - if ((await testSubjects.exists(`${linkSubject} selected`)) === false) { - await testSubjects.click(linkSubject); - await testSubjects.existOrFail(`${linkSubject} selected`, { timeout: 30 * 1000 }); - await testSubjects.existOrFail(pageSubject, { timeout: 30 * 1000 }); - } + await testSubjects.click(linkSubject); + await retry.tryForTime(60 * 1000, async () => { + await testSubjects.existOrFail(`${linkSubject} & ~selected`); + await testSubjects.existOrFail(pageSubject); }); }, @@ -51,11 +49,11 @@ export function MachineLearningNavigationProvider({ }, async navigateToOverview() { - await this.navigateToArea('mlMainTab overview', 'mlPageOverview'); + await this.navigateToArea('~mlMainTab & ~overview', 'mlPageOverview'); }, async navigateToAnomalyDetection() { - await this.navigateToArea('mlMainTab anomalyDetection', 'mlPageJobManagement'); + await this.navigateToArea('~mlMainTab & ~anomalyDetection', 'mlPageJobManagement'); await this.assertTabsExist('mlSubTab', [ 'jobManagement', 'anomalyExplorer', @@ -65,33 +63,33 @@ export function MachineLearningNavigationProvider({ }, async navigateToDataFrameAnalytics() { - await this.navigateToArea('mlMainTab dataFrameAnalytics', 'mlPageDataFrameAnalytics'); + await this.navigateToArea('~mlMainTab & ~dataFrameAnalytics', 'mlPageDataFrameAnalytics'); await this.assertTabsExist('mlSubTab', []); }, async navigateToDataVisualizer() { - await this.navigateToArea('mlMainTab dataVisualizer', 'mlPageDataVisualizerSelector'); + await this.navigateToArea('~mlMainTab & ~dataVisualizer', 'mlPageDataVisualizerSelector'); await this.assertTabsExist('mlSubTab', []); }, async navigateToJobManagement() { await this.navigateToAnomalyDetection(); - await this.navigateToArea('mlSubTab jobManagement', 'mlPageJobManagement'); + await this.navigateToArea('~mlSubTab & ~jobManagement', 'mlPageJobManagement'); }, async navigateToAnomalyExplorer() { await this.navigateToAnomalyDetection(); - await this.navigateToArea('mlSubTab anomalyExplorer', 'mlPageAnomalyExplorer'); + await this.navigateToArea('~mlSubTab & ~anomalyExplorer', 'mlPageAnomalyExplorer'); }, async navigateToSingleMetricViewer() { await this.navigateToAnomalyDetection(); - await this.navigateToArea('mlSubTab singleMetricViewer', 'mlPageSingleMetricViewer'); + await this.navigateToArea('~mlSubTab & ~singleMetricViewer', 'mlPageSingleMetricViewer'); }, async navigateToSettings() { await this.navigateToAnomalyDetection(); - await this.navigateToArea('mlSubTab settings', 'mlPageSettings'); + await this.navigateToArea('~mlSubTab & ~settings', 'mlPageSettings'); }, }; } From ef4d1064459b6344c1306fd8315001a6911c9750 Mon Sep 17 00:00:00 2001 From: Robert Oskamp Date: Mon, 11 Nov 2019 10:29:19 +0100 Subject: [PATCH 2/3] Execute xpack ciGroup3 20x --- .ci/jobs.yml | 79 ++++++++++++++-------- test/scripts/jenkins_build_kibana.sh | 2 +- test/scripts/jenkins_ci_group.sh | 2 +- test/scripts/jenkins_xpack_build_kibana.sh | 22 +++--- test/scripts/jenkins_xpack_ci_group.sh | 22 +++--- 5 files changed, 73 insertions(+), 54 deletions(-) diff --git a/.ci/jobs.yml b/.ci/jobs.yml index a2d8100f78efd..2524d59916755 100644 --- a/.ci/jobs.yml +++ b/.ci/jobs.yml @@ -1,36 +1,55 @@ JOB: - - kibana-intake - - x-pack-intake - - kibana-firefoxSmoke - - kibana-ciGroup1 - - kibana-ciGroup2 - - kibana-ciGroup3 - - kibana-ciGroup4 - - kibana-ciGroup5 - - kibana-ciGroup6 - - kibana-ciGroup7 - - kibana-ciGroup8 - - kibana-ciGroup9 - - kibana-ciGroup10 - - kibana-ciGroup11 - - kibana-ciGroup12 - - kibana-accessibility - - kibana-visualRegression + #- kibana-intake + #- x-pack-intake + #- kibana-firefoxSmoke + #- kibana-ciGroup1 + #- kibana-ciGroup2 + #- kibana-ciGroup3 + #- kibana-ciGroup4 + #- kibana-ciGroup5 + #- kibana-ciGroup6 + #- kibana-ciGroup7 + #- kibana-ciGroup8 + #- kibana-ciGroup9 + #- kibana-ciGroup10 + #- kibana-ciGroup11 + #- kibana-ciGroup12 + #- kibana-accessibility + #- kibana-visualRegression # make sure all x-pack-ciGroups are listed in test/scripts/jenkins_xpack_ci_group.sh - - x-pack-firefoxSmoke - - x-pack-ciGroup1 - - x-pack-ciGroup2 - - x-pack-ciGroup3 - - x-pack-ciGroup4 - - x-pack-ciGroup5 - - x-pack-ciGroup6 - - x-pack-ciGroup7 - - x-pack-ciGroup8 - - x-pack-ciGroup9 - - x-pack-ciGroup10 - - x-pack-accessibility - - x-pack-visualRegression + #- x-pack-firefoxSmoke + #- x-pack-ciGroup1 + #- x-pack-ciGroup2 + - x-pack-ciGroup3-1 + - x-pack-ciGroup3-2 + - x-pack-ciGroup3-3 + - x-pack-ciGroup3-4 + - x-pack-ciGroup3-5 + - x-pack-ciGroup3-6 + - x-pack-ciGroup3-7 + - x-pack-ciGroup3-8 + - x-pack-ciGroup3-9 + - x-pack-ciGroup3-10 + - x-pack-ciGroup3-11 + - x-pack-ciGroup3-12 + - x-pack-ciGroup3-13 + - x-pack-ciGroup3-14 + - x-pack-ciGroup3-15 + - x-pack-ciGroup3-16 + - x-pack-ciGroup3-17 + - x-pack-ciGroup3-18 + - x-pack-ciGroup3-19 + - x-pack-ciGroup3-20 + #- x-pack-ciGroup4 + #- x-pack-ciGroup5 + #- x-pack-ciGroup6 + #- x-pack-ciGroup7 + #- x-pack-ciGroup8 + #- x-pack-ciGroup9 + #- x-pack-ciGroup10 + #- x-pack-accessibility + #- x-pack-visualRegression # `~` is yaml for `null` exclude: ~ diff --git a/test/scripts/jenkins_build_kibana.sh b/test/scripts/jenkins_build_kibana.sh index f79fe98e07bef..df0c1c9aad68a 100755 --- a/test/scripts/jenkins_build_kibana.sh +++ b/test/scripts/jenkins_build_kibana.sh @@ -6,7 +6,7 @@ echo " -> downloading es snapshot" node scripts/es snapshot --license=oss --download-only; echo " -> Ensuring all functional tests are in a ciGroup" -yarn run grunt functionalTests:ensureAllTestsInCiGroup; +#yarn run grunt functionalTests:ensureAllTestsInCiGroup; echo " -> building and extracting OSS Kibana distributable for use in functional tests" node scripts/build --debug --oss diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index c6bddb69aa570..b46a9c6240734 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -3,7 +3,7 @@ source test/scripts/jenkins_test_setup.sh if [[ -z "$IS_PIPELINE_JOB" ]] ; then - yarn run grunt functionalTests:ensureAllTestsInCiGroup; + #yarn run grunt functionalTests:ensureAllTestsInCiGroup; node scripts/build --debug --oss; else installDir="$(realpath $PARENT_DIR/kibana/build/oss/kibana-*-SNAPSHOT-linux-x86_64)" diff --git a/test/scripts/jenkins_xpack_build_kibana.sh b/test/scripts/jenkins_xpack_build_kibana.sh index 9f2bafc863f41..75d7b7d816fbe 100755 --- a/test/scripts/jenkins_xpack_build_kibana.sh +++ b/test/scripts/jenkins_xpack_build_kibana.sh @@ -8,17 +8,17 @@ node scripts/es snapshot --download-only; echo " -> Ensuring all functional tests are in a ciGroup" cd "$XPACK_DIR" -node scripts/functional_tests --assert-none-excluded \ - --include-tag ciGroup1 \ - --include-tag ciGroup2 \ - --include-tag ciGroup3 \ - --include-tag ciGroup4 \ - --include-tag ciGroup5 \ - --include-tag ciGroup6 \ - --include-tag ciGroup7 \ - --include-tag ciGroup8 \ - --include-tag ciGroup9 \ - --include-tag ciGroup10 +#node scripts/functional_tests --assert-none-excluded \ +# --include-tag ciGroup1 \ +# --include-tag ciGroup2 \ +# --include-tag ciGroup3 \ +# --include-tag ciGroup4 \ +# --include-tag ciGroup5 \ +# --include-tag ciGroup6 \ +# --include-tag ciGroup7 \ +# --include-tag ciGroup8 \ +# --include-tag ciGroup9 \ +# --include-tag ciGroup10 echo " -> building and extracting default Kibana distributable for use in functional tests" cd "$KIBANA_DIR" diff --git a/test/scripts/jenkins_xpack_ci_group.sh b/test/scripts/jenkins_xpack_ci_group.sh index fba05f8f252d7..aba23580e5a0d 100755 --- a/test/scripts/jenkins_xpack_ci_group.sh +++ b/test/scripts/jenkins_xpack_ci_group.sh @@ -5,17 +5,17 @@ source test/scripts/jenkins_test_setup.sh if [[ -z "$IS_PIPELINE_JOB" ]] ; then echo " -> Ensuring all functional tests are in a ciGroup" cd "$XPACK_DIR" - node scripts/functional_tests --assert-none-excluded \ - --include-tag ciGroup1 \ - --include-tag ciGroup2 \ - --include-tag ciGroup3 \ - --include-tag ciGroup4 \ - --include-tag ciGroup5 \ - --include-tag ciGroup6 \ - --include-tag ciGroup7 \ - --include-tag ciGroup8 \ - --include-tag ciGroup9 \ - --include-tag ciGroup10 + #node scripts/functional_tests --assert-none-excluded \ + # --include-tag ciGroup1 \ + # --include-tag ciGroup2 \ + # --include-tag ciGroup3 \ + # --include-tag ciGroup4 \ + # --include-tag ciGroup5 \ + # --include-tag ciGroup6 \ + # --include-tag ciGroup7 \ + # --include-tag ciGroup8 \ + # --include-tag ciGroup9 \ + # --include-tag ciGroup10 fi cd "$KIBANA_DIR" From 423e80f328b8f785c7e7f8fff4c35240380b5e5e Mon Sep 17 00:00:00 2001 From: Robert Oskamp Date: Tue, 12 Nov 2019 08:20:47 +0100 Subject: [PATCH 3/3] Revert "Execute xpack ciGroup3 20x" This reverts commit ef4d1064459b6344c1306fd8315001a6911c9750. --- .ci/jobs.yml | 79 ++++++++-------------- test/scripts/jenkins_build_kibana.sh | 2 +- test/scripts/jenkins_ci_group.sh | 2 +- test/scripts/jenkins_xpack_build_kibana.sh | 22 +++--- test/scripts/jenkins_xpack_ci_group.sh | 22 +++--- 5 files changed, 54 insertions(+), 73 deletions(-) diff --git a/.ci/jobs.yml b/.ci/jobs.yml index 2524d59916755..a2d8100f78efd 100644 --- a/.ci/jobs.yml +++ b/.ci/jobs.yml @@ -1,55 +1,36 @@ JOB: - #- kibana-intake - #- x-pack-intake - #- kibana-firefoxSmoke - #- kibana-ciGroup1 - #- kibana-ciGroup2 - #- kibana-ciGroup3 - #- kibana-ciGroup4 - #- kibana-ciGroup5 - #- kibana-ciGroup6 - #- kibana-ciGroup7 - #- kibana-ciGroup8 - #- kibana-ciGroup9 - #- kibana-ciGroup10 - #- kibana-ciGroup11 - #- kibana-ciGroup12 - #- kibana-accessibility - #- kibana-visualRegression + - kibana-intake + - x-pack-intake + - kibana-firefoxSmoke + - kibana-ciGroup1 + - kibana-ciGroup2 + - kibana-ciGroup3 + - kibana-ciGroup4 + - kibana-ciGroup5 + - kibana-ciGroup6 + - kibana-ciGroup7 + - kibana-ciGroup8 + - kibana-ciGroup9 + - kibana-ciGroup10 + - kibana-ciGroup11 + - kibana-ciGroup12 + - kibana-accessibility + - kibana-visualRegression # make sure all x-pack-ciGroups are listed in test/scripts/jenkins_xpack_ci_group.sh - #- x-pack-firefoxSmoke - #- x-pack-ciGroup1 - #- x-pack-ciGroup2 - - x-pack-ciGroup3-1 - - x-pack-ciGroup3-2 - - x-pack-ciGroup3-3 - - x-pack-ciGroup3-4 - - x-pack-ciGroup3-5 - - x-pack-ciGroup3-6 - - x-pack-ciGroup3-7 - - x-pack-ciGroup3-8 - - x-pack-ciGroup3-9 - - x-pack-ciGroup3-10 - - x-pack-ciGroup3-11 - - x-pack-ciGroup3-12 - - x-pack-ciGroup3-13 - - x-pack-ciGroup3-14 - - x-pack-ciGroup3-15 - - x-pack-ciGroup3-16 - - x-pack-ciGroup3-17 - - x-pack-ciGroup3-18 - - x-pack-ciGroup3-19 - - x-pack-ciGroup3-20 - #- x-pack-ciGroup4 - #- x-pack-ciGroup5 - #- x-pack-ciGroup6 - #- x-pack-ciGroup7 - #- x-pack-ciGroup8 - #- x-pack-ciGroup9 - #- x-pack-ciGroup10 - #- x-pack-accessibility - #- x-pack-visualRegression + - x-pack-firefoxSmoke + - x-pack-ciGroup1 + - x-pack-ciGroup2 + - x-pack-ciGroup3 + - x-pack-ciGroup4 + - x-pack-ciGroup5 + - x-pack-ciGroup6 + - x-pack-ciGroup7 + - x-pack-ciGroup8 + - x-pack-ciGroup9 + - x-pack-ciGroup10 + - x-pack-accessibility + - x-pack-visualRegression # `~` is yaml for `null` exclude: ~ diff --git a/test/scripts/jenkins_build_kibana.sh b/test/scripts/jenkins_build_kibana.sh index df0c1c9aad68a..f79fe98e07bef 100755 --- a/test/scripts/jenkins_build_kibana.sh +++ b/test/scripts/jenkins_build_kibana.sh @@ -6,7 +6,7 @@ echo " -> downloading es snapshot" node scripts/es snapshot --license=oss --download-only; echo " -> Ensuring all functional tests are in a ciGroup" -#yarn run grunt functionalTests:ensureAllTestsInCiGroup; +yarn run grunt functionalTests:ensureAllTestsInCiGroup; echo " -> building and extracting OSS Kibana distributable for use in functional tests" node scripts/build --debug --oss diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index b46a9c6240734..c6bddb69aa570 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -3,7 +3,7 @@ source test/scripts/jenkins_test_setup.sh if [[ -z "$IS_PIPELINE_JOB" ]] ; then - #yarn run grunt functionalTests:ensureAllTestsInCiGroup; + yarn run grunt functionalTests:ensureAllTestsInCiGroup; node scripts/build --debug --oss; else installDir="$(realpath $PARENT_DIR/kibana/build/oss/kibana-*-SNAPSHOT-linux-x86_64)" diff --git a/test/scripts/jenkins_xpack_build_kibana.sh b/test/scripts/jenkins_xpack_build_kibana.sh index 75d7b7d816fbe..9f2bafc863f41 100755 --- a/test/scripts/jenkins_xpack_build_kibana.sh +++ b/test/scripts/jenkins_xpack_build_kibana.sh @@ -8,17 +8,17 @@ node scripts/es snapshot --download-only; echo " -> Ensuring all functional tests are in a ciGroup" cd "$XPACK_DIR" -#node scripts/functional_tests --assert-none-excluded \ -# --include-tag ciGroup1 \ -# --include-tag ciGroup2 \ -# --include-tag ciGroup3 \ -# --include-tag ciGroup4 \ -# --include-tag ciGroup5 \ -# --include-tag ciGroup6 \ -# --include-tag ciGroup7 \ -# --include-tag ciGroup8 \ -# --include-tag ciGroup9 \ -# --include-tag ciGroup10 +node scripts/functional_tests --assert-none-excluded \ + --include-tag ciGroup1 \ + --include-tag ciGroup2 \ + --include-tag ciGroup3 \ + --include-tag ciGroup4 \ + --include-tag ciGroup5 \ + --include-tag ciGroup6 \ + --include-tag ciGroup7 \ + --include-tag ciGroup8 \ + --include-tag ciGroup9 \ + --include-tag ciGroup10 echo " -> building and extracting default Kibana distributable for use in functional tests" cd "$KIBANA_DIR" diff --git a/test/scripts/jenkins_xpack_ci_group.sh b/test/scripts/jenkins_xpack_ci_group.sh index aba23580e5a0d..fba05f8f252d7 100755 --- a/test/scripts/jenkins_xpack_ci_group.sh +++ b/test/scripts/jenkins_xpack_ci_group.sh @@ -5,17 +5,17 @@ source test/scripts/jenkins_test_setup.sh if [[ -z "$IS_PIPELINE_JOB" ]] ; then echo " -> Ensuring all functional tests are in a ciGroup" cd "$XPACK_DIR" - #node scripts/functional_tests --assert-none-excluded \ - # --include-tag ciGroup1 \ - # --include-tag ciGroup2 \ - # --include-tag ciGroup3 \ - # --include-tag ciGroup4 \ - # --include-tag ciGroup5 \ - # --include-tag ciGroup6 \ - # --include-tag ciGroup7 \ - # --include-tag ciGroup8 \ - # --include-tag ciGroup9 \ - # --include-tag ciGroup10 + node scripts/functional_tests --assert-none-excluded \ + --include-tag ciGroup1 \ + --include-tag ciGroup2 \ + --include-tag ciGroup3 \ + --include-tag ciGroup4 \ + --include-tag ciGroup5 \ + --include-tag ciGroup6 \ + --include-tag ciGroup7 \ + --include-tag ciGroup8 \ + --include-tag ciGroup9 \ + --include-tag ciGroup10 fi cd "$KIBANA_DIR"