fixing jenkins tagged build bbtest

jancajthaml-openbank · Jan 4, 2022 · 6d05811 · 6d05811
1 parent 45a50d6
commit 6d05811
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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()