From 05978fb7cc070f1c05d9ccf6080a3f4878893198 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 6 Apr 2019 01:06:25 -0500 Subject: [PATCH 01/59] lets try it as a node module --- github-checks-reporter.json | 5 + package.json | 1 + test/scripts/jenkins_ci_group.sh | 2 +- yarn.lock | 183 +++++++++++++++++++++++++++++-- 4 files changed, 182 insertions(+), 9 deletions(-) create mode 100644 github-checks-reporter.json diff --git a/github-checks-reporter.json b/github-checks-reporter.json new file mode 100644 index 00000000000000..aa0e6873ac99d4 --- /dev/null +++ b/github-checks-reporter.json @@ -0,0 +1,5 @@ +{ + "envVars": { + "appKey": "KIBANA_CI_REPORTER_KEY" + } +} diff --git a/package.json b/package.json index 8dd7a2de2a0c17..1256b4205d803c 100644 --- a/package.json +++ b/package.json @@ -358,6 +358,7 @@ "fetch-mock": "7.3.0", "geckodriver": "^1.16.1", "getopts": "2.0.0", + "github-xyz": "^0.0.10", "grunt": "1.0.3", "grunt-cli": "^1.2.0", "grunt-contrib-watch": "^1.1.0", diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index a4bc597316dcb1..f5b6580dc289b6 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -19,7 +19,7 @@ node scripts/build --debug --oss; export TEST_BROWSER_HEADLESS=1 -"$(FORCE_COLOR=0 yarn bin)/grunt" "run:functionalTests_ciGroup${CI_GROUP}"; +github-checks-reporter "functionalTests_ciGroup${CI_GROUP}" "$(FORCE_COLOR=0 yarn bin)/grunt" "run:functionalTests_ciGroup${CI_GROUP}"; if [ "$CI_GROUP" == "1" ]; then # build kbn_tp_sample_panel_action diff --git a/yarn.lock b/yarn.lock index 5717bc65594dce..bf2b366f6d6f55 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1995,6 +1995,38 @@ call-me-maybe "^1.0.1" glob-to-regexp "^0.3.0" +"@octokit/app@^2.2.2": + version "2.2.2" + resolved "https://registry.yarnpkg.com/@octokit/app/-/app-2.2.2.tgz#a1b8248f64159eeccbe4000d888fdae4163c4ad8" + integrity sha512-nUwS8jW107ROGuI0Tq4Ga+Zno6CovwaS+Oen6BOKJmoFMLqqB3oXeGZ6InkidtdmUNiYhMtNq2lydb0WVLT8Zg== + dependencies: + "@octokit/request" "^2.1.2" + "@types/lru-cache" "^5.1.0" + jsonwebtoken "^8.3.0" + lru-cache "^5.1.1" + +"@octokit/endpoint@^3.2.0": + version "3.2.3" + resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-3.2.3.tgz#bd9aea60cd94ce336656b57a5c9cb7f10be8f4f3" + integrity sha512-yUPCt4vMIOclox13CUxzuKiPJIFo46b/6GhUnUTw5QySczN1L0DtSxgmIZrZV4SAb9EyAqrceoyrWoYVnfF2AA== + dependencies: + deepmerge "3.2.0" + is-plain-object "^2.0.4" + universal-user-agent "^2.0.1" + url-template "^2.0.8" + +"@octokit/request@2.4.2", "@octokit/request@^2.1.2", "@octokit/request@^2.4.2": + version "2.4.2" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-2.4.2.tgz#87c36e820dd1e43b1629f4f35c95b00cd456320b" + integrity sha512-lxVlYYvwGbKSHXfbPk5vxEA8w4zHOH1wobado4a9EfsyD3Cbhuhus1w0Ye9Ro0eMubGO8kNy5d+xNFisM3Tvaw== + dependencies: + "@octokit/endpoint" "^3.2.0" + deprecation "^1.0.1" + is-plain-object "^2.0.4" + node-fetch "^2.3.0" + once "^1.4.0" + universal-user-agent "^2.0.1" + "@octokit/rest@^15.10.0": version "15.10.0" resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-15.10.0.tgz#9baf7430e55edf1a1024c35ae72ed2f5fc6e90e9" @@ -2010,6 +2042,24 @@ node-fetch "^2.1.1" url-template "^2.0.8" +"@octokit/rest@^16.23.2": + version "16.23.2" + resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.23.2.tgz#975e84610427c4ab6c41bec77c24aed9b7563db4" + integrity sha512-ZxiZMaCuqBG/IsbgNRVfGwYsvBb5DjHuMGjJgOrinT+/b+1j1U7PiGyRkHDJdjTGA6N/PsMC2lP2ZybX9579iA== + dependencies: + "@octokit/request" "2.4.2" + atob-lite "^2.0.0" + before-after-hook "^1.4.0" + btoa-lite "^1.0.0" + deprecation "^1.0.1" + lodash.get "^4.4.2" + lodash.set "^4.3.2" + lodash.uniq "^4.5.0" + octokit-pagination-methods "^1.1.0" + once "^1.4.0" + universal-user-agent "^2.0.0" + url-template "^2.0.8" + "@reach/router@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@reach/router/-/router-1.2.1.tgz#34ae3541a5ac44fa7796e5506a5d7274a162be4e" @@ -4475,6 +4525,11 @@ ansi-regex@^4.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9" integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w== +ansi-regex@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" + integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== + ansi-styles@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de" @@ -5161,6 +5216,11 @@ atoa@1.0.0: resolved "https://registry.yarnpkg.com/atoa/-/atoa-1.0.0.tgz#0cc0e91a480e738f923ebc103676471779b34a49" integrity sha1-DMDpGkgOc4+SPrwQNnZHF3mzSkk= +atob-lite@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/atob-lite/-/atob-lite-2.0.0.tgz#0fef5ad46f1bd7a8502c65727f0367d5ee43d696" + integrity sha1-D+9a1G8b16hQLGVyfwNn1e5D1pY= + atob@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" @@ -5863,6 +5923,11 @@ before-after-hook@^1.1.0: resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-1.1.0.tgz#83165e15a59460d13702cb8febd6a1807896db5a" integrity sha512-VOMDtYPwLbIncTxNoSzRyvaMxtXmLWLUqr8k5AfC1BzLk34HvBXaQX8snOwQZ4c0aX8aSERqtJSiI9/m2u5kuA== +before-after-hook@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-1.4.0.tgz#2b6bf23dca4f32e628fd2747c10a37c74a4b484d" + integrity sha512-l5r9ir56nda3qu14nAXIlyq1MmUSs0meCIaFAh8HwkFwP1F8eToOuS3ah2VAHHcY04jaYD7FpJC5JTXHYRbkzg== + better-assert@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522" @@ -7824,6 +7889,18 @@ convex-hull@^1.0.3: incremental-convex-hull "^1.0.1" monotone-convex-hull-2d "^1.0.1" +convict@^4.4.1: + version "4.4.1" + resolved "https://registry.yarnpkg.com/convict/-/convict-4.4.1.tgz#87f93c2a4f51bfc961e2873864442d0349a1b0d0" + integrity sha512-celpR4hOWWwb/S8azhzgQwDon6muAJlNe2LTLeOGyoSgH390TsaqoieAe9BLbAv7+9wNfG7DTA2q3IfFp2viKw== + dependencies: + depd "1.1.2" + json5 "1.0.1" + lodash.clonedeep "4.5.0" + moment "2.22.2" + validator "10.8.0" + yargs-parser "11.0.0" + cookie-signature@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" @@ -8949,6 +9026,11 @@ deepmerge@2.2.1: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170" integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA== +deepmerge@3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.2.0.tgz#58ef463a57c08d376547f8869fdc5bcee957f44e" + integrity sha512-6+LuZGU7QCNUnAJyX8cIrlzoEgggTM6B7mm+znKOX4t5ltluT9KLjN6g61ECMS0LTsLW7yDpNoxhix5FZcrIow== + default-gateway@^2.6.0: version "2.7.2" resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f" @@ -9059,7 +9141,7 @@ depd@1.1.1: resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359" integrity sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k= -depd@~1.1.1, depd@~1.1.2: +depd@1.1.2, depd@~1.1.1, depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= @@ -9074,6 +9156,11 @@ deprecated@^0.0.1: resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19" integrity sha1-+cmvVGSvoeepcUWKi97yqpTVuxk= +deprecation@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-1.0.1.tgz#2df79b79005752180816b7b6e079cbd80490d711" + integrity sha512-ccVHpE72+tcIKaGMql33x5MAjKQIZrk+3x2GbJ7TeraUCZWHoT+KSZpoC+JQFsUBlSTXUrBaGiF0j6zVTepPLg== + des.js@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc" @@ -11930,6 +12017,17 @@ github-username@^3.0.0: dependencies: gh-got "^5.0.0" +github-xyz@^0.0.10: + version "0.0.10" + resolved "https://registry.yarnpkg.com/github-xyz/-/github-xyz-0.0.10.tgz#bf70ab0e1ffb31a82c2753e5fd9e8aa441eef244" + integrity sha512-5ezlGBh+rA52XuPeIWI3ZmCGdYE9b8Ge6cNv/VDbZs8JgRiKVgNcMz/zPCcMoB10VZU09irJpk9sKeWwn9q1Ig== + dependencies: + "@octokit/app" "^2.2.2" + "@octokit/request" "^2.4.2" + "@octokit/rest" "^16.23.2" + convict "^4.4.1" + strip-ansi "^5.2.0" + gl-matrix@^2.6.1: version "2.8.1" resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-2.8.1.tgz#1c7873448eac61d2cd25803a074e837bd42581a3" @@ -15574,18 +15672,18 @@ json3@3.3.2, json3@^3.3.2: resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1" integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE= -json5@^0.5.0: - version "0.5.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" - integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= - -json5@^1.0.1: +json5@1.0.1, json5@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== dependencies: minimist "^1.2.0" +json5@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" + integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= + json5@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850" @@ -16381,7 +16479,7 @@ lodash.clone@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6" integrity sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y= -lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0: +lodash.clonedeep@4.5.0, lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= @@ -16601,6 +16699,11 @@ lodash.restparam@^3.0.0: resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU= +lodash.set@^4.3.2: + version "4.3.2" + resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23" + integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM= + lodash.snakecase@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d" @@ -16674,6 +16777,11 @@ lodash.union@^4.6.0: resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg= +lodash.uniq@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" + integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= + lodash.uniqby@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302" @@ -16867,6 +16975,13 @@ lru-cache@^4.1.1, lru-cache@^4.1.3: pseudomap "^1.0.2" yallist "^2.1.2" +lru-cache@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" + integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== + dependencies: + yallist "^3.0.2" + lru-queue@0.1: version "0.1.0" resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3" @@ -16884,6 +16999,11 @@ macos-release@^1.0.0: resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-1.1.0.tgz#831945e29365b470aa8724b0ab36c8f8959d10fb" integrity sha512-mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA== +macos-release@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.2.0.tgz#ab58d55dd4714f0a05ad4b0e90f4370fef5cdea8" + integrity sha512-iV2IDxZaX8dIcM7fG6cI46uNmHUxHE4yN+Z8tKHAW1TBPMZDIKHf/3L+YnOuj/FK9il14UaVdHmiQ1tsi90ltA== + majo@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/majo/-/majo-0.4.1.tgz#5e6eeb9b63bda77e59d396b9c9ce4189ce6100bc" @@ -18462,6 +18582,11 @@ obuf@^1.0.0, obuf@^1.1.1: resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.1.tgz#104124b6c602c6796881a042541d36db43a5264e" integrity sha1-EEEktsYCxnlogaBCVB0220OlJk4= +octokit-pagination-methods@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz#cf472edc9d551055f9ef73f6e42b4dbb4c80bea4" + integrity sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ== + omggif@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/omggif/-/omggif-1.0.9.tgz#dcb7024dacd50c52b4d303f04802c91c057c765f" @@ -18666,6 +18791,14 @@ os-name@^2.0.1: macos-release "^1.0.0" win-release "^1.0.0" +os-name@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801" + integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg== + dependencies: + macos-release "^2.2.0" + windows-release "^3.1.0" + os-shim@^0.1.2: version "0.1.3" resolved "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917" @@ -23623,6 +23756,13 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" +strip-ansi@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" + integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== + dependencies: + ansi-regex "^4.1.0" + strip-bom-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz#f87db5ef2613f6968aa545abfe1ec728b6a829ca" @@ -25485,6 +25625,13 @@ unist-util-visit@^1.1.0, unist-util-visit@^1.3.0: dependencies: unist-util-is "^2.1.1" +universal-user-agent@^2.0.0, universal-user-agent@^2.0.1: + version "2.0.3" + resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-2.0.3.tgz#9f6f09f9cc33de867bb720d84c08069b14937c6c" + integrity sha512-eRHEHhChCBHrZsA4WEhdgiOKgdvgrMIHwnwnqD0r5C6AO8kwKcG7qSku3iXdhvHL3YvsS9ZkSGN8h/hIpoFC8g== + dependencies: + os-name "^3.0.0" + universalify@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7" @@ -25802,6 +25949,11 @@ validate-npm-package-name@2.2.2: dependencies: builtins "0.0.7" +validator@10.8.0: + version "10.8.0" + resolved "https://registry.yarnpkg.com/validator/-/validator-10.8.0.tgz#8acb15a5c39411cbc8ef2be0c98c2514da4410a7" + integrity sha512-mXqMxfCh5NLsVgYVKl9WvnHNDPCcbNppHSPPowu0VjtSsGWVY+z8hJF44edLR1nbLNzi3jYoYsIl8KZpioIk6g== + validator@^8.0.0: version "8.2.0" resolved "https://registry.yarnpkg.com/validator/-/validator-8.2.0.tgz#3c1237290e37092355344fef78c231249dab77b9" @@ -26732,6 +26884,13 @@ window-size@^0.2.0: resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" integrity sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU= +windows-release@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.2.0.tgz#8122dad5afc303d833422380680a79cdfa91785f" + integrity sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA== + dependencies: + execa "^1.0.0" + winston-transport@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.2.0.tgz#a20be89edf2ea2ca39ba25f3e50344d73e6520e5" @@ -27057,6 +27216,14 @@ yallist@^3.0.0, yallist@^3.0.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9" integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k= +yargs-parser@11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.0.0.tgz#d9fd0f0cd551a2a2ef9bbf42606ffb6211634232" + integrity sha512-dvsafRjM45h79WOTvS/dP35Sb31SlGAKz6tFjI97kGC4MJFBuzTZY6TTYHrz0QSMQdkyd8Y+RsOMLr+JY0nPFQ== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + yargs-parser@^10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8" From ea16b0bc31336d47e7e4cbd50d6910f9b51203be Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 6 Apr 2019 01:29:38 -0500 Subject: [PATCH 02/59] diagnostic --- test/scripts/jenkins_ci_group.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index f5b6580dc289b6..f634212ea7147a 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -19,6 +19,8 @@ node scripts/build --debug --oss; export TEST_BROWSER_HEADLESS=1 +echo $PATH +which github-checks-reporter github-checks-reporter "functionalTests_ciGroup${CI_GROUP}" "$(FORCE_COLOR=0 yarn bin)/grunt" "run:functionalTests_ciGroup${CI_GROUP}"; if [ "$CI_GROUP" == "1" ]; then From e038daef2adf85c654a0b86fa779a40da7451969 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 6 Apr 2019 08:59:59 -0500 Subject: [PATCH 03/59] lets add yarn bin --- src/dev/ci_setup/setup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dev/ci_setup/setup.sh b/src/dev/ci_setup/setup.sh index a4b2d6d1e4389c..e7a417dc25da44 100755 --- a/src/dev/ci_setup/setup.sh +++ b/src/dev/ci_setup/setup.sh @@ -106,7 +106,8 @@ yarn config set yarn-offline-mirror "$cacheDir/yarn-offline-cache" ### "install" yarn into this shell ### yarnGlobalDir="$(yarn global bin)" -export PATH="$PATH:$yarnGlobalDir" +yarnDir="$(yarn bin)" +export PATH="$PATH:$yarnGlobalDir:$yarnDir" ### ### use the chromedriver cache if it exists From 6c1bed873095eb9b5aa36c9012394a78bc91be6f Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 6 Apr 2019 09:32:32 -0500 Subject: [PATCH 04/59] lets add yarn bin --- test/scripts/jenkins_ci_group.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index f634212ea7147a..f9a3311f2531c3 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -20,6 +20,11 @@ node scripts/build --debug --oss; export TEST_BROWSER_HEADLESS=1 echo $PATH +echo --- +yarn bin +echo --- +ls $(yarn bin) +echo --- which github-checks-reporter github-checks-reporter "functionalTests_ciGroup${CI_GROUP}" "$(FORCE_COLOR=0 yarn bin)/grunt" "run:functionalTests_ciGroup${CI_GROUP}"; From 2cdd558c5287c841192739beb19ab7f8f1f6c823 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 6 Apr 2019 09:50:03 -0500 Subject: [PATCH 05/59] poking around --- test/scripts/jenkins_ci_group.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index f9a3311f2531c3..1261de6eedf5e4 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -23,7 +23,7 @@ echo $PATH echo --- yarn bin echo --- -ls $(yarn bin) +ls $(FORCE_COLOR=0 yarn bin) echo --- which github-checks-reporter github-checks-reporter "functionalTests_ciGroup${CI_GROUP}" "$(FORCE_COLOR=0 yarn bin)/grunt" "run:functionalTests_ciGroup${CI_GROUP}"; From 32fc41e183554b8c3c90b1869b57c795099251ce Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 6 Apr 2019 10:20:24 -0500 Subject: [PATCH 06/59] can we find eslint in path? --- test/scripts/jenkins_ci_group.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index 1261de6eedf5e4..45fda8e27a58e8 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -19,13 +19,19 @@ node scripts/build --debug --oss; export TEST_BROWSER_HEADLESS=1 +echo PATH echo $PATH echo --- +echo yarn bin yarn bin echo --- ls $(FORCE_COLOR=0 yarn bin) echo --- +echo which which github-checks-reporter +echo --- +echo which eslint +which eslint github-checks-reporter "functionalTests_ciGroup${CI_GROUP}" "$(FORCE_COLOR=0 yarn bin)/grunt" "run:functionalTests_ciGroup${CI_GROUP}"; if [ "$CI_GROUP" == "1" ]; then From 13295b0ea15b4aee4aad4198d5bd96dd9a0dfdb2 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 6 Apr 2019 10:47:10 -0500 Subject: [PATCH 07/59] blah blah blah computers are dumb --- test/scripts/jenkins_ci_group.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index 45fda8e27a58e8..2bc371fc5587c2 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -28,7 +28,7 @@ echo --- ls $(FORCE_COLOR=0 yarn bin) echo --- echo which -which github-checks-reporter +#which github-checks-reporter echo --- echo which eslint which eslint From 54c092d703e04993144ed338fe033b9f735eda16 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 6 Apr 2019 10:58:27 -0500 Subject: [PATCH 08/59] comment out a bunch of stuff --- test/scripts/jenkins_ci_group.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index 2bc371fc5587c2..dc503f3b62534a 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -22,13 +22,13 @@ export TEST_BROWSER_HEADLESS=1 echo PATH echo $PATH echo --- -echo yarn bin -yarn bin -echo --- -ls $(FORCE_COLOR=0 yarn bin) -echo --- -echo which -#which github-checks-reporter +# echo yarn bin +# yarn bin +# echo --- +# ls $(FORCE_COLOR=0 yarn bin) +# echo --- +# echo which +# which github-checks-reporter echo --- echo which eslint which eslint From 452786ef063ef53fe16602198aea7952d27ab8d3 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 6 Apr 2019 11:25:35 -0500 Subject: [PATCH 09/59] which which is which --- test/scripts/jenkins_ci_group.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index dc503f3b62534a..bc7e0c17d2baf0 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -31,8 +31,8 @@ echo --- # which github-checks-reporter echo --- echo which eslint -which eslint -github-checks-reporter "functionalTests_ciGroup${CI_GROUP}" "$(FORCE_COLOR=0 yarn bin)/grunt" "run:functionalTests_ciGroup${CI_GROUP}"; +echo $(which eslint) +"$(FORCE_COLOR=0 yarn bin)/github-checks-reporter" "functionalTests_ciGroup${CI_GROUP}" "$(FORCE_COLOR=0 yarn bin)/grunt" "run:functionalTests_ciGroup${CI_GROUP}"; if [ "$CI_GROUP" == "1" ]; then # build kbn_tp_sample_panel_action From 397e61bdccdb81ce82ea69e51a9b96d4ed1ab772 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 6 Apr 2019 11:52:36 -0500 Subject: [PATCH 10/59] provide app id --- test/scripts/jenkins_ci_group.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index bc7e0c17d2baf0..89751043120f0e 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -32,7 +32,7 @@ echo --- echo --- echo which eslint echo $(which eslint) -"$(FORCE_COLOR=0 yarn bin)/github-checks-reporter" "functionalTests_ciGroup${CI_GROUP}" "$(FORCE_COLOR=0 yarn bin)/grunt" "run:functionalTests_ciGroup${CI_GROUP}"; +GITHUB_CHECKS_REPORTER_ID=26774 "$(FORCE_COLOR=0 yarn bin)/github-checks-reporter" "functionalTests_ciGroup${CI_GROUP}" "$(FORCE_COLOR=0 yarn bin)/grunt" "run:functionalTests_ciGroup${CI_GROUP}"; if [ "$CI_GROUP" == "1" ]; then # build kbn_tp_sample_panel_action From 780c119df923963d0cfd0cb12d097cb032f0f054 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 6 Apr 2019 13:05:05 -0500 Subject: [PATCH 11/59] remove appid from schema for now --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1256b4205d803c..6ff3f848d3abfd 100644 --- a/package.json +++ b/package.json @@ -358,7 +358,7 @@ "fetch-mock": "7.3.0", "geckodriver": "^1.16.1", "getopts": "2.0.0", - "github-xyz": "^0.0.10", + "github-xyz": "^0.0.12", "grunt": "1.0.3", "grunt-cli": "^1.2.0", "grunt-contrib-watch": "^1.1.0", From ba7859c9bc1565234c34448f464b2eb41d479231 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 6 Apr 2019 13:25:00 -0500 Subject: [PATCH 12/59] boooooootstrap --- yarn.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index bf2b366f6d6f55..f6af9414120d0d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12017,10 +12017,10 @@ github-username@^3.0.0: dependencies: gh-got "^5.0.0" -github-xyz@^0.0.10: - version "0.0.10" - resolved "https://registry.yarnpkg.com/github-xyz/-/github-xyz-0.0.10.tgz#bf70ab0e1ffb31a82c2753e5fd9e8aa441eef244" - integrity sha512-5ezlGBh+rA52XuPeIWI3ZmCGdYE9b8Ge6cNv/VDbZs8JgRiKVgNcMz/zPCcMoB10VZU09irJpk9sKeWwn9q1Ig== +github-xyz@^0.0.12: + version "0.0.12" + resolved "https://registry.yarnpkg.com/github-xyz/-/github-xyz-0.0.12.tgz#66e14ad9f5517a2f68ba167c1bb36797ff220aa9" + integrity sha512-4TyWkHgcY4NS28ajedtggjgM18nMZlO2MJ5RyUSXtInC/z0wDIVkg3wsJs72LKxLubasUqDbGGPaO2H5sz4Baw== dependencies: "@octokit/app" "^2.2.2" "@octokit/request" "^2.4.2" From bdf8963258be1e38b0808de7324bfc61bd357540 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 6 Apr 2019 22:24:52 -0500 Subject: [PATCH 13/59] commit comments....why even? --- package.json | 2 +- test/scripts/jenkins_ci_group.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 6ff3f848d3abfd..8ec046612bff56 100644 --- a/package.json +++ b/package.json @@ -358,7 +358,7 @@ "fetch-mock": "7.3.0", "geckodriver": "^1.16.1", "getopts": "2.0.0", - "github-xyz": "^0.0.12", + "github-xyz": "^0.0.13", "grunt": "1.0.3", "grunt-cli": "^1.2.0", "grunt-contrib-watch": "^1.1.0", diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index 89751043120f0e..0d7fb0bdc18ef1 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -24,9 +24,9 @@ echo $PATH echo --- # echo yarn bin # yarn bin -# echo --- -# ls $(FORCE_COLOR=0 yarn bin) -# echo --- +echo --- +ls -al $(FORCE_COLOR=0 yarn bin)/eslint +echo --- # echo which # which github-checks-reporter echo --- From 36f47c336466bdce7673699746278b84dbc361ff Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 6 Apr 2019 22:36:41 -0500 Subject: [PATCH 14/59] commit comments....why even? --- yarn.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index f6af9414120d0d..3ad4db1bacb25a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12017,10 +12017,10 @@ github-username@^3.0.0: dependencies: gh-got "^5.0.0" -github-xyz@^0.0.12: - version "0.0.12" - resolved "https://registry.yarnpkg.com/github-xyz/-/github-xyz-0.0.12.tgz#66e14ad9f5517a2f68ba167c1bb36797ff220aa9" - integrity sha512-4TyWkHgcY4NS28ajedtggjgM18nMZlO2MJ5RyUSXtInC/z0wDIVkg3wsJs72LKxLubasUqDbGGPaO2H5sz4Baw== +github-xyz@^0.0.13: + version "0.0.13" + resolved "https://registry.yarnpkg.com/github-xyz/-/github-xyz-0.0.13.tgz#43a39d798b2e1a63aca97b0ef60560c56aff96e0" + integrity sha512-ydXRjqd4HrZR3Dc5GdC9UmI2LrOq6PoAxHfoHkuNuYzksm8uMwEBh+exXfwDGurbCI5MqxXuVj1l97H2bNP1SA== dependencies: "@octokit/app" "^2.2.2" "@octokit/request" "^2.4.2" From 5dc328038f7d91f4e0fb6f07f4f1d35519497813 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 6 Apr 2019 23:03:20 -0500 Subject: [PATCH 15/59] commit comments....why even? --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 8ec046612bff56..37682423149b95 100644 --- a/package.json +++ b/package.json @@ -358,7 +358,7 @@ "fetch-mock": "7.3.0", "geckodriver": "^1.16.1", "getopts": "2.0.0", - "github-xyz": "^0.0.13", + "github-xyz": "^0.0.14", "grunt": "1.0.3", "grunt-cli": "^1.2.0", "grunt-contrib-watch": "^1.1.0", diff --git a/yarn.lock b/yarn.lock index 3ad4db1bacb25a..009d0b3988c397 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12017,10 +12017,10 @@ github-username@^3.0.0: dependencies: gh-got "^5.0.0" -github-xyz@^0.0.13: - version "0.0.13" - resolved "https://registry.yarnpkg.com/github-xyz/-/github-xyz-0.0.13.tgz#43a39d798b2e1a63aca97b0ef60560c56aff96e0" - integrity sha512-ydXRjqd4HrZR3Dc5GdC9UmI2LrOq6PoAxHfoHkuNuYzksm8uMwEBh+exXfwDGurbCI5MqxXuVj1l97H2bNP1SA== +github-xyz@^0.0.14: + version "0.0.14" + resolved "https://registry.yarnpkg.com/github-xyz/-/github-xyz-0.0.14.tgz#7691a9ed189a0d9cd99d83e25794ac64868050af" + integrity sha512-LO75WqTo3mMHvxmL0civFEphbsgCHM87OyoNEW3J/MTwUakUqr78WHlp492QGEQKpllFm8RzN49wEgx0EpJtYg== dependencies: "@octokit/app" "^2.2.2" "@octokit/request" "^2.4.2" From c79888eedafa7a8ce4fea74d4b5aa2168ebc2173 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sat, 6 Apr 2019 23:31:21 -0500 Subject: [PATCH 16/59] bump package --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 37682423149b95..c79f9ed2edcde0 100644 --- a/package.json +++ b/package.json @@ -358,7 +358,7 @@ "fetch-mock": "7.3.0", "geckodriver": "^1.16.1", "getopts": "2.0.0", - "github-xyz": "^0.0.14", + "github-xyz": "^0.0.15", "grunt": "1.0.3", "grunt-cli": "^1.2.0", "grunt-contrib-watch": "^1.1.0", diff --git a/yarn.lock b/yarn.lock index 009d0b3988c397..7524882d0e2cf8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12017,10 +12017,10 @@ github-username@^3.0.0: dependencies: gh-got "^5.0.0" -github-xyz@^0.0.14: - version "0.0.14" - resolved "https://registry.yarnpkg.com/github-xyz/-/github-xyz-0.0.14.tgz#7691a9ed189a0d9cd99d83e25794ac64868050af" - integrity sha512-LO75WqTo3mMHvxmL0civFEphbsgCHM87OyoNEW3J/MTwUakUqr78WHlp492QGEQKpllFm8RzN49wEgx0EpJtYg== +github-xyz@^0.0.15: + version "0.0.15" + resolved "https://registry.yarnpkg.com/github-xyz/-/github-xyz-0.0.15.tgz#b3d413c434539b92fcbf61bdb725d11d22487c85" + integrity sha512-JJHCLgo2YYyuCbjyk6spht/ugI31Ulh+sDvReDLo42z2ygVq8y6KcRG/Hosm+dMBsk0tJukeyYWesprwfJM1XA== dependencies: "@octokit/app" "^2.2.2" "@octokit/request" "^2.4.2" From 486700b15fc3ee7d266f1f89764b593de3d889b6 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sun, 7 Apr 2019 08:05:58 -0500 Subject: [PATCH 17/59] bump package --- github-checks-reporter.json | 5 ----- package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 github-checks-reporter.json diff --git a/github-checks-reporter.json b/github-checks-reporter.json deleted file mode 100644 index aa0e6873ac99d4..00000000000000 --- a/github-checks-reporter.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "envVars": { - "appKey": "KIBANA_CI_REPORTER_KEY" - } -} diff --git a/package.json b/package.json index c79f9ed2edcde0..843aa26b8f3733 100644 --- a/package.json +++ b/package.json @@ -358,7 +358,7 @@ "fetch-mock": "7.3.0", "geckodriver": "^1.16.1", "getopts": "2.0.0", - "github-xyz": "^0.0.15", + "github-xyz": "^0.0.16", "grunt": "1.0.3", "grunt-cli": "^1.2.0", "grunt-contrib-watch": "^1.1.0", diff --git a/yarn.lock b/yarn.lock index 7524882d0e2cf8..c8434cb09fe91a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12017,10 +12017,10 @@ github-username@^3.0.0: dependencies: gh-got "^5.0.0" -github-xyz@^0.0.15: - version "0.0.15" - resolved "https://registry.yarnpkg.com/github-xyz/-/github-xyz-0.0.15.tgz#b3d413c434539b92fcbf61bdb725d11d22487c85" - integrity sha512-JJHCLgo2YYyuCbjyk6spht/ugI31Ulh+sDvReDLo42z2ygVq8y6KcRG/Hosm+dMBsk0tJukeyYWesprwfJM1XA== +github-xyz@^0.0.16: + version "0.0.16" + resolved "https://registry.yarnpkg.com/github-xyz/-/github-xyz-0.0.16.tgz#cb23b950c9c6df2edd7a2b473ac1d059f45fd502" + integrity sha512-0PpudW1csbVDYAGANfG+shaX69PBKzamk/LS5JK6KqVgviQx1l8TSGcA3j5rChieisdmHR+r5HTTiLFZenh4Wg== dependencies: "@octokit/app" "^2.2.2" "@octokit/request" "^2.4.2" From 85ca6eb3a183f904778994e47b7d7d89a36327db Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sun, 7 Apr 2019 08:32:05 -0500 Subject: [PATCH 18/59] rename config file to support SNAKES --- github_checks_reporter.json | 5 +++++ test/scripts/jenkins_ci_group.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 github_checks_reporter.json diff --git a/github_checks_reporter.json b/github_checks_reporter.json new file mode 100644 index 00000000000000..aa0e6873ac99d4 --- /dev/null +++ b/github_checks_reporter.json @@ -0,0 +1,5 @@ +{ + "envVars": { + "appKey": "KIBANA_CI_REPORTER_KEY" + } +} diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index 0d7fb0bdc18ef1..3c91d2ce9c2755 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -32,7 +32,7 @@ echo --- echo --- echo which eslint echo $(which eslint) -GITHUB_CHECKS_REPORTER_ID=26774 "$(FORCE_COLOR=0 yarn bin)/github-checks-reporter" "functionalTests_ciGroup${CI_GROUP}" "$(FORCE_COLOR=0 yarn bin)/grunt" "run:functionalTests_ciGroup${CI_GROUP}"; +GITHUB_CHECKS_REPORTER_ID=26774 yarn run github-checks-reporter "functionalTests_ciGroup${CI_GROUP}" "$(FORCE_COLOR=0 yarn bin)/grunt" "run:functionalTests_ciGroup${CI_GROUP}"; if [ "$CI_GROUP" == "1" ]; then # build kbn_tp_sample_panel_action From eee0c0f3798feecbfed3687d557a7c0ac7de04b3 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sun, 7 Apr 2019 09:36:29 -0500 Subject: [PATCH 19/59] remove unneeded changes --- test/scripts/jenkins_ci_group.sh | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index 3c91d2ce9c2755..e7f58f353cd3f3 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -19,20 +19,7 @@ node scripts/build --debug --oss; export TEST_BROWSER_HEADLESS=1 -echo PATH -echo $PATH -echo --- -# echo yarn bin -# yarn bin -echo --- -ls -al $(FORCE_COLOR=0 yarn bin)/eslint -echo --- -# echo which -# which github-checks-reporter -echo --- -echo which eslint -echo $(which eslint) -GITHUB_CHECKS_REPORTER_ID=26774 yarn run github-checks-reporter "functionalTests_ciGroup${CI_GROUP}" "$(FORCE_COLOR=0 yarn bin)/grunt" "run:functionalTests_ciGroup${CI_GROUP}"; +yarn run github-checks-reporter "functionalTests_ciGroup${CI_GROUP}" yarn run grunt "run:functionalTests_ciGroup${CI_GROUP}"; if [ "$CI_GROUP" == "1" ]; then # build kbn_tp_sample_panel_action From 4939c739a0ccc5cc2cff6439515abcba6d5aa8c1 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sun, 7 Apr 2019 10:36:39 -0500 Subject: [PATCH 20/59] more checks --- tasks/config/run.js | 45 ++++++++++++++++++++++---------- test/scripts/jenkins_ci_group.sh | 6 ++--- 2 files changed, 34 insertions(+), 17 deletions(-) diff --git a/tasks/config/run.js b/tasks/config/run.js index 609f164369783d..8ca60f0b1e8402 100644 --- a/tasks/config/run.js +++ b/tasks/config/run.js @@ -62,20 +62,25 @@ module.exports = function (grunt) { '--server.port=5610', ]; + const githubChecksReporter = title => ['run', 'github-checks-reporter', title, 'node']; + const YARN = 'yarn'; + return { // used by the test and jenkins:unit tasks // runs the eslint script to check for linting errors eslint: { - cmd: process.execPath, + cmd: YARN, args: [ + githubChecksReporter('eslint'), require.resolve('../../scripts/eslint'), '--no-cache' ] }, sasslint: { - cmd: process.execPath, + cmd: YARN, args: [ + githubChecksReporter('sasslint'), require.resolve('../../scripts/sasslint') ] }, @@ -83,8 +88,9 @@ module.exports = function (grunt) { // used by the test tasks // runs the check_file_casing script to ensure filenames use correct casing checkFileCasing: { - cmd: process.execPath, + cmd: YARN, args: [ + githubChecksReporter('checkFileCasing'), require.resolve('../../scripts/check_file_casing'), '--quiet' // only log errors, not warnings ] @@ -93,8 +99,9 @@ module.exports = function (grunt) { // used by the test tasks // runs the check_core_api_changes script to ensure API changes are explictily accepted checkCoreApiChanges: { - cmd: process.execPath, + cmd: YARN, args: [ + githubChecksReporter('checkCoreApiChange'), require.resolve('../../scripts/check_core_api_changes') ] }, @@ -102,8 +109,9 @@ module.exports = function (grunt) { // used by the test and jenkins:unit tasks // runs the typecheck script to check for Typescript type errors typeCheck: { - cmd: process.execPath, + cmd: YARN, args: [ + githubChecksReporter('typeCheck'), require.resolve('../../scripts/type_check') ] }, @@ -111,8 +119,9 @@ module.exports = function (grunt) { // used by the test and jenkins:unit tasks // ensures that all typescript files belong to a typescript project checkTsProjects: { - cmd: process.execPath, + cmd: YARN, args: [ + githubChecksReporter('checkTsProjects'), require.resolve('../../scripts/check_ts_projects') ] }, @@ -120,8 +129,9 @@ module.exports = function (grunt) { // used by the test and jenkins:unit tasks // runs the i18n_check script to check i18n engine usage i18nCheck: { - cmd: process.execPath, + cmd: YARN, args: [ + githubChecksReporter('i18nCheck'), require.resolve('../../scripts/i18n_check'), '--ignore-missing', ] @@ -130,8 +140,9 @@ module.exports = function (grunt) { // used by the test:server task // runs all node.js/server mocha tests mocha: { - cmd: process.execPath, + cmd: YARN, args: [ + githubChecksReporter('mocha'), require.resolve('../../scripts/mocha') ] }, @@ -179,16 +190,18 @@ module.exports = function (grunt) { options: { wait: true, }, - cmd: process.execPath, + cmd: YARN, args: [ + githubChecksReporter('verifyNotice'), 'scripts/notice', '--validate' ] }, apiIntegrationTests: { - cmd: process.execPath, + cmd: YARN, args: [ + githubChecksReporter('apiIntegrationTests'), 'scripts/functional_tests', '--config', 'test/api_integration/config.js', '--bail', @@ -197,8 +210,9 @@ module.exports = function (grunt) { }, serverIntegrationTests: { - cmd: process.execPath, + cmd: YARN, args: [ + githubChecksReporter('serverIntegrationTests'), 'scripts/functional_tests', '--config', 'test/server_integration/http/ssl/config.js', '--config', 'test/server_integration/http/ssl_redirect/config.js', @@ -209,8 +223,9 @@ module.exports = function (grunt) { }, interpreterFunctionalTestsRelease: { - cmd: process.execPath, + cmd: YARN, args: [ + githubChecksReporter('interpreterFunctionalTestsRelease'), 'scripts/functional_tests', '--config', 'test/interpreter_functional/config.js', '--bail', @@ -220,8 +235,9 @@ module.exports = function (grunt) { }, pluginFunctionalTestsRelease: { - cmd: process.execPath, + cmd: YARN, args: [ + githubChecksReporter('pluginFunctionalTestsRelease'), 'scripts/functional_tests', '--config', 'test/plugin_functional/config.js', '--bail', @@ -231,8 +247,9 @@ module.exports = function (grunt) { }, functionalTests: { - cmd: process.execPath, + cmd: YARN, args: [ + githubChecksReporter('functionalTests'), 'scripts/functional_tests', '--config', 'test/functional/config.js', '--bail', diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index e7f58f353cd3f3..11471e69bca8d8 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -24,8 +24,8 @@ yarn run github-checks-reporter "functionalTests_ciGroup${CI_GROUP}" yarn run gr if [ "$CI_GROUP" == "1" ]; then # build kbn_tp_sample_panel_action cd test/plugin_functional/plugins/kbn_tp_sample_panel_action; - yarn build; + yarn run github-checks-reporter "build kbn_tp_sample_panel_action" yarn build; cd -; - "$(FORCE_COLOR=0 yarn bin)/grunt" run:pluginFunctionalTestsRelease --from=source; - "$(FORCE_COLOR=0 yarn bin)/grunt" run:interpreterFunctionalTestsRelease; + yarn run github-checks-reporter "pluginFunctionalTestsRelease" yarn run grunt run:pluginFunctionalTestsRelease --from=source; + yarn run github-checks-reporter "interpreterFunctionalTestsRelease" yarn run grunt run:interpreterFunctionalTestsRelease; fi From 461d8d907104ef35811e2c626c2a55f70d013476 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sun, 7 Apr 2019 10:55:37 -0500 Subject: [PATCH 21/59] forgot the spread operator --- src/dev/ci_setup/setup.sh | 3 +-- tasks/config/run.js | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/dev/ci_setup/setup.sh b/src/dev/ci_setup/setup.sh index e7a417dc25da44..a4b2d6d1e4389c 100755 --- a/src/dev/ci_setup/setup.sh +++ b/src/dev/ci_setup/setup.sh @@ -106,8 +106,7 @@ yarn config set yarn-offline-mirror "$cacheDir/yarn-offline-cache" ### "install" yarn into this shell ### yarnGlobalDir="$(yarn global bin)" -yarnDir="$(yarn bin)" -export PATH="$PATH:$yarnGlobalDir:$yarnDir" +export PATH="$PATH:$yarnGlobalDir" ### ### use the chromedriver cache if it exists diff --git a/tasks/config/run.js b/tasks/config/run.js index 8ca60f0b1e8402..ca196f78d62b36 100644 --- a/tasks/config/run.js +++ b/tasks/config/run.js @@ -71,7 +71,7 @@ module.exports = function (grunt) { eslint: { cmd: YARN, args: [ - githubChecksReporter('eslint'), + ...githubChecksReporter('eslint'), require.resolve('../../scripts/eslint'), '--no-cache' ] @@ -80,7 +80,7 @@ module.exports = function (grunt) { sasslint: { cmd: YARN, args: [ - githubChecksReporter('sasslint'), + ...githubChecksReporter('sasslint'), require.resolve('../../scripts/sasslint') ] }, @@ -90,7 +90,7 @@ module.exports = function (grunt) { checkFileCasing: { cmd: YARN, args: [ - githubChecksReporter('checkFileCasing'), + ...githubChecksReporter('checkFileCasing'), require.resolve('../../scripts/check_file_casing'), '--quiet' // only log errors, not warnings ] @@ -101,7 +101,7 @@ module.exports = function (grunt) { checkCoreApiChanges: { cmd: YARN, args: [ - githubChecksReporter('checkCoreApiChange'), + ...githubChecksReporter('checkCoreApiChange'), require.resolve('../../scripts/check_core_api_changes') ] }, @@ -111,7 +111,7 @@ module.exports = function (grunt) { typeCheck: { cmd: YARN, args: [ - githubChecksReporter('typeCheck'), + ...githubChecksReporter('typeCheck'), require.resolve('../../scripts/type_check') ] }, @@ -121,7 +121,7 @@ module.exports = function (grunt) { checkTsProjects: { cmd: YARN, args: [ - githubChecksReporter('checkTsProjects'), + ...githubChecksReporter('checkTsProjects'), require.resolve('../../scripts/check_ts_projects') ] }, @@ -131,7 +131,7 @@ module.exports = function (grunt) { i18nCheck: { cmd: YARN, args: [ - githubChecksReporter('i18nCheck'), + ...githubChecksReporter('i18nCheck'), require.resolve('../../scripts/i18n_check'), '--ignore-missing', ] @@ -142,7 +142,7 @@ module.exports = function (grunt) { mocha: { cmd: YARN, args: [ - githubChecksReporter('mocha'), + ...githubChecksReporter('mocha'), require.resolve('../../scripts/mocha') ] }, @@ -192,7 +192,7 @@ module.exports = function (grunt) { }, cmd: YARN, args: [ - githubChecksReporter('verifyNotice'), + ...githubChecksReporter('verifyNotice'), 'scripts/notice', '--validate' ] @@ -201,7 +201,7 @@ module.exports = function (grunt) { apiIntegrationTests: { cmd: YARN, args: [ - githubChecksReporter('apiIntegrationTests'), + ...githubChecksReporter('apiIntegrationTests'), 'scripts/functional_tests', '--config', 'test/api_integration/config.js', '--bail', @@ -212,7 +212,7 @@ module.exports = function (grunt) { serverIntegrationTests: { cmd: YARN, args: [ - githubChecksReporter('serverIntegrationTests'), + ...githubChecksReporter('serverIntegrationTests'), 'scripts/functional_tests', '--config', 'test/server_integration/http/ssl/config.js', '--config', 'test/server_integration/http/ssl_redirect/config.js', @@ -225,7 +225,7 @@ module.exports = function (grunt) { interpreterFunctionalTestsRelease: { cmd: YARN, args: [ - githubChecksReporter('interpreterFunctionalTestsRelease'), + ...githubChecksReporter('interpreterFunctionalTestsRelease'), 'scripts/functional_tests', '--config', 'test/interpreter_functional/config.js', '--bail', @@ -237,7 +237,7 @@ module.exports = function (grunt) { pluginFunctionalTestsRelease: { cmd: YARN, args: [ - githubChecksReporter('pluginFunctionalTestsRelease'), + ...githubChecksReporter('pluginFunctionalTestsRelease'), 'scripts/functional_tests', '--config', 'test/plugin_functional/config.js', '--bail', @@ -249,7 +249,7 @@ module.exports = function (grunt) { functionalTests: { cmd: YARN, args: [ - githubChecksReporter('functionalTests'), + ...githubChecksReporter('functionalTests'), 'scripts/functional_tests', '--config', 'test/functional/config.js', '--bail', From 90df9ade0549448f74074b87a6ca0e887ed94fc1 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sun, 7 Apr 2019 11:24:29 -0500 Subject: [PATCH 22/59] simpler script paths --- tasks/config/run.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tasks/config/run.js b/tasks/config/run.js index ca196f78d62b36..61f90611eb9b38 100644 --- a/tasks/config/run.js +++ b/tasks/config/run.js @@ -72,7 +72,7 @@ module.exports = function (grunt) { cmd: YARN, args: [ ...githubChecksReporter('eslint'), - require.resolve('../../scripts/eslint'), + 'scripts/eslint', '--no-cache' ] }, @@ -81,7 +81,7 @@ module.exports = function (grunt) { cmd: YARN, args: [ ...githubChecksReporter('sasslint'), - require.resolve('../../scripts/sasslint') + 'scripts/sasslint' ] }, @@ -91,7 +91,7 @@ module.exports = function (grunt) { cmd: YARN, args: [ ...githubChecksReporter('checkFileCasing'), - require.resolve('../../scripts/check_file_casing'), + 'scripts/check_file_casing', '--quiet' // only log errors, not warnings ] }, @@ -102,7 +102,7 @@ module.exports = function (grunt) { cmd: YARN, args: [ ...githubChecksReporter('checkCoreApiChange'), - require.resolve('../../scripts/check_core_api_changes') + 'scripts/check_core_api_changes' ] }, @@ -112,7 +112,7 @@ module.exports = function (grunt) { cmd: YARN, args: [ ...githubChecksReporter('typeCheck'), - require.resolve('../../scripts/type_check') + 'scripts/type_check' ] }, @@ -122,7 +122,7 @@ module.exports = function (grunt) { cmd: YARN, args: [ ...githubChecksReporter('checkTsProjects'), - require.resolve('../../scripts/check_ts_projects') + 'scripts/check_ts_projects' ] }, @@ -132,7 +132,7 @@ module.exports = function (grunt) { cmd: YARN, args: [ ...githubChecksReporter('i18nCheck'), - require.resolve('../../scripts/i18n_check'), + 'scripts/i18n_check', '--ignore-missing', ] }, @@ -143,7 +143,7 @@ module.exports = function (grunt) { cmd: YARN, args: [ ...githubChecksReporter('mocha'), - require.resolve('../../scripts/mocha') + 'scripts/mocha' ] }, From 43f3ad5bf5a0e7b71af0b99d3c42dccd4cc9eca1 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sun, 7 Apr 2019 11:40:20 -0500 Subject: [PATCH 23/59] implement xpack checks --- test/scripts/jenkins_xpack.sh | 4 ++-- test/scripts/jenkins_xpack_ci_group.sh | 2 +- x-pack/package.json | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/scripts/jenkins_xpack.sh b/test/scripts/jenkins_xpack.sh index 1d5a20d7fb0b9f..d1f4760bec4ff1 100755 --- a/test/scripts/jenkins_xpack.sh +++ b/test/scripts/jenkins_xpack.sh @@ -17,13 +17,13 @@ export TEST_BROWSER_HEADLESS=1 echo " -> Running mocha tests" cd "$XPACK_DIR" -yarn test +yarn run github-checks-reporter "xpack:mocha" yarn test echo "" echo "" echo " -> Running jest tests" cd "$XPACK_DIR" -node scripts/jest --ci --no-cache --verbose +yarn run github-checks-reporter "xpack:jest" node scripts/jest --ci --no-cache --verbose echo "" echo "" diff --git a/test/scripts/jenkins_xpack_ci_group.sh b/test/scripts/jenkins_xpack_ci_group.sh index 297401fc245930..65ea28facbe3ae 100755 --- a/test/scripts/jenkins_xpack_ci_group.sh +++ b/test/scripts/jenkins_xpack_ci_group.sh @@ -36,6 +36,6 @@ tar -xzf "$linuxBuild" -C "$installDir" --strip=1 echo " -> Running functional and api tests" cd "$XPACK_DIR" -node scripts/functional_tests --debug --bail --kibana-install-dir "$installDir" --include-tag "ciGroup$CI_GROUP" +yarn run github-checks-reporter "xpack:functionalTests_ciGroup${CI_GROUP}" node scripts/functional_tests --debug --bail --kibana-install-dir "$installDir" --include-tag "ciGroup$CI_GROUP" echo "" echo "" diff --git a/x-pack/package.json b/x-pack/package.json index c434a1b6f80c15..81d66783efc48d 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -96,6 +96,7 @@ "execa": "^1.0.0", "fancy-log": "^1.3.2", "fetch-mock": "7.3.0", + "github-xyz": "^0.0.16", "graphql-code-generator": "^0.13.0", "graphql-codegen-introspection-template": "^0.13.0", "graphql-codegen-typescript-resolvers-template": "^0.13.0", From 3a34748bcadae325643e65085daa2d1f52899001 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sun, 7 Apr 2019 12:21:23 -0500 Subject: [PATCH 24/59] implement xpack checks --- x-pack/github_checks_reporter.json | 1 + 1 file changed, 1 insertion(+) create mode 120000 x-pack/github_checks_reporter.json diff --git a/x-pack/github_checks_reporter.json b/x-pack/github_checks_reporter.json new file mode 120000 index 00000000000000..feeff827bea150 --- /dev/null +++ b/x-pack/github_checks_reporter.json @@ -0,0 +1 @@ +../github_checks_reporter.json \ No newline at end of file From 30c2bb2cb09009f61215677097b6d652a5a345ec Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sun, 7 Apr 2019 15:16:28 -0500 Subject: [PATCH 25/59] bump package --- package.json | 2 +- x-pack/package.json | 2 +- yarn.lock | 50 +++++++++++---------------------------------- 3 files changed, 14 insertions(+), 40 deletions(-) diff --git a/package.json b/package.json index 843aa26b8f3733..e33664aa2a4fb5 100644 --- a/package.json +++ b/package.json @@ -358,7 +358,7 @@ "fetch-mock": "7.3.0", "geckodriver": "^1.16.1", "getopts": "2.0.0", - "github-xyz": "^0.0.16", + "github-xyz": "^0.0.17", "grunt": "1.0.3", "grunt-cli": "^1.2.0", "grunt-contrib-watch": "^1.1.0", diff --git a/x-pack/package.json b/x-pack/package.json index 81d66783efc48d..c24dd8e6334856 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -96,7 +96,7 @@ "execa": "^1.0.0", "fancy-log": "^1.3.2", "fetch-mock": "7.3.0", - "github-xyz": "^0.0.16", + "github-xyz": "^0.0.17", "graphql-code-generator": "^0.13.0", "graphql-codegen-introspection-template": "^0.13.0", "graphql-codegen-typescript-resolvers-template": "^0.13.0", diff --git a/yarn.lock b/yarn.lock index c8434cb09fe91a..f9e6bc1b15169d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7889,18 +7889,6 @@ convex-hull@^1.0.3: incremental-convex-hull "^1.0.1" monotone-convex-hull-2d "^1.0.1" -convict@^4.4.1: - version "4.4.1" - resolved "https://registry.yarnpkg.com/convict/-/convict-4.4.1.tgz#87f93c2a4f51bfc961e2873864442d0349a1b0d0" - integrity sha512-celpR4hOWWwb/S8azhzgQwDon6muAJlNe2LTLeOGyoSgH390TsaqoieAe9BLbAv7+9wNfG7DTA2q3IfFp2viKw== - dependencies: - depd "1.1.2" - json5 "1.0.1" - lodash.clonedeep "4.5.0" - moment "2.22.2" - validator "10.8.0" - yargs-parser "11.0.0" - cookie-signature@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" @@ -9141,7 +9129,7 @@ depd@1.1.1: resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359" integrity sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k= -depd@1.1.2, depd@~1.1.1, depd@~1.1.2: +depd@~1.1.1, depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= @@ -12017,15 +12005,14 @@ github-username@^3.0.0: dependencies: gh-got "^5.0.0" -github-xyz@^0.0.16: - version "0.0.16" - resolved "https://registry.yarnpkg.com/github-xyz/-/github-xyz-0.0.16.tgz#cb23b950c9c6df2edd7a2b473ac1d059f45fd502" - integrity sha512-0PpudW1csbVDYAGANfG+shaX69PBKzamk/LS5JK6KqVgviQx1l8TSGcA3j5rChieisdmHR+r5HTTiLFZenh4Wg== +github-xyz@^0.0.17: + version "0.0.17" + resolved "https://registry.yarnpkg.com/github-xyz/-/github-xyz-0.0.17.tgz#3e2a927cae7388d016070a1cc4b7f11729b07754" + integrity sha512-h6SIQBzXhIj0auxxs3SUo9JJxWwhDdAuzhLMN7BVTUFSsa1xwlGcW1HGgXT28pTQd+37flb+C4288PdYbySeSQ== dependencies: "@octokit/app" "^2.2.2" "@octokit/request" "^2.4.2" "@octokit/rest" "^16.23.2" - convict "^4.4.1" strip-ansi "^5.2.0" gl-matrix@^2.6.1: @@ -15672,18 +15659,18 @@ json3@3.3.2, json3@^3.3.2: resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1" integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE= -json5@1.0.1, json5@^1.0.1: +json5@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" + integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= + +json5@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== dependencies: minimist "^1.2.0" -json5@^0.5.0: - version "0.5.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" - integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= - json5@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850" @@ -16479,7 +16466,7 @@ lodash.clone@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6" integrity sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y= -lodash.clonedeep@4.5.0, lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0: +lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= @@ -25949,11 +25936,6 @@ validate-npm-package-name@2.2.2: dependencies: builtins "0.0.7" -validator@10.8.0: - version "10.8.0" - resolved "https://registry.yarnpkg.com/validator/-/validator-10.8.0.tgz#8acb15a5c39411cbc8ef2be0c98c2514da4410a7" - integrity sha512-mXqMxfCh5NLsVgYVKl9WvnHNDPCcbNppHSPPowu0VjtSsGWVY+z8hJF44edLR1nbLNzi3jYoYsIl8KZpioIk6g== - validator@^8.0.0: version "8.2.0" resolved "https://registry.yarnpkg.com/validator/-/validator-8.2.0.tgz#3c1237290e37092355344fef78c231249dab77b9" @@ -27216,14 +27198,6 @@ yallist@^3.0.0, yallist@^3.0.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9" integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k= -yargs-parser@11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.0.0.tgz#d9fd0f0cd551a2a2ef9bbf42606ffb6211634232" - integrity sha512-dvsafRjM45h79WOTvS/dP35Sb31SlGAKz6tFjI97kGC4MJFBuzTZY6TTYHrz0QSMQdkyd8Y+RsOMLr+JY0nPFQ== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" - yargs-parser@^10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8" From d870d66c1708c676b1b688b791f85f3de29554f8 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sun, 7 Apr 2019 15:18:52 -0500 Subject: [PATCH 26/59] bump package --- package.json | 2 +- x-pack/package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index e33664aa2a4fb5..bd3d0bc4225a92 100644 --- a/package.json +++ b/package.json @@ -358,7 +358,7 @@ "fetch-mock": "7.3.0", "geckodriver": "^1.16.1", "getopts": "2.0.0", - "github-xyz": "^0.0.17", + "github-xyz": "^0.0.18", "grunt": "1.0.3", "grunt-cli": "^1.2.0", "grunt-contrib-watch": "^1.1.0", diff --git a/x-pack/package.json b/x-pack/package.json index c24dd8e6334856..4a8e7ebe7969f3 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -96,7 +96,7 @@ "execa": "^1.0.0", "fancy-log": "^1.3.2", "fetch-mock": "7.3.0", - "github-xyz": "^0.0.17", + "github-xyz": "^0.0.18", "graphql-code-generator": "^0.13.0", "graphql-codegen-introspection-template": "^0.13.0", "graphql-codegen-typescript-resolvers-template": "^0.13.0", diff --git a/yarn.lock b/yarn.lock index f9e6bc1b15169d..8a75bb9708b8b1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12005,10 +12005,10 @@ github-username@^3.0.0: dependencies: gh-got "^5.0.0" -github-xyz@^0.0.17: - version "0.0.17" - resolved "https://registry.yarnpkg.com/github-xyz/-/github-xyz-0.0.17.tgz#3e2a927cae7388d016070a1cc4b7f11729b07754" - integrity sha512-h6SIQBzXhIj0auxxs3SUo9JJxWwhDdAuzhLMN7BVTUFSsa1xwlGcW1HGgXT28pTQd+37flb+C4288PdYbySeSQ== +github-xyz@^0.0.18: + version "0.0.18" + resolved "https://registry.yarnpkg.com/github-xyz/-/github-xyz-0.0.18.tgz#7eb253d876967f1e34c340955b5f70a1d876a308" + integrity sha512-kCU7OGjvZka6Wzig65qw7AeI3uZ47wtaAnpTG9xg3iB09EP4R5U42OUbT5IG2r5jIm+VF2vz92wxrwD3RfmRhQ== dependencies: "@octokit/app" "^2.2.2" "@octokit/request" "^2.4.2" From f69888988f4431d54986069dd7589d5ac19a05b5 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sun, 7 Apr 2019 15:34:12 -0500 Subject: [PATCH 27/59] bump package --- package.json | 2 +- x-pack/package.json | 2 +- yarn.lock | 50 ++++++++++++++++++++++++++++++++++----------- 3 files changed, 40 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index bd3d0bc4225a92..0fc802a42f41cc 100644 --- a/package.json +++ b/package.json @@ -358,7 +358,7 @@ "fetch-mock": "7.3.0", "geckodriver": "^1.16.1", "getopts": "2.0.0", - "github-xyz": "^0.0.18", + "github-xyz": "^0.0.19", "grunt": "1.0.3", "grunt-cli": "^1.2.0", "grunt-contrib-watch": "^1.1.0", diff --git a/x-pack/package.json b/x-pack/package.json index 4a8e7ebe7969f3..235a4d092ae221 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -96,7 +96,7 @@ "execa": "^1.0.0", "fancy-log": "^1.3.2", "fetch-mock": "7.3.0", - "github-xyz": "^0.0.18", + "github-xyz": "^0.0.19", "graphql-code-generator": "^0.13.0", "graphql-codegen-introspection-template": "^0.13.0", "graphql-codegen-typescript-resolvers-template": "^0.13.0", diff --git a/yarn.lock b/yarn.lock index 8a75bb9708b8b1..5e6eb617f7ed6e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7889,6 +7889,18 @@ convex-hull@^1.0.3: incremental-convex-hull "^1.0.1" monotone-convex-hull-2d "^1.0.1" +convict@^4.4.1: + version "4.4.1" + resolved "https://registry.yarnpkg.com/convict/-/convict-4.4.1.tgz#87f93c2a4f51bfc961e2873864442d0349a1b0d0" + integrity sha512-celpR4hOWWwb/S8azhzgQwDon6muAJlNe2LTLeOGyoSgH390TsaqoieAe9BLbAv7+9wNfG7DTA2q3IfFp2viKw== + dependencies: + depd "1.1.2" + json5 "1.0.1" + lodash.clonedeep "4.5.0" + moment "2.22.2" + validator "10.8.0" + yargs-parser "11.0.0" + cookie-signature@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" @@ -9129,7 +9141,7 @@ depd@1.1.1: resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359" integrity sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k= -depd@~1.1.1, depd@~1.1.2: +depd@1.1.2, depd@~1.1.1, depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= @@ -12005,14 +12017,15 @@ github-username@^3.0.0: dependencies: gh-got "^5.0.0" -github-xyz@^0.0.18: - version "0.0.18" - resolved "https://registry.yarnpkg.com/github-xyz/-/github-xyz-0.0.18.tgz#7eb253d876967f1e34c340955b5f70a1d876a308" - integrity sha512-kCU7OGjvZka6Wzig65qw7AeI3uZ47wtaAnpTG9xg3iB09EP4R5U42OUbT5IG2r5jIm+VF2vz92wxrwD3RfmRhQ== +github-xyz@^0.0.19: + version "0.0.19" + resolved "https://registry.yarnpkg.com/github-xyz/-/github-xyz-0.0.19.tgz#f33976c6385d4f2648af9aefdfd8fa3a314583af" + integrity sha512-qxPPPm/U1T2k316BG6xvsevA34HQzk8uLy5MbltIwS3XFN56JwLE/h/v/cdupud61wNYVlgcZ1zsABQbk5YdVA== dependencies: "@octokit/app" "^2.2.2" "@octokit/request" "^2.4.2" "@octokit/rest" "^16.23.2" + convict "^4.4.1" strip-ansi "^5.2.0" gl-matrix@^2.6.1: @@ -15659,18 +15672,18 @@ json3@3.3.2, json3@^3.3.2: resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1" integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE= -json5@^0.5.0: - version "0.5.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" - integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= - -json5@^1.0.1: +json5@1.0.1, json5@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== dependencies: minimist "^1.2.0" +json5@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" + integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= + json5@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850" @@ -16466,7 +16479,7 @@ lodash.clone@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6" integrity sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y= -lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0: +lodash.clonedeep@4.5.0, lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= @@ -25936,6 +25949,11 @@ validate-npm-package-name@2.2.2: dependencies: builtins "0.0.7" +validator@10.8.0: + version "10.8.0" + resolved "https://registry.yarnpkg.com/validator/-/validator-10.8.0.tgz#8acb15a5c39411cbc8ef2be0c98c2514da4410a7" + integrity sha512-mXqMxfCh5NLsVgYVKl9WvnHNDPCcbNppHSPPowu0VjtSsGWVY+z8hJF44edLR1nbLNzi3jYoYsIl8KZpioIk6g== + validator@^8.0.0: version "8.2.0" resolved "https://registry.yarnpkg.com/validator/-/validator-8.2.0.tgz#3c1237290e37092355344fef78c231249dab77b9" @@ -27198,6 +27216,14 @@ yallist@^3.0.0, yallist@^3.0.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9" integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k= +yargs-parser@11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.0.0.tgz#d9fd0f0cd551a2a2ef9bbf42606ffb6211634232" + integrity sha512-dvsafRjM45h79WOTvS/dP35Sb31SlGAKz6tFjI97kGC4MJFBuzTZY6TTYHrz0QSMQdkyd8Y+RsOMLr+JY0nPFQ== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + yargs-parser@^10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8" From 3cb7b0c00456ad2419a604662e6a979da05ffe18 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sun, 7 Apr 2019 20:27:35 -0500 Subject: [PATCH 28/59] fix sample_panel_action thing --- test/scripts/jenkins_ci_group.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index 11471e69bca8d8..aced310377dd56 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -24,7 +24,7 @@ yarn run github-checks-reporter "functionalTests_ciGroup${CI_GROUP}" yarn run gr if [ "$CI_GROUP" == "1" ]; then # build kbn_tp_sample_panel_action cd test/plugin_functional/plugins/kbn_tp_sample_panel_action; - yarn run github-checks-reporter "build kbn_tp_sample_panel_action" yarn build; + yarn run github-checks-reporter "build_kbn_tp_sample_panel_action" yarn build; cd -; yarn run github-checks-reporter "pluginFunctionalTestsRelease" yarn run grunt run:pluginFunctionalTestsRelease --from=source; yarn run github-checks-reporter "interpreterFunctionalTestsRelease" yarn run grunt run:interpreterFunctionalTestsRelease; From d10d49d68789a1fd238c43fe50a515b5a8c7395f Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sun, 7 Apr 2019 21:13:36 -0500 Subject: [PATCH 29/59] bump dependency - one config --- package.json | 2 +- x-pack/github_checks_reporter.json | 1 - x-pack/package.json | 1 - yarn.lock | 8 ++++---- 4 files changed, 5 insertions(+), 7 deletions(-) delete mode 120000 x-pack/github_checks_reporter.json diff --git a/package.json b/package.json index 0fc802a42f41cc..ecaa7f15b8e400 100644 --- a/package.json +++ b/package.json @@ -358,7 +358,7 @@ "fetch-mock": "7.3.0", "geckodriver": "^1.16.1", "getopts": "2.0.0", - "github-xyz": "^0.0.19", + "github-xyz": "^0.0.20", "grunt": "1.0.3", "grunt-cli": "^1.2.0", "grunt-contrib-watch": "^1.1.0", diff --git a/x-pack/github_checks_reporter.json b/x-pack/github_checks_reporter.json deleted file mode 120000 index feeff827bea150..00000000000000 --- a/x-pack/github_checks_reporter.json +++ /dev/null @@ -1 +0,0 @@ -../github_checks_reporter.json \ No newline at end of file diff --git a/x-pack/package.json b/x-pack/package.json index 235a4d092ae221..c434a1b6f80c15 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -96,7 +96,6 @@ "execa": "^1.0.0", "fancy-log": "^1.3.2", "fetch-mock": "7.3.0", - "github-xyz": "^0.0.19", "graphql-code-generator": "^0.13.0", "graphql-codegen-introspection-template": "^0.13.0", "graphql-codegen-typescript-resolvers-template": "^0.13.0", diff --git a/yarn.lock b/yarn.lock index 5e6eb617f7ed6e..1b7304a2b03252 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12017,10 +12017,10 @@ github-username@^3.0.0: dependencies: gh-got "^5.0.0" -github-xyz@^0.0.19: - version "0.0.19" - resolved "https://registry.yarnpkg.com/github-xyz/-/github-xyz-0.0.19.tgz#f33976c6385d4f2648af9aefdfd8fa3a314583af" - integrity sha512-qxPPPm/U1T2k316BG6xvsevA34HQzk8uLy5MbltIwS3XFN56JwLE/h/v/cdupud61wNYVlgcZ1zsABQbk5YdVA== +github-xyz@^0.0.20: + version "0.0.20" + resolved "https://registry.yarnpkg.com/github-xyz/-/github-xyz-0.0.20.tgz#18a76e69719a85fa58e66eaea950af04441ccda0" + integrity sha512-79/Db5a+ODt9sGIE1ItNmChMDn51zxygzSQsqK/LEQ17ZjPgz4+V/gbuF/9kbEP9x9V8f3nYzoMLZEd2wnAoJA== dependencies: "@octokit/app" "^2.2.2" "@octokit/request" "^2.4.2" From 069045b61e1766ccd561dfb59e4b927e4ba07fbd Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sun, 7 Apr 2019 22:17:25 -0500 Subject: [PATCH 30/59] fix check name and purposely fail eslint --- packages/elastic-datemath/src/index.js | 2 +- test/scripts/jenkins_ci_group.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/elastic-datemath/src/index.js b/packages/elastic-datemath/src/index.js index afedad3ef6f72a..74ecc8a01ecb1f 100644 --- a/packages/elastic-datemath/src/index.js +++ b/packages/elastic-datemath/src/index.js @@ -20,7 +20,7 @@ import moment from 'moment'; const unitsMap = { - ms: { weight: 1, type: 'fixed', base: 1 }, + 'ms': { weight: 1, type: 'fixed', base: 1 }, s: { weight: 2, type: 'fixed', base: 1000 }, m: { weight: 3, type: 'mixed', base: 1000 * 60 }, h: { weight: 4, type: 'mixed', base: 1000 * 60 * 60 }, diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index aced310377dd56..11471e69bca8d8 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -24,7 +24,7 @@ yarn run github-checks-reporter "functionalTests_ciGroup${CI_GROUP}" yarn run gr if [ "$CI_GROUP" == "1" ]; then # build kbn_tp_sample_panel_action cd test/plugin_functional/plugins/kbn_tp_sample_panel_action; - yarn run github-checks-reporter "build_kbn_tp_sample_panel_action" yarn build; + yarn run github-checks-reporter "build kbn_tp_sample_panel_action" yarn build; cd -; yarn run github-checks-reporter "pluginFunctionalTestsRelease" yarn run grunt run:pluginFunctionalTestsRelease --from=source; yarn run github-checks-reporter "interpreterFunctionalTestsRelease" yarn run grunt run:interpreterFunctionalTestsRelease; From 2a47f8955035ad6ff551e49b53d44ac1b97344e3 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Mon, 8 Apr 2019 14:30:35 -0500 Subject: [PATCH 31/59] use env var for app id --- package.json | 2 +- src/dev/ci_setup/setup.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index ecaa7f15b8e400..c6848755ce58df 100644 --- a/package.json +++ b/package.json @@ -358,7 +358,7 @@ "fetch-mock": "7.3.0", "geckodriver": "^1.16.1", "getopts": "2.0.0", - "github-xyz": "^0.0.20", + "github-xyz": "^0.0.21", "grunt": "1.0.3", "grunt-cli": "^1.2.0", "grunt-contrib-watch": "^1.1.0", diff --git a/src/dev/ci_setup/setup.sh b/src/dev/ci_setup/setup.sh index a4b2d6d1e4389c..85cf52f883f202 100755 --- a/src/dev/ci_setup/setup.sh +++ b/src/dev/ci_setup/setup.sh @@ -180,3 +180,8 @@ if [ "$GIT_CHANGES" ]; then echo -e "$GIT_CHANGES\n" exit 1 fi + +### +### for github-checks-reporter +### +export GITHUB_CHECKS_REPORTER_ID=26774 From 0d4e2701beb54cdedbb03a7e9dbfa428c6d1853a Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Mon, 8 Apr 2019 14:54:40 -0500 Subject: [PATCH 32/59] yarn.lock --- yarn.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index 1b7304a2b03252..5a780abb5a5c40 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12017,10 +12017,10 @@ github-username@^3.0.0: dependencies: gh-got "^5.0.0" -github-xyz@^0.0.20: - version "0.0.20" - resolved "https://registry.yarnpkg.com/github-xyz/-/github-xyz-0.0.20.tgz#18a76e69719a85fa58e66eaea950af04441ccda0" - integrity sha512-79/Db5a+ODt9sGIE1ItNmChMDn51zxygzSQsqK/LEQ17ZjPgz4+V/gbuF/9kbEP9x9V8f3nYzoMLZEd2wnAoJA== +github-xyz@^0.0.21: + version "0.0.21" + resolved "https://registry.yarnpkg.com/github-xyz/-/github-xyz-0.0.21.tgz#7082e93a14f3b3d63ade4e0155ea92a66fdcbeb5" + integrity sha512-GyRooCx0+poBD3KS2DZpO7er0uevnrrIo55alfQLezArC5YZGQrDI+/0oy6LRmhJla8t6Hg6YxJUsNozomKCSQ== dependencies: "@octokit/app" "^2.2.2" "@octokit/request" "^2.4.2" From a66c85af94fb4da8baef658d27984032586d7c5f Mon Sep 17 00:00:00 2001 From: Matthew Kime Date: Mon, 8 Apr 2019 21:59:03 -0500 Subject: [PATCH 33/59] fix purposeful mistake --- packages/elastic-datemath/src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/elastic-datemath/src/index.js b/packages/elastic-datemath/src/index.js index 74ecc8a01ecb1f..afedad3ef6f72a 100644 --- a/packages/elastic-datemath/src/index.js +++ b/packages/elastic-datemath/src/index.js @@ -20,7 +20,7 @@ import moment from 'moment'; const unitsMap = { - 'ms': { weight: 1, type: 'fixed', base: 1 }, + ms: { weight: 1, type: 'fixed', base: 1 }, s: { weight: 2, type: 'fixed', base: 1000 }, m: { weight: 3, type: 'mixed', base: 1000 * 60 }, h: { weight: 4, type: 'mixed', base: 1000 * 60 * 60 }, From fd663982e44672ecab8389c48f9273c845982cfb Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 11 Apr 2019 11:53:43 -0500 Subject: [PATCH 34/59] use correct package --- package.json | 2 +- yarn.lock | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index c6848755ce58df..2a42e38d6d3fd5 100644 --- a/package.json +++ b/package.json @@ -254,6 +254,7 @@ "@babel/parser": "^7.3.4", "@babel/types": "^7.3.4", "@elastic/eslint-config-kibana": "0.15.0", + "@elastic/github-checks-reporter": "0.0.1", "@elastic/makelogs": "^4.4.0", "@kbn/es": "1.0.0", "@kbn/eslint-import-resolver-kibana": "2.0.0", @@ -358,7 +359,6 @@ "fetch-mock": "7.3.0", "geckodriver": "^1.16.1", "getopts": "2.0.0", - "github-xyz": "^0.0.21", "grunt": "1.0.3", "grunt-cli": "^1.2.0", "grunt-contrib-watch": "^1.1.0", diff --git a/yarn.lock b/yarn.lock index 5a780abb5a5c40..b7b1653d1555ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1372,6 +1372,17 @@ resolved "https://registry.yarnpkg.com/@elastic/filesaver/-/filesaver-1.1.2.tgz#1998ffb3cd89c9da4ec12a7793bfcae10e30c77a" integrity sha512-YZbSufYFBhAj+S2cJgiKALoxIJevqXN2MSr6Yqr42rJdaPuM31cj6pUDwflkql1oDjupqD9la+MfxPFjXI1JFQ== +"@elastic/github-checks-reporter@0.0.1": + version "0.0.1" + resolved "https://registry.yarnpkg.com/@elastic/github-checks-reporter/-/github-checks-reporter-0.0.1.tgz#f2341464866391a7d31b204e173bb7650e53a72b" + integrity sha512-8MhXPHKGHv+Yu+AcrnM3H48esHZ28sQFzV9lbWq9LoxVu4Je851yeSA+dEybgk/OY4jEiHfKAAkj/JNj4i85cg== + dependencies: + "@octokit/app" "^2.2.2" + "@octokit/request" "^2.4.2" + "@octokit/rest" "^16.23.2" + convict "^4.4.1" + strip-ansi "^5.2.0" + "@elastic/good@8.1.1-kibana2": version "8.1.1-kibana2" resolved "https://registry.yarnpkg.com/@elastic/good/-/good-8.1.1-kibana2.tgz#3ba7413da9fae4c67f128f3e9b1dc28f24523c7a" @@ -12017,17 +12028,6 @@ github-username@^3.0.0: dependencies: gh-got "^5.0.0" -github-xyz@^0.0.21: - version "0.0.21" - resolved "https://registry.yarnpkg.com/github-xyz/-/github-xyz-0.0.21.tgz#7082e93a14f3b3d63ade4e0155ea92a66fdcbeb5" - integrity sha512-GyRooCx0+poBD3KS2DZpO7er0uevnrrIo55alfQLezArC5YZGQrDI+/0oy6LRmhJla8t6Hg6YxJUsNozomKCSQ== - dependencies: - "@octokit/app" "^2.2.2" - "@octokit/request" "^2.4.2" - "@octokit/rest" "^16.23.2" - convict "^4.4.1" - strip-ansi "^5.2.0" - gl-matrix@^2.6.1: version "2.8.1" resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-2.8.1.tgz#1c7873448eac61d2cd25803a074e837bd42581a3" From fea37832e73d096f69ec8d83f1ce95d9d2adc7e7 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 17 Apr 2019 16:02:14 -0500 Subject: [PATCH 35/59] move appId to config file, refactor command abstraction --- package.json | 2 +- src/dev/ci_setup/setup.sh | 5 -- tasks/config/run.js | 120 ++++++++++++++++--------------- test/scripts/jenkins_ci_group.sh | 6 +- yarn.lock | 8 +-- 5 files changed, 70 insertions(+), 71 deletions(-) diff --git a/package.json b/package.json index 13ea79edfd3332..fb1910a92291d7 100644 --- a/package.json +++ b/package.json @@ -255,7 +255,7 @@ "@babel/parser": "^7.3.4", "@babel/types": "^7.3.4", "@elastic/eslint-config-kibana": "0.15.0", - "@elastic/github-checks-reporter": "0.0.1", + "@elastic/github-checks-reporter": "0.0.2", "@elastic/makelogs": "^4.4.0", "@kbn/es": "1.0.0", "@kbn/eslint-import-resolver-kibana": "2.0.0", diff --git a/src/dev/ci_setup/setup.sh b/src/dev/ci_setup/setup.sh index 85cf52f883f202..a4b2d6d1e4389c 100755 --- a/src/dev/ci_setup/setup.sh +++ b/src/dev/ci_setup/setup.sh @@ -180,8 +180,3 @@ if [ "$GIT_CHANGES" ]; then echo -e "$GIT_CHANGES\n" exit 1 fi - -### -### for github-checks-reporter -### -export GITHUB_CHECKS_REPORTER_ID=26774 diff --git a/tasks/config/run.js b/tasks/config/run.js index 61f90611eb9b38..3afe4b6dcd5720 100644 --- a/tasks/config/run.js +++ b/tasks/config/run.js @@ -62,90 +62,94 @@ module.exports = function (grunt) { '--server.port=5610', ]; - const githubChecksReporter = title => ['run', 'github-checks-reporter', title, 'node']; - const YARN = 'yarn'; + const NODE = 'node'; + const scriptWithGithubChecks = ({ title, options, cmd, args }) => ({ + options, + cmd: 'yarn', + args: ['run', 'github-checks-reporter', title, cmd, ...args], + }); return { // used by the test and jenkins:unit tasks // runs the eslint script to check for linting errors - eslint: { - cmd: YARN, + eslint: scriptWithGithubChecks({ + title: 'eslint', + cmd: NODE, args: [ - ...githubChecksReporter('eslint'), 'scripts/eslint', '--no-cache' ] - }, + }), - sasslint: { - cmd: YARN, + sasslint: scriptWithGithubChecks({ + title: 'sasslint', + cmd: NODE, args: [ - ...githubChecksReporter('sasslint'), 'scripts/sasslint' ] - }, + }), // used by the test tasks // runs the check_file_casing script to ensure filenames use correct casing - checkFileCasing: { - cmd: YARN, + checkFileCasing: scriptWithGithubChecks({ + title: 'Check file casing', + cmd: NODE, args: [ - ...githubChecksReporter('checkFileCasing'), 'scripts/check_file_casing', '--quiet' // only log errors, not warnings ] - }, + }), // used by the test tasks // runs the check_core_api_changes script to ensure API changes are explictily accepted - checkCoreApiChanges: { - cmd: YARN, + checkCoreApiChanges: scriptWithGithubChecks({ + title: 'Check core API changes', + cmd: NODE, args: [ - ...githubChecksReporter('checkCoreApiChange'), 'scripts/check_core_api_changes' ] - }, + }), // used by the test and jenkins:unit tasks // runs the typecheck script to check for Typescript type errors - typeCheck: { - cmd: YARN, + typeCheck: scriptWithGithubChecks({ + title: 'Type check', + cmd: NODE, args: [ - ...githubChecksReporter('typeCheck'), 'scripts/type_check' ] - }, + }), // used by the test and jenkins:unit tasks // ensures that all typescript files belong to a typescript project - checkTsProjects: { - cmd: YARN, + checkTsProjects: scriptWithGithubChecks({ + title: 'TypeScript - all files belong to a TypeScript project', + cmd: NODE, args: [ - ...githubChecksReporter('checkTsProjects'), 'scripts/check_ts_projects' ] - }, + }), // used by the test and jenkins:unit tasks // runs the i18n_check script to check i18n engine usage - i18nCheck: { - cmd: YARN, + i18nCheck: scriptWithGithubChecks({ + title: 'Internationalization check', + cmd: NODE, args: [ - ...githubChecksReporter('i18nCheck'), 'scripts/i18n_check', '--ignore-missing', ] - }, + }), // used by the test:server task // runs all node.js/server mocha tests - mocha: { - cmd: YARN, + mocha: scriptWithGithubChecks({ + title: 'Mocha tests', + cmd: NODE, args: [ - ...githubChecksReporter('mocha'), 'scripts/mocha' ] - }, + }), // used by the test:browser task // runs the kibana server to serve the browser test bundle @@ -186,33 +190,33 @@ module.exports = function (grunt) { ] }), - verifyNotice: { + verifyNotice: scriptWithGithubChecks({ + title: 'Verify NOTICE.txt', options: { wait: true, }, - cmd: YARN, + cmd: NODE, args: [ - ...githubChecksReporter('verifyNotice'), 'scripts/notice', '--validate' ] - }, + }), - apiIntegrationTests: { - cmd: YARN, + apiIntegrationTests: scriptWithGithubChecks({ + title: 'API integration tests', + cmd: NODE, args: [ - ...githubChecksReporter('apiIntegrationTests'), 'scripts/functional_tests', '--config', 'test/api_integration/config.js', '--bail', '--debug', ], - }, + }), - serverIntegrationTests: { - cmd: YARN, + serverIntegrationTests: scriptWithGithubChecks({ + title: 'Server Integration Tests', + cmd: NODE, args: [ - ...githubChecksReporter('serverIntegrationTests'), 'scripts/functional_tests', '--config', 'test/server_integration/http/ssl/config.js', '--config', 'test/server_integration/http/ssl_redirect/config.js', @@ -220,42 +224,42 @@ module.exports = function (grunt) { '--debug', '--kibana-install-dir', KIBANA_INSTALL_DIR, ], - }, + }), - interpreterFunctionalTestsRelease: { - cmd: YARN, + interpreterFunctionalTestsRelease: scriptWithGithubChecks({ + title: 'Interpreter Functional Tests', + cmd: NODE, args: [ - ...githubChecksReporter('interpreterFunctionalTestsRelease'), 'scripts/functional_tests', '--config', 'test/interpreter_functional/config.js', '--bail', '--debug', '--kibana-install-dir', KIBANA_INSTALL_DIR, ], - }, + }), - pluginFunctionalTestsRelease: { - cmd: YARN, + pluginFunctionalTestsRelease: scriptWithGithubChecks({ + title: 'Plugin functional tests', + cmd: NODE, args: [ - ...githubChecksReporter('pluginFunctionalTestsRelease'), 'scripts/functional_tests', '--config', 'test/plugin_functional/config.js', '--bail', '--debug', '--kibana-install-dir', KIBANA_INSTALL_DIR, ], - }, + }), - functionalTests: { - cmd: YARN, + functionalTests: scriptWithGithubChecks({ + title: 'Functional tests', + cmd: NODE, args: [ - ...githubChecksReporter('functionalTests'), 'scripts/functional_tests', '--config', 'test/functional/config.js', '--bail', '--debug', ], - }, + }), ...getFunctionalTestGroupRunConfigs({ kibanaInstallDir: KIBANA_INSTALL_DIR diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index 11471e69bca8d8..993e2996145da3 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -19,13 +19,13 @@ node scripts/build --debug --oss; export TEST_BROWSER_HEADLESS=1 -yarn run github-checks-reporter "functionalTests_ciGroup${CI_GROUP}" yarn run grunt "run:functionalTests_ciGroup${CI_GROUP}"; +yarn run github-checks-reporter "Functional tests - group ${CI_GROUP}" yarn run grunt "run:functionalTests_ciGroup${CI_GROUP}"; if [ "$CI_GROUP" == "1" ]; then # build kbn_tp_sample_panel_action cd test/plugin_functional/plugins/kbn_tp_sample_panel_action; yarn run github-checks-reporter "build kbn_tp_sample_panel_action" yarn build; cd -; - yarn run github-checks-reporter "pluginFunctionalTestsRelease" yarn run grunt run:pluginFunctionalTestsRelease --from=source; - yarn run github-checks-reporter "interpreterFunctionalTestsRelease" yarn run grunt run:interpreterFunctionalTestsRelease; + yarn run grunt run:pluginFunctionalTestsRelease --from=source; + yarn run grunt run:interpreterFunctionalTestsRelease; fi diff --git a/yarn.lock b/yarn.lock index 2f7b6e688db7ec..7d909ea42a24e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1372,10 +1372,10 @@ resolved "https://registry.yarnpkg.com/@elastic/filesaver/-/filesaver-1.1.2.tgz#1998ffb3cd89c9da4ec12a7793bfcae10e30c77a" integrity sha512-YZbSufYFBhAj+S2cJgiKALoxIJevqXN2MSr6Yqr42rJdaPuM31cj6pUDwflkql1oDjupqD9la+MfxPFjXI1JFQ== -"@elastic/github-checks-reporter@0.0.1": - version "0.0.1" - resolved "https://registry.yarnpkg.com/@elastic/github-checks-reporter/-/github-checks-reporter-0.0.1.tgz#f2341464866391a7d31b204e173bb7650e53a72b" - integrity sha512-8MhXPHKGHv+Yu+AcrnM3H48esHZ28sQFzV9lbWq9LoxVu4Je851yeSA+dEybgk/OY4jEiHfKAAkj/JNj4i85cg== +"@elastic/github-checks-reporter@0.0.2": + version "0.0.2" + resolved "https://registry.yarnpkg.com/@elastic/github-checks-reporter/-/github-checks-reporter-0.0.2.tgz#2a6ae1cd6650c4ac077981114f660598224643f9" + integrity sha512-aoKFBAZnc/bcCYQHOaX0+9JpDM1gtKtSWlUzNZHjmCwPW6tknXWq89tCPaqeCBh7hvC6nq8uNUgiNCVxyG/bjA== dependencies: "@octokit/app" "^2.2.2" "@octokit/request" "^2.4.2" From 2bdf16cf9e6bd016d28c124f65a189e3140b9790 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 17 Apr 2019 16:05:36 -0500 Subject: [PATCH 36/59] add appId to config file --- github_checks_reporter.json | 1 + 1 file changed, 1 insertion(+) diff --git a/github_checks_reporter.json b/github_checks_reporter.json index aa0e6873ac99d4..5924778cb9b6f7 100644 --- a/github_checks_reporter.json +++ b/github_checks_reporter.json @@ -1,4 +1,5 @@ { + "appId": 26774, "envVars": { "appKey": "KIBANA_CI_REPORTER_KEY" } From fd9aa697b4eec45c837b9bb1e408efaab665b58b Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 17 Apr 2019 16:08:28 -0500 Subject: [PATCH 37/59] better human readable title --- test/scripts/jenkins_xpack_ci_group.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/scripts/jenkins_xpack_ci_group.sh b/test/scripts/jenkins_xpack_ci_group.sh index 65ea28facbe3ae..fd1550b4f7e99c 100755 --- a/test/scripts/jenkins_xpack_ci_group.sh +++ b/test/scripts/jenkins_xpack_ci_group.sh @@ -36,6 +36,6 @@ tar -xzf "$linuxBuild" -C "$installDir" --strip=1 echo " -> Running functional and api tests" cd "$XPACK_DIR" -yarn run github-checks-reporter "xpack:functionalTests_ciGroup${CI_GROUP}" node scripts/functional_tests --debug --bail --kibana-install-dir "$installDir" --include-tag "ciGroup$CI_GROUP" +yarn run github-checks-reporter "xpack: Functional tests - group ${CI_GROUP}" node scripts/functional_tests --debug --bail --kibana-install-dir "$installDir" --include-tag "ciGroup$CI_GROUP" echo "" echo "" From edf31e001f4532455192df294882ddee12f85a9f Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 17 Apr 2019 17:05:06 -0500 Subject: [PATCH 38/59] copy changes --- test/scripts/jenkins_ci_group.sh | 4 ++-- test/scripts/jenkins_xpack.sh | 4 ++-- test/scripts/jenkins_xpack_ci_group.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index 993e2996145da3..bf7a1974c48928 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -19,12 +19,12 @@ node scripts/build --debug --oss; export TEST_BROWSER_HEADLESS=1 -yarn run github-checks-reporter "Functional tests - group ${CI_GROUP}" yarn run grunt "run:functionalTests_ciGroup${CI_GROUP}"; +yarn run github-checks-reporter "Functional tests / Group ${CI_GROUP}" yarn run grunt "run:functionalTests_ciGroup${CI_GROUP}"; if [ "$CI_GROUP" == "1" ]; then # build kbn_tp_sample_panel_action cd test/plugin_functional/plugins/kbn_tp_sample_panel_action; - yarn run github-checks-reporter "build kbn_tp_sample_panel_action" yarn build; + yarn run github-checks-reporter "Build kbn_tp_sample_panel_action" yarn build; cd -; yarn run grunt run:pluginFunctionalTestsRelease --from=source; yarn run grunt run:interpreterFunctionalTestsRelease; diff --git a/test/scripts/jenkins_xpack.sh b/test/scripts/jenkins_xpack.sh index d1f4760bec4ff1..3f63aca44115c8 100755 --- a/test/scripts/jenkins_xpack.sh +++ b/test/scripts/jenkins_xpack.sh @@ -17,13 +17,13 @@ export TEST_BROWSER_HEADLESS=1 echo " -> Running mocha tests" cd "$XPACK_DIR" -yarn run github-checks-reporter "xpack:mocha" yarn test +yarn run github-checks-reporter "X-Pack Mocha" yarn test echo "" echo "" echo " -> Running jest tests" cd "$XPACK_DIR" -yarn run github-checks-reporter "xpack:jest" node scripts/jest --ci --no-cache --verbose +yarn run github-checks-reporter "X-Pack Jest" node scripts/jest --ci --no-cache --verbose echo "" echo "" diff --git a/test/scripts/jenkins_xpack_ci_group.sh b/test/scripts/jenkins_xpack_ci_group.sh index fd1550b4f7e99c..60555b1841964d 100755 --- a/test/scripts/jenkins_xpack_ci_group.sh +++ b/test/scripts/jenkins_xpack_ci_group.sh @@ -36,6 +36,6 @@ tar -xzf "$linuxBuild" -C "$installDir" --strip=1 echo " -> Running functional and api tests" cd "$XPACK_DIR" -yarn run github-checks-reporter "xpack: Functional tests - group ${CI_GROUP}" node scripts/functional_tests --debug --bail --kibana-install-dir "$installDir" --include-tag "ciGroup$CI_GROUP" +yarn run github-checks-reporter "X-Pack functional tests / Group ${CI_GROUP}" node scripts/functional_tests --debug --bail --kibana-install-dir "$installDir" --include-tag "ciGroup$CI_GROUP" echo "" echo "" From fd1c3b657a20465791c8c05a519373c03d433983 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 17 Apr 2019 17:47:28 -0500 Subject: [PATCH 39/59] add license test --- tasks/config/run.js | 14 ++++++++++++-- test/scripts/jenkins_xpack_ci_group.sh | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/tasks/config/run.js b/tasks/config/run.js index 3afe4b6dcd5720..35f1995b1e6957 100644 --- a/tasks/config/run.js +++ b/tasks/config/run.js @@ -214,7 +214,7 @@ module.exports = function (grunt) { }), serverIntegrationTests: scriptWithGithubChecks({ - title: 'Server Integration Tests', + title: 'Server integration tests', cmd: NODE, args: [ 'scripts/functional_tests', @@ -227,7 +227,7 @@ module.exports = function (grunt) { }), interpreterFunctionalTestsRelease: scriptWithGithubChecks({ - title: 'Interpreter Functional Tests', + title: 'Interpreter functional tests', cmd: NODE, args: [ 'scripts/functional_tests', @@ -261,6 +261,16 @@ module.exports = function (grunt) { ], }), + licenses: scriptWithGithubChecks({ + title: 'Licenses', + cmd: 'yarn', + args: [ + 'run', + 'grunt', + 'licenses' + ] + }), + ...getFunctionalTestGroupRunConfigs({ kibanaInstallDir: KIBANA_INSTALL_DIR }) diff --git a/test/scripts/jenkins_xpack_ci_group.sh b/test/scripts/jenkins_xpack_ci_group.sh index 60555b1841964d..ffe6ec2e84dd03 100755 --- a/test/scripts/jenkins_xpack_ci_group.sh +++ b/test/scripts/jenkins_xpack_ci_group.sh @@ -36,6 +36,6 @@ tar -xzf "$linuxBuild" -C "$installDir" --strip=1 echo " -> Running functional and api tests" cd "$XPACK_DIR" -yarn run github-checks-reporter "X-Pack functional tests / Group ${CI_GROUP}" node scripts/functional_tests --debug --bail --kibana-install-dir "$installDir" --include-tag "ciGroup$CI_GROUP" +yarn run github-checks-reporter "X-Pack Functional tests / Group ${CI_GROUP}" node scripts/functional_tests --debug --bail --kibana-install-dir "$installDir" --include-tag "ciGroup$CI_GROUP" echo "" echo "" From 5132ba04d0a93a3bb2b128fbb0a0ba5352eca929 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 17 Apr 2019 20:33:23 -0500 Subject: [PATCH 40/59] forgot to prefix run to the target --- tasks/jenkins.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/jenkins.js b/tasks/jenkins.js index 61fbbad24392d2..9c133466160359 100644 --- a/tasks/jenkins.js +++ b/tasks/jenkins.js @@ -30,7 +30,7 @@ module.exports = function (grunt) { 'run:typeCheck', 'run:i18nCheck', 'run:checkFileCasing', - 'licenses', + 'run:licenses', 'verifyDependencyVersions', 'run:verifyNotice', 'test:server', From c40be8c55964d27eff3156e707c96dc6a4719318 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 17 Apr 2019 21:22:16 -0500 Subject: [PATCH 41/59] apply github-checks-reporter to a couple more items --- tasks/config/run.js | 60 +++++++++++++++++++++++++++++++++++++++++++++ tasks/jenkins.js | 12 ++++----- 2 files changed, 66 insertions(+), 6 deletions(-) diff --git a/tasks/config/run.js b/tasks/config/run.js index 35f1995b1e6957..6e2959cec66403 100644 --- a/tasks/config/run.js +++ b/tasks/config/run.js @@ -271,6 +271,66 @@ module.exports = function (grunt) { ] }), + verifyDependencyVersions: scriptWithGithubChecks({ + title: 'Verify dependency versions', + cmd: 'yarn', + args: [ + 'run', + 'grunt', + 'verifyDependencyVersions' + ] + }), + + test_server: scriptWithGithubChecks({ + title: 'Test server', + cmd: 'yarn', + args: [ + 'run', + 'grunt', + 'test:server' + ] + }), + + test_jest: scriptWithGithubChecks({ + title: 'Jest tests', + cmd: 'yarn', + args: [ + 'run', + 'grunt', + 'test:jest' + ] + }), + + test_jest_integration: scriptWithGithubChecks({ + title: 'Jest integration tests', + cmd: 'yarn', + args: [ + 'run', + 'grunt', + 'test:jest_integration' + ] + }), + + test_projects: scriptWithGithubChecks({ + title: 'Project tests', + cmd: 'yarn', + args: [ + 'run', + 'grunt', + 'test:projects' + ] + }), + + test_browser_ci: scriptWithGithubChecks({ + title: 'Browser tests', + cmd: 'yarn', + args: [ + 'run', + 'grunt', + 'test:browser-ci' + ] + }), + ...getFunctionalTestGroupRunConfigs({ kibanaInstallDir: KIBANA_INSTALL_DIR }) diff --git a/tasks/jenkins.js b/tasks/jenkins.js index 9c133466160359..6b7a70c4644f4b 100644 --- a/tasks/jenkins.js +++ b/tasks/jenkins.js @@ -31,13 +31,13 @@ module.exports = function (grunt) { 'run:i18nCheck', 'run:checkFileCasing', 'run:licenses', - 'verifyDependencyVersions', + 'run:verifyDependencyVersions', 'run:verifyNotice', - 'test:server', - 'test:jest', - 'test:jest_integration', - 'test:projects', - 'test:browser-ci', + 'run:test_server', + 'run:test_jest', + 'run:test_jest_integration', + 'run:test_projects', + 'run:test_browser-ci', 'run:apiIntegrationTests', ]); }; From 5b6cbc23f9011bd7f32dbe2a799cb1594d3b1ab5 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Wed, 17 Apr 2019 23:02:10 -0500 Subject: [PATCH 42/59] fix browser ci --- tasks/config/run.js | 2 +- tasks/jenkins.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/config/run.js b/tasks/config/run.js index 6e2959cec66403..12eab1d766264f 100644 --- a/tasks/config/run.js +++ b/tasks/config/run.js @@ -282,7 +282,7 @@ module.exports = function (grunt) { }), test_server: scriptWithGithubChecks({ - title: 'Test server', + title: 'Server tests', cmd: 'yarn', args: [ 'run', diff --git a/tasks/jenkins.js b/tasks/jenkins.js index 6b7a70c4644f4b..91638553f09e50 100644 --- a/tasks/jenkins.js +++ b/tasks/jenkins.js @@ -37,7 +37,7 @@ module.exports = function (grunt) { 'run:test_jest', 'run:test_jest_integration', 'run:test_projects', - 'run:test_browser-ci', + 'run:test_browser_ci', 'run:apiIntegrationTests', ]); }; From 3a3e332fd10ebaf66824f71942284adf21f84d54 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 18 Apr 2019 07:45:26 -0500 Subject: [PATCH 43/59] bump github-check-reporter - fix time to run calculations --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fb1910a92291d7..d6541aca2b8c4f 100644 --- a/package.json +++ b/package.json @@ -255,7 +255,7 @@ "@babel/parser": "^7.3.4", "@babel/types": "^7.3.4", "@elastic/eslint-config-kibana": "0.15.0", - "@elastic/github-checks-reporter": "0.0.2", + "@elastic/github-checks-reporter": "0.0.3", "@elastic/makelogs": "^4.4.0", "@kbn/es": "1.0.0", "@kbn/eslint-import-resolver-kibana": "2.0.0", From 2a342cd7e69d5e6e8086df20e7bd0a23ddef62fd Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 18 Apr 2019 08:11:05 -0500 Subject: [PATCH 44/59] respect the yarn.lock file --- yarn.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index 7d909ea42a24e1..b8f0861fb2b46e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1372,10 +1372,10 @@ resolved "https://registry.yarnpkg.com/@elastic/filesaver/-/filesaver-1.1.2.tgz#1998ffb3cd89c9da4ec12a7793bfcae10e30c77a" integrity sha512-YZbSufYFBhAj+S2cJgiKALoxIJevqXN2MSr6Yqr42rJdaPuM31cj6pUDwflkql1oDjupqD9la+MfxPFjXI1JFQ== -"@elastic/github-checks-reporter@0.0.2": - version "0.0.2" - resolved "https://registry.yarnpkg.com/@elastic/github-checks-reporter/-/github-checks-reporter-0.0.2.tgz#2a6ae1cd6650c4ac077981114f660598224643f9" - integrity sha512-aoKFBAZnc/bcCYQHOaX0+9JpDM1gtKtSWlUzNZHjmCwPW6tknXWq89tCPaqeCBh7hvC6nq8uNUgiNCVxyG/bjA== +"@elastic/github-checks-reporter@0.0.3": + version "0.0.3" + resolved "https://registry.yarnpkg.com/@elastic/github-checks-reporter/-/github-checks-reporter-0.0.3.tgz#dce5140277f29d946cb46478d0ccc63732accd09" + integrity sha512-kuZvvREVJQcJIXrN6xMljRhScXna3sEC3tnARr/L2Q4tA92jirxAq8hJbXTZm6L6OWOiNVhqx1u2yOTcLvJABw== dependencies: "@octokit/app" "^2.2.2" "@octokit/request" "^2.4.2" From c1553fa76b39d93c3f1236024feb23a0261375da Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 18 Apr 2019 08:57:49 -0500 Subject: [PATCH 45/59] log start and completion time stamps, better summary and text field usage --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index d6541aca2b8c4f..8b28208b00733e 100644 --- a/package.json +++ b/package.json @@ -255,7 +255,7 @@ "@babel/parser": "^7.3.4", "@babel/types": "^7.3.4", "@elastic/eslint-config-kibana": "0.15.0", - "@elastic/github-checks-reporter": "0.0.3", + "@elastic/github-checks-reporter": "0.0.4", "@elastic/makelogs": "^4.4.0", "@kbn/es": "1.0.0", "@kbn/eslint-import-resolver-kibana": "2.0.0", diff --git a/yarn.lock b/yarn.lock index b8f0861fb2b46e..8355fdcf0e21e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1372,10 +1372,10 @@ resolved "https://registry.yarnpkg.com/@elastic/filesaver/-/filesaver-1.1.2.tgz#1998ffb3cd89c9da4ec12a7793bfcae10e30c77a" integrity sha512-YZbSufYFBhAj+S2cJgiKALoxIJevqXN2MSr6Yqr42rJdaPuM31cj6pUDwflkql1oDjupqD9la+MfxPFjXI1JFQ== -"@elastic/github-checks-reporter@0.0.3": - version "0.0.3" - resolved "https://registry.yarnpkg.com/@elastic/github-checks-reporter/-/github-checks-reporter-0.0.3.tgz#dce5140277f29d946cb46478d0ccc63732accd09" - integrity sha512-kuZvvREVJQcJIXrN6xMljRhScXna3sEC3tnARr/L2Q4tA92jirxAq8hJbXTZm6L6OWOiNVhqx1u2yOTcLvJABw== +"@elastic/github-checks-reporter@0.0.4": + version "0.0.4" + resolved "https://registry.yarnpkg.com/@elastic/github-checks-reporter/-/github-checks-reporter-0.0.4.tgz#58a6b5eff613c26e32b5bbe246a6f429694fca40" + integrity sha512-B5kZxYSOMzz5r9WFbuYL6NnONs+RA61cJYZuqbIzzO7LDv83uYyF49wOfy+Ge5p6zmgL5j7XvR/xsJcrj6ByEQ== dependencies: "@octokit/app" "^2.2.2" "@octokit/request" "^2.4.2" From eeb80bbb5b7fd2f547bc7d7bcf5a8ca350ef70c2 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 18 Apr 2019 10:10:55 -0500 Subject: [PATCH 46/59] more debugging info --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8b28208b00733e..0791342a00e5f7 100644 --- a/package.json +++ b/package.json @@ -255,7 +255,7 @@ "@babel/parser": "^7.3.4", "@babel/types": "^7.3.4", "@elastic/eslint-config-kibana": "0.15.0", - "@elastic/github-checks-reporter": "0.0.4", + "@elastic/github-checks-reporter": "0.0.5", "@elastic/makelogs": "^4.4.0", "@kbn/es": "1.0.0", "@kbn/eslint-import-resolver-kibana": "2.0.0", From 8eb2247c511458ffac6c9ffe931f5332ceac0d42 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 18 Apr 2019 10:21:28 -0500 Subject: [PATCH 47/59] respect the yarn.lock --- yarn.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8355fdcf0e21e1..b31c17aaada1c9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1372,10 +1372,10 @@ resolved "https://registry.yarnpkg.com/@elastic/filesaver/-/filesaver-1.1.2.tgz#1998ffb3cd89c9da4ec12a7793bfcae10e30c77a" integrity sha512-YZbSufYFBhAj+S2cJgiKALoxIJevqXN2MSr6Yqr42rJdaPuM31cj6pUDwflkql1oDjupqD9la+MfxPFjXI1JFQ== -"@elastic/github-checks-reporter@0.0.4": - version "0.0.4" - resolved "https://registry.yarnpkg.com/@elastic/github-checks-reporter/-/github-checks-reporter-0.0.4.tgz#58a6b5eff613c26e32b5bbe246a6f429694fca40" - integrity sha512-B5kZxYSOMzz5r9WFbuYL6NnONs+RA61cJYZuqbIzzO7LDv83uYyF49wOfy+Ge5p6zmgL5j7XvR/xsJcrj6ByEQ== +"@elastic/github-checks-reporter@0.0.5": + version "0.0.5" + resolved "https://registry.yarnpkg.com/@elastic/github-checks-reporter/-/github-checks-reporter-0.0.5.tgz#56054575ee9a60bfbdda29c1147bdc2009165141" + integrity sha512-BVgYIFifvqkOT6Jsu6TFAe/Sr2RjLzclCGp5dPwhuehUW5CycmysvS72VGC5wVAF2JcVfiZe5ACyps5K3i9xvA== dependencies: "@octokit/app" "^2.2.2" "@octokit/request" "^2.4.2" From 53eddbe298d40c2834fb589e62bb469140928e9f Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 18 Apr 2019 10:49:52 -0500 Subject: [PATCH 48/59] bump gcr version, update checks instead of recreating --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 0791342a00e5f7..9191a8b42cbc71 100644 --- a/package.json +++ b/package.json @@ -255,7 +255,7 @@ "@babel/parser": "^7.3.4", "@babel/types": "^7.3.4", "@elastic/eslint-config-kibana": "0.15.0", - "@elastic/github-checks-reporter": "0.0.5", + "@elastic/github-checks-reporter": "0.0.6", "@elastic/makelogs": "^4.4.0", "@kbn/es": "1.0.0", "@kbn/eslint-import-resolver-kibana": "2.0.0", diff --git a/yarn.lock b/yarn.lock index b31c17aaada1c9..c8a1e7d9e217b7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1372,10 +1372,10 @@ resolved "https://registry.yarnpkg.com/@elastic/filesaver/-/filesaver-1.1.2.tgz#1998ffb3cd89c9da4ec12a7793bfcae10e30c77a" integrity sha512-YZbSufYFBhAj+S2cJgiKALoxIJevqXN2MSr6Yqr42rJdaPuM31cj6pUDwflkql1oDjupqD9la+MfxPFjXI1JFQ== -"@elastic/github-checks-reporter@0.0.5": - version "0.0.5" - resolved "https://registry.yarnpkg.com/@elastic/github-checks-reporter/-/github-checks-reporter-0.0.5.tgz#56054575ee9a60bfbdda29c1147bdc2009165141" - integrity sha512-BVgYIFifvqkOT6Jsu6TFAe/Sr2RjLzclCGp5dPwhuehUW5CycmysvS72VGC5wVAF2JcVfiZe5ACyps5K3i9xvA== +"@elastic/github-checks-reporter@0.0.6": + version "0.0.6" + resolved "https://registry.yarnpkg.com/@elastic/github-checks-reporter/-/github-checks-reporter-0.0.6.tgz#7ca80487ee1562399095b25f9feb37c166071098" + integrity sha512-sQGWq/1SofKy4XSep+LF772JLCZsg7wbaDwge4H6Ofbo0vqHBuGXnqXrwRZCVYNWlZh7yh7iqJiDf/tvlbyMug== dependencies: "@octokit/app" "^2.2.2" "@octokit/request" "^2.4.2" From a70415a1a6e25596c8bc263d0e5f641c48326a53 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 18 Apr 2019 11:37:09 -0500 Subject: [PATCH 49/59] bump gcr to fix check update --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 9191a8b42cbc71..c7bdc164ea5ded 100644 --- a/package.json +++ b/package.json @@ -255,7 +255,7 @@ "@babel/parser": "^7.3.4", "@babel/types": "^7.3.4", "@elastic/eslint-config-kibana": "0.15.0", - "@elastic/github-checks-reporter": "0.0.6", + "@elastic/github-checks-reporter": "0.0.7", "@elastic/makelogs": "^4.4.0", "@kbn/es": "1.0.0", "@kbn/eslint-import-resolver-kibana": "2.0.0", diff --git a/yarn.lock b/yarn.lock index c8a1e7d9e217b7..1d72c9f84909fc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1372,10 +1372,10 @@ resolved "https://registry.yarnpkg.com/@elastic/filesaver/-/filesaver-1.1.2.tgz#1998ffb3cd89c9da4ec12a7793bfcae10e30c77a" integrity sha512-YZbSufYFBhAj+S2cJgiKALoxIJevqXN2MSr6Yqr42rJdaPuM31cj6pUDwflkql1oDjupqD9la+MfxPFjXI1JFQ== -"@elastic/github-checks-reporter@0.0.6": - version "0.0.6" - resolved "https://registry.yarnpkg.com/@elastic/github-checks-reporter/-/github-checks-reporter-0.0.6.tgz#7ca80487ee1562399095b25f9feb37c166071098" - integrity sha512-sQGWq/1SofKy4XSep+LF772JLCZsg7wbaDwge4H6Ofbo0vqHBuGXnqXrwRZCVYNWlZh7yh7iqJiDf/tvlbyMug== +"@elastic/github-checks-reporter@0.0.7": + version "0.0.7" + resolved "https://registry.yarnpkg.com/@elastic/github-checks-reporter/-/github-checks-reporter-0.0.7.tgz#c692054d8a2cc636431622300428104377868f09" + integrity sha512-Guana2ks1tDgKecqear1xF/XvAJuoDkwHVMwRdMHmvoczgLi7eAN7zH4fAiLnlz501dkfgXMjGuThKH3h8DyGw== dependencies: "@octokit/app" "^2.2.2" "@octokit/request" "^2.4.2" From 5e9345774444dad7dab1b3334a55c9002f660bee Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 18 Apr 2019 12:12:22 -0500 Subject: [PATCH 50/59] run task cleanup --- tasks/config/run.js | 86 +++++++++------------------------------------ 1 file changed, 17 insertions(+), 69 deletions(-) diff --git a/tasks/config/run.js b/tasks/config/run.js index 12eab1d766264f..ea10c53154176b 100644 --- a/tasks/config/run.js +++ b/tasks/config/run.js @@ -68,6 +68,12 @@ module.exports = function (grunt) { cmd: 'yarn', args: ['run', 'github-checks-reporter', title, cmd, ...args], }); + const gruntTaskWithGithubChecks = (title, task) => + scriptWithGithubChecks({ + title, + cmd: 'yarn', + args: ['run', 'grunt', task] + }); return { // used by the test and jenkins:unit tasks @@ -261,75 +267,17 @@ module.exports = function (grunt) { ], }), - licenses: scriptWithGithubChecks({ - title: 'Licenses', - cmd: 'yarn', - args: [ - 'run', - 'grunt', - 'licenses' - ] - }), - - verifyDependencyVersions: scriptWithGithubChecks({ - title: 'Verify dependency versions', - cmd: 'yarn', - args: [ - 'run', - 'grunt', - 'verifyDependencyVersions' - ] - }), - - test_server: scriptWithGithubChecks({ - title: 'Server tests', - cmd: 'yarn', - args: [ - 'run', - 'grunt', - 'test:server' - ] - }), - - test_jest: scriptWithGithubChecks({ - title: 'Jest tests', - cmd: 'yarn', - args: [ - 'run', - 'grunt', - 'test:jest' - ] - }), - - test_jest_integration: scriptWithGithubChecks({ - title: 'Jest integration tests', - cmd: 'yarn', - args: [ - 'run', - 'grunt', - 'test:jest_integration' - ] - }), - - test_projects: scriptWithGithubChecks({ - title: 'Project tests', - cmd: 'yarn', - args: [ - 'run', - 'grunt', - 'test:projects' - ] - }), - - test_browser_ci: scriptWithGithubChecks({ - title: 'Browser tests', - cmd: 'yarn', - args: [ - 'run', - 'grunt', - 'test:browser-ci' - ] - }), + licenses: gruntTaskWithGithubChecks('Licenses', 'licenses'), + verifyDependencyVersions: + gruntTaskWithGithubChecks('Verify dependency versions', 'verifyDependencyVersions'), + test_server: + gruntTaskWithGithubChecks('Server tests', 'test:server'), + test_jest: gruntTaskWithGithubChecks('Jest tests', 'test:jest'), + test_jest_integration: + gruntTaskWithGithubChecks('Jest integration tests', 'test:jest_integration'), + test_projects: gruntTaskWithGithubChecks('Project tests', 'test:projects'), + test_browser_ci: + gruntTaskWithGithubChecks('Browser tests', 'test:browser-ci'), ...getFunctionalTestGroupRunConfigs({ kibanaInstallDir: KIBANA_INSTALL_DIR From 2f499baf2af35582f895cb3cfd208daf9ea8baf9 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 18 Apr 2019 17:11:01 -0500 Subject: [PATCH 51/59] add killswitch --- src/dev/ci_setup/setup.sh | 18 ++++++++++++++++++ tasks/config/run.js | 4 ++-- test/scripts/jenkins_ci_group.sh | 4 ++-- test/scripts/jenkins_xpack.sh | 4 ++-- test/scripts/jenkins_xpack_ci_group.sh | 2 +- 5 files changed, 25 insertions(+), 7 deletions(-) diff --git a/src/dev/ci_setup/setup.sh b/src/dev/ci_setup/setup.sh index a4b2d6d1e4389c..3746cafd9cd95a 100755 --- a/src/dev/ci_setup/setup.sh +++ b/src/dev/ci_setup/setup.sh @@ -180,3 +180,21 @@ if [ "$GIT_CHANGES" ]; then echo -e "$GIT_CHANGES\n" exit 1 fi + +### +### github-checks-reporter kill switch. Remove to disable +### +export CHECKS_REPORTER_ACTIVE=true + +### +### Implements github-checks-reporter kill switch when scripts are called from the command line +### $* - all the arguments +### ${*[@]:2} - all the arguments, minus the first one +### +function checks-reporter-with-killswitch() { + if [ "$CHECKS_REPORTER_ACTIVE" = true ] ; then + yarn run github-checks-reporter $* + else + ${*[@]:2} + fi +} diff --git a/tasks/config/run.js b/tasks/config/run.js index ea10c53154176b..494ceb0c718b63 100644 --- a/tasks/config/run.js +++ b/tasks/config/run.js @@ -63,11 +63,11 @@ module.exports = function (grunt) { ]; const NODE = 'node'; - const scriptWithGithubChecks = ({ title, options, cmd, args }) => ({ + const scriptWithGithubChecks = ({ title, options, cmd, args }) => (process.env.CHECKS_REPORTER_ACTIVE ? { options, cmd: 'yarn', args: ['run', 'github-checks-reporter', title, cmd, ...args], - }); + } : { options, cmd, args }); const gruntTaskWithGithubChecks = (title, task) => scriptWithGithubChecks({ title, diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh index bf7a1974c48928..521719be6a1a4a 100755 --- a/test/scripts/jenkins_ci_group.sh +++ b/test/scripts/jenkins_ci_group.sh @@ -19,12 +19,12 @@ node scripts/build --debug --oss; export TEST_BROWSER_HEADLESS=1 -yarn run github-checks-reporter "Functional tests / Group ${CI_GROUP}" yarn run grunt "run:functionalTests_ciGroup${CI_GROUP}"; +checks-reporter-with-killswitch "Functional tests / Group ${CI_GROUP}" yarn run grunt "run:functionalTests_ciGroup${CI_GROUP}"; if [ "$CI_GROUP" == "1" ]; then # build kbn_tp_sample_panel_action cd test/plugin_functional/plugins/kbn_tp_sample_panel_action; - yarn run github-checks-reporter "Build kbn_tp_sample_panel_action" yarn build; + checks-reporter-with-killswitch "Build kbn_tp_sample_panel_action" yarn build; cd -; yarn run grunt run:pluginFunctionalTestsRelease --from=source; yarn run grunt run:interpreterFunctionalTestsRelease; diff --git a/test/scripts/jenkins_xpack.sh b/test/scripts/jenkins_xpack.sh index 3f63aca44115c8..f7507bd8bac2a3 100755 --- a/test/scripts/jenkins_xpack.sh +++ b/test/scripts/jenkins_xpack.sh @@ -17,13 +17,13 @@ export TEST_BROWSER_HEADLESS=1 echo " -> Running mocha tests" cd "$XPACK_DIR" -yarn run github-checks-reporter "X-Pack Mocha" yarn test +checks-reporter-with-killswitch "X-Pack Mocha" yarn test echo "" echo "" echo " -> Running jest tests" cd "$XPACK_DIR" -yarn run github-checks-reporter "X-Pack Jest" node scripts/jest --ci --no-cache --verbose +checks-reporter-with-killswitch "X-Pack Jest" node scripts/jest --ci --no-cache --verbose echo "" echo "" diff --git a/test/scripts/jenkins_xpack_ci_group.sh b/test/scripts/jenkins_xpack_ci_group.sh index ffe6ec2e84dd03..72ef033df37129 100755 --- a/test/scripts/jenkins_xpack_ci_group.sh +++ b/test/scripts/jenkins_xpack_ci_group.sh @@ -36,6 +36,6 @@ tar -xzf "$linuxBuild" -C "$installDir" --strip=1 echo " -> Running functional and api tests" cd "$XPACK_DIR" -yarn run github-checks-reporter "X-Pack Functional tests / Group ${CI_GROUP}" node scripts/functional_tests --debug --bail --kibana-install-dir "$installDir" --include-tag "ciGroup$CI_GROUP" +checks-reporter-with-killswitch "X-Pack Functional tests / Group ${CI_GROUP}" node scripts/functional_tests --debug --bail --kibana-install-dir "$installDir" --include-tag "ciGroup$CI_GROUP" echo "" echo "" From 2468edffac85a887f65a4e67c59734a480cbf46c Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 18 Apr 2019 17:28:56 -0500 Subject: [PATCH 52/59] move checks-reporter-with-killswitch to its own file --- src/dev/ci_setup/functions.sh | 12 ++++++++++++ src/dev/ci_setup/setup.sh | 13 +------------ 2 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 src/dev/ci_setup/functions.sh diff --git a/src/dev/ci_setup/functions.sh b/src/dev/ci_setup/functions.sh new file mode 100644 index 00000000000000..bd8b7e29cd1cb0 --- /dev/null +++ b/src/dev/ci_setup/functions.sh @@ -0,0 +1,12 @@ +### +### Implements github-checks-reporter kill switch when scripts are called from the command line +### $* - all the arguments +### ${*[@]:2} - all the arguments, minus the first one +### +function checks-reporter-with-killswitch() { + if [ "$CHECKS_REPORTER_ACTIVE" = true ] ; then + yarn run github-checks-reporter "$@" + else + "${@[@]:2}" + fi +} diff --git a/src/dev/ci_setup/setup.sh b/src/dev/ci_setup/setup.sh index 3746cafd9cd95a..faee1c45db44db 100755 --- a/src/dev/ci_setup/setup.sh +++ b/src/dev/ci_setup/setup.sh @@ -186,15 +186,4 @@ fi ### export CHECKS_REPORTER_ACTIVE=true -### -### Implements github-checks-reporter kill switch when scripts are called from the command line -### $* - all the arguments -### ${*[@]:2} - all the arguments, minus the first one -### -function checks-reporter-with-killswitch() { - if [ "$CHECKS_REPORTER_ACTIVE" = true ] ; then - yarn run github-checks-reporter $* - else - ${*[@]:2} - fi -} +source functions.sh From 4518f66736d84bd94b11e35710bd8c217a97e269 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 18 Apr 2019 17:31:42 -0500 Subject: [PATCH 53/59] add shebang to functions --- src/dev/ci_setup/functions.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/dev/ci_setup/functions.sh b/src/dev/ci_setup/functions.sh index bd8b7e29cd1cb0..5f140ca7f11ce1 100644 --- a/src/dev/ci_setup/functions.sh +++ b/src/dev/ci_setup/functions.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + ### ### Implements github-checks-reporter kill switch when scripts are called from the command line ### $* - all the arguments From 7afca50a4914b69e3f65b35f5c8c3aecc3ddcba8 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 18 Apr 2019 17:54:26 -0500 Subject: [PATCH 54/59] another attempt at sourcing from same dir --- src/dev/ci_setup/setup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dev/ci_setup/setup.sh b/src/dev/ci_setup/setup.sh index faee1c45db44db..9bfd7371f2242c 100755 --- a/src/dev/ci_setup/setup.sh +++ b/src/dev/ci_setup/setup.sh @@ -186,4 +186,5 @@ fi ### export CHECKS_REPORTER_ACTIVE=true -source functions.sh +script_dir="$(dirname "$0")" +source "$script_dir/functions.sh" From 5754c3932d50074c19d5a31bbbb771df540c2b1e Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 18 Apr 2019 18:34:08 -0500 Subject: [PATCH 55/59] another attempt at sourcing from same dir --- src/dev/ci_setup/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dev/ci_setup/setup.sh b/src/dev/ci_setup/setup.sh index 9bfd7371f2242c..098bd8df4e84ca 100755 --- a/src/dev/ci_setup/setup.sh +++ b/src/dev/ci_setup/setup.sh @@ -187,4 +187,4 @@ fi export CHECKS_REPORTER_ACTIVE=true script_dir="$(dirname "$0")" -source "$script_dir/functions.sh" +source "functions.sh" From b6fc0224d2ebe66d7a784476924c42e2e9f980fd Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 18 Apr 2019 18:52:01 -0500 Subject: [PATCH 56/59] another attempt at sourcing from same dir --- src/dev/ci_setup/setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dev/ci_setup/setup.sh b/src/dev/ci_setup/setup.sh index 098bd8df4e84ca..c1f28fb7b42f71 100755 --- a/src/dev/ci_setup/setup.sh +++ b/src/dev/ci_setup/setup.sh @@ -186,5 +186,5 @@ fi ### export CHECKS_REPORTER_ACTIVE=true -script_dir="$(dirname "$0")" -source "functions.sh" +script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +source "$script_dir/functions.sh" From 3bd63d1270fe0c1e29ac3ae66f24ad4bd6af6d1a Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 18 Apr 2019 20:25:35 -0500 Subject: [PATCH 57/59] another attempt at sourcing from same dir --- src/dev/ci_setup/setup.sh | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/dev/ci_setup/setup.sh b/src/dev/ci_setup/setup.sh index c1f28fb7b42f71..20154187e40a76 100755 --- a/src/dev/ci_setup/setup.sh +++ b/src/dev/ci_setup/setup.sh @@ -186,5 +186,20 @@ fi ### export CHECKS_REPORTER_ACTIVE=true -script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -source "$script_dir/functions.sh" +# script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +# source "$script_dir/functions.sh" + +### +### Implements github-checks-reporter kill switch when scripts are called from the command line +### $* - all the arguments +### ${*[@]:2} - all the arguments, minus the first one +### +function checks-reporter-with-killswitch() { + if [ "$CHECKS_REPORTER_ACTIVE" = true ] ; then + yarn run github-checks-reporter "$@" + else + "${@[@]:2}" + fi +} + +export -f checks-reporter-with-killswitch From c1b9aa0a2ca5454b9ee6ead783d43c1e3088233d Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Thu, 18 Apr 2019 23:03:36 -0500 Subject: [PATCH 58/59] fix killswitch --- src/dev/ci_setup/functions.sh | 14 -------------- src/dev/ci_setup/setup.sh | 9 +++------ 2 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 src/dev/ci_setup/functions.sh diff --git a/src/dev/ci_setup/functions.sh b/src/dev/ci_setup/functions.sh deleted file mode 100644 index 5f140ca7f11ce1..00000000000000 --- a/src/dev/ci_setup/functions.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -### -### Implements github-checks-reporter kill switch when scripts are called from the command line -### $* - all the arguments -### ${*[@]:2} - all the arguments, minus the first one -### -function checks-reporter-with-killswitch() { - if [ "$CHECKS_REPORTER_ACTIVE" = true ] ; then - yarn run github-checks-reporter "$@" - else - "${@[@]:2}" - fi -} diff --git a/src/dev/ci_setup/setup.sh b/src/dev/ci_setup/setup.sh index 20154187e40a76..5076a9d8aba537 100755 --- a/src/dev/ci_setup/setup.sh +++ b/src/dev/ci_setup/setup.sh @@ -186,19 +186,16 @@ fi ### export CHECKS_REPORTER_ACTIVE=true -# script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -# source "$script_dir/functions.sh" - ### ### Implements github-checks-reporter kill switch when scripts are called from the command line -### $* - all the arguments -### ${*[@]:2} - all the arguments, minus the first one +### $@ - all arguments ### function checks-reporter-with-killswitch() { if [ "$CHECKS_REPORTER_ACTIVE" = true ] ; then yarn run github-checks-reporter "$@" else - "${@[@]:2}" + arguments=("$@"); + ${arguments[@]:1}; fi } From 1f3105b0cdaf66a80091392a12ec0ea529dbe5ec Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Fri, 19 Apr 2019 00:43:35 -0500 Subject: [PATCH 59/59] Double quote array expansions to avoid re-splitting elements --- src/dev/ci_setup/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dev/ci_setup/setup.sh b/src/dev/ci_setup/setup.sh index 5076a9d8aba537..167b681302a7e8 100755 --- a/src/dev/ci_setup/setup.sh +++ b/src/dev/ci_setup/setup.sh @@ -195,7 +195,7 @@ function checks-reporter-with-killswitch() { yarn run github-checks-reporter "$@" else arguments=("$@"); - ${arguments[@]:1}; + "${arguments[@]:1}"; fi }