From 6d05811510447ae1a14a2479b3b914212f072033 Mon Sep 17 00:00:00 2001 From: Jan Cajthaml Date: Tue, 4 Jan 2022 21:41:29 +0100 Subject: [PATCH] fixing jenkins tagged build bbtest --- .jenkins/commit.groovy | 3 ++- .jenkins/perf.groovy | 2 +- perf/utils.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.jenkins/commit.groovy b/.jenkins/commit.groovy index 3a4ca3e65..636a9210f 100644 --- a/.jenkins/commit.groovy +++ b/.jenkins/commit.groovy @@ -209,8 +209,9 @@ pipeline { returnStdout: true ).trim() options = """ - |-e IMAGE_VERSION=${env.VERSION} + |-e IMAGE_VERSION=amd64-${env.VERSION} |-e UNIT_VERSION=${env.VERSION} + |-e CI=true |--volumes-from=${cid} |-v /var/run/docker.sock:/var/run/docker.sock:rw |-v /var/lib/docker/containers:/var/lib/docker/containers:rw diff --git a/.jenkins/perf.groovy b/.jenkins/perf.groovy index ced95b61c..fc87d2bcf 100644 --- a/.jenkins/perf.groovy +++ b/.jenkins/perf.groovy @@ -75,7 +75,7 @@ pipeline { returnStdout: true ).trim() options = """ - |-e IMAGE_VERSION=${params.VERSION} + |-e IMAGE_VERSION=amd64-${params.VERSION} |-e UNIT_VERSION=${params.VERSION} |-e MESSAGES_PUSHED=${params.MESSAGES_RELAYED} |-e CI=true diff --git a/perf/utils.py b/perf/utils.py index d642cb038..d2f926c22 100644 --- a/perf/utils.py +++ b/perf/utils.py @@ -27,7 +27,7 @@ termios.tcsetattr(fd, termios.TCSANOW, new) -__TTY = sys.stdout.isatty() and str(os.environ.get('CI', 'false')) == 'true' +__TTY = str(os.environ.get('CI', 'false')) == 'true' if not __TTY: print()