[dev-utils/ci-stats] support disabling ship errors (elastic#90851)

Co-authored-by: spalger <spalger@users.noreply.github.com>
Zacqary · Feb 10, 2021 · 4bab952 · 4bab952
1 parent 82f0328
commit 4bab952
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/.ci/Jenkinsfile_security_cypress b/.ci/Jenkinsfile_security_cypress
@@ -10,7 +10,8 @@ kibanaPipeline(timeoutMinutes: 180) {
   ) {
     catchError {
       withEnv([
-        'CI_PARALLEL_PROCESS_NUMBER=1'
+        'CI_PARALLEL_PROCESS_NUMBER=1',
+        'IGNORE_SHIP_CI_STATS_ERROR=true',
       ]) {
         def job = 'xpack-securityCypress'
 

diff --git a/.ci/es-snapshots/Jenkinsfile_verify_es b/.ci/es-snapshots/Jenkinsfile_verify_es
@@ -26,7 +26,10 @@ kibanaPipeline(timeoutMinutes: 150) {
       message: "[${SNAPSHOT_VERSION}] ES Snapshot Verification Failure",
     ) {
       retryable.enable(2)
-      withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {
+      withEnv([
+        "ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}",
+        'IGNORE_SHIP_CI_STATS_ERROR=true',
+      ]) {
         parallel([
           'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
           'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [

diff --git a/packages/kbn-dev-utils/src/ci_stats_reporter/ship_ci_stats_cli.ts b/packages/kbn-dev-utils/src/ci_stats_reporter/ship_ci_stats_cli.ts
@@ -22,10 +22,18 @@ export function shipCiStatsCli() {
         throw createFlagError('expected --metrics to be a string');
       }
 
+      const maybeFail = (message: string) => {
+        const error = createFailError(message);
+        if (process.env.IGNORE_SHIP_CI_STATS_ERROR === 'true') {
+          error.exitCode = 0;
+        }
+        return error;
+      };
+
       const reporter = CiStatsReporter.fromEnv(log);
 
       if (!reporter.isEnabled()) {
-        throw createFailError('unable to initilize the CI Stats reporter');
+        throw maybeFail('unable to initilize the CI Stats reporter');
       }
 
       for (const path of metricPaths) {
@@ -35,7 +43,7 @@ export function shipCiStatsCli() {
         if (await reporter.metrics(JSON.parse(json))) {
           log.success('shipped metrics from', path);
         } else {
-          throw createFailError('failed to ship metrics');
+          throw maybeFail('failed to ship metrics');
         }
       }
     },