[tvm] branch main updated: Couple patches to docker/bash.sh after #11976. (#11988)

[ar...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

areusch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tvm.git


The following commit(s) were added to refs/heads/main by this push:
     new eeb5fce7a1 Couple patches to docker/bash.sh after #11976. (#11988)
eeb5fce7a1 is described below

commit eeb5fce7a147bd7097b7089c600166ae1bfa7ef7
Author: Andrew Reusch <ar...@gmail.com>
AuthorDate: Fri Jul 1 14:41:44 2022 -0700

    Couple patches to docker/bash.sh after #11976. (#11988)
    
    * Use python3 to run determine_docker_images.py
     * Properly detect presence of CI env var with + expansion.
---
 docker/bash.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docker/bash.sh b/docker/bash.sh
index 56efa1d045..7d649bff1a 100755
--- a/docker/bash.sh
+++ b/docker/bash.sh
@@ -35,7 +35,6 @@
 
 set -euo pipefail
 
-
 function show_usage() {
     cat <<EOF
 Usage: docker/bash.sh [-i|--interactive] [--net=host] [-t|--tty]
@@ -290,10 +289,10 @@ DOCKER_DEVICES=( )
 # If the user gave a shortcut defined in the Jenkinsfile, use it.
 EXPANDED_SHORTCUT=$(lookup_image_spec "${DOCKER_IMAGE_NAME}")
 if [ -n "${EXPANDED_SHORTCUT}" ]; then
-    if [ "${CI+x}" == "true" ]; then
+    if [ "${CI+x}" == "x" ]; then
         DOCKER_IMAGE_NAME="${EXPANDED_SHORTCUT}"
     else
-        python tests/scripts/determine_docker_images.py "$DOCKER_IMAGE_NAME=$EXPANDED_SHORTCUT" 2> /dev/null
+        python3 tests/scripts/determine_docker_images.py "$DOCKER_IMAGE_NAME=$EXPANDED_SHORTCUT" 2> /dev/null
         DOCKER_IMAGE_NAME=$(cat ".docker-image-names/$DOCKER_IMAGE_NAME")
         if [[ "$DOCKER_IMAGE_NAME" == *"tlcpackstaging"* ]]; then
             echo "WARNING: resolved docker image to fallback tag in tlcpackstaging" >&2