Skip to content

Commit

Permalink
run ciGroup5 15x times
Browse files Browse the repository at this point in the history
  • Loading branch information
dmlemeshko committed Sep 18, 2019
1 parent 69d1ce1 commit 9c19d9a
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 21 deletions.
41 changes: 28 additions & 13 deletions .ci/jobs.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,35 @@
JOB:
- intake
- firefoxSmoke
- kibana-ciGroup1
- kibana-ciGroup2
- kibana-ciGroup3
- kibana-ciGroup4
- kibana-ciGroup5
- kibana-ciGroup6
# - intake
# - firefoxSmoke
# - kibana-ciGroup1
# - kibana-ciGroup2
# - kibana-ciGroup3
# - kibana-ciGroup4
- kibana-ciGroup5-1
- kibana-ciGroup5-2
- kibana-ciGroup5-3
- kibana-ciGroup5-4
- kibana-ciGroup5-5
- kibana-ciGroup5-6
- kibana-ciGroup5-7
- kibana-ciGroup5-8
- kibana-ciGroup5-9
- kibana-ciGroup5-10
- kibana-ciGroup5-11
- kibana-ciGroup5-12
- kibana-ciGroup5-13
- kibana-ciGroup5-14
- kibana-ciGroup5-15

# - kibana-ciGroup6
# - kibana-visualRegression

# make sure all x-pack-ciGroups are listed in test/scripts/jenkins_xpack_ci_group.sh
- x-pack-ciGroup1
- x-pack-ciGroup2
- x-pack-ciGroup3
- x-pack-ciGroup4
- x-pack-ciGroup5
# - x-pack-ciGroup1
# - x-pack-ciGroup2
# - x-pack-ciGroup3
# - x-pack-ciGroup4
# - x-pack-ciGroup5
# - x-pack-visualRegression

# `~` is yaml for `null`
Expand Down
2 changes: 1 addition & 1 deletion test/scripts/jenkins_build_kibana.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/scripts/jenkins_ci_group.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ fi
export TEST_BROWSER_HEADLESS=1

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)"
Expand Down
12 changes: 6 additions & 6 deletions test/scripts/jenkins_xpack_ci_group.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ export TEST_BROWSER_HEADLESS=1
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
# node scripts/functional_tests --assert-none-excluded \
# --include-tag ciGroup1 \
# --include-tag ciGroup2 \
# --include-tag ciGroup3 \
# --include-tag ciGroup4 \
# --include-tag ciGroup5
fi

cd "$KIBANA_DIR"
Expand Down

0 comments on commit 9c19d9a

Please sign in to comment.