diff --git a/.buildkite/scripts/steps/checks/renovate.sh b/.buildkite/scripts/steps/checks/renovate.sh index 17c87254511e1..924d32853cd00 100755 --- a/.buildkite/scripts/steps/checks/renovate.sh +++ b/.buildkite/scripts/steps/checks/renovate.sh @@ -4,5 +4,11 @@ set -euo pipefail +source .buildkite/scripts/common/util.sh + echo --- Check renovate.json -docker run -v "$(pwd)"/renovate.json:/home/app/renovate.json docker.elastic.co/ci-agent-images/pipelib:0.8.0@sha256:641d7fc6cfe473900a1fbe49876762916d804b09fdf2945f74e9f803f3073779 renovate-config-validator + +retry 3 3 docker run \ + -v "$(pwd)"/renovate.json:/home/app/renovate.json \ + docker.elastic.co/ci-agent-images/pipelib:0.8.0@sha256:641d7fc6cfe473900a1fbe49876762916d804b09fdf2945f74e9f803f3073779 \ + renovate-config-validator diff --git a/packages/kbn-ci-stats-reporter/src/ci_stats_reporter.ts b/packages/kbn-ci-stats-reporter/src/ci_stats_reporter.ts index c03fd7f54dea5..696f5a10f4819 100644 --- a/packages/kbn-ci-stats-reporter/src/ci_stats_reporter.ts +++ b/packages/kbn-ci-stats-reporter/src/ci_stats_reporter.ts @@ -170,7 +170,7 @@ export class CiStatsReporter { const { stdout } = await execa('git', ['config', 'user.email']); email = stdout; } catch (e) { - this.log.debug(e.message); + // no-op - we're ok with email being undefined } try { @@ -181,7 +181,7 @@ export class CiStatsReporter { } const memUsage = process.memoryUsage(); - const isElasticCommitter = email && email.endsWith('@elastic.co') ? true : false; + const isElasticCommitter = email && email.endsWith('@elastic.co'); const defaultMeta = { kibanaUuid, @@ -200,14 +200,16 @@ export class CiStatsReporter { memoryUsageHeapUsed: memUsage.heapUsed, memoryUsageExternal: memUsage.external, memoryUsageArrayBuffers: memUsage.arrayBuffers, - nestedTiming: process.env.CI_STATS_NESTED_TIMING ? true : false, + nestedTiming: !!process.env.CI_STATS_NESTED_TIMING, osArch: Os.arch(), osPlatform: Os.platform(), osRelease: Os.release(), totalMem: Os.totalmem(), }; - this.log.debug('CIStatsReporter committerHash: %s', defaultMeta.committerHash); + if (defaultMeta.committerHash) { + this.log.debug('CIStatsReporter committerHash: %s', defaultMeta.committerHash); + } return !!(await this.req({ auth: !!buildId, diff --git a/src/dev/run_quick_checks.ts b/src/dev/run_quick_checks.ts index 383a9e989520e..b856246d40e24 100644 --- a/src/dev/run_quick_checks.ts +++ b/src/dev/run_quick_checks.ts @@ -70,7 +70,7 @@ void run(async ({ log, flagsReader }) => { const failedChecks = results.filter((check) => !check.success); if (failedChecks.length > 0) { logger.write(`--- ${failedChecks.length} quick check(s) failed. ❌`); - logger.write(`See above for details.`); + logger.write(`See the script(s) marked with ❌ above for details.`); process.exitCode = 1; } else { logger.write('--- All checks passed. ✅');