From 548db6172213858691c3b93dc77cb8fd48d4fc3c Mon Sep 17 00:00:00 2001 From: spalger Date: Mon, 24 Feb 2020 12:44:27 -0700 Subject: [PATCH] overwrite ciGroup script to support jest in flaky testing job --- test/scripts/jenkins_ci_group.sh | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index 4b6b7a926253..d297d4f5f529 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -1,33 +1,5 @@ #!/usr/bin/env bash -source test/scripts/jenkins_test_setup_oss.sh +source src/dev/ci_setup/setup_env.sh -if [[ -z "$CODE_COVERAGE" ]]; then - checks-reporter-with-killswitch "Functional tests / Group ${CI_GROUP}" yarn run grunt "run:functionalTests_ciGroup${CI_GROUP}"; - - if [ "$CI_GROUP" == "1" ]; then - source test/scripts/jenkins_build_kbn_tp_sample_panel_action.sh - yarn run grunt run:pluginFunctionalTestsRelease --from=source; - yarn run grunt run:exampleFunctionalTestsRelease --from=source; - yarn run grunt run:interpreterFunctionalTestsRelease; - fi -else - echo " -> Running Functional tests with code coverage" - export NODE_OPTIONS=--max_old_space_size=8192 - - echo " -> making hard link clones" - cd .. - cp -RlP kibana "kibana${CI_GROUP}" - cd "kibana${CI_GROUP}" - - echo " -> running tests from the clone folder" - yarn run grunt "run:functionalTests_ciGroup${CI_GROUP}"; - - if [[ -d target/kibana-coverage/functional ]]; then - echo " -> replacing kibana${CI_GROUP} with kibana in json files" - sed -i "s|kibana${CI_GROUP}|kibana|g" target/kibana-coverage/functional/*.json - echo " -> copying coverage to the original folder" - mkdir -p ../kibana/target/kibana-coverage/functional - cp -R target/kibana-coverage/functional/. ../kibana/target/kibana-coverage/functional/ - fi -fi \ No newline at end of file +node scripts/jest