fix extended version info (#1404)

* don't stick BUILD_NUM to VERSION
* fix branch name detection
* add extra tag for taurus-cloud

Jenkinsfile

@@ -19,7 +19,10 @@ pipeline {
                     IMAGE_TAG = env.JOB_NAME + "." + env.BUILD_NUMBER
                     IMAGE_TAG = IMAGE_TAG.toLowerCase()
                     imageName = "blazemeter/taurus"
-                    extraImageTag = isRelease ? "${imageName}:${tagName} -t ${imageName}:latest" : "${imageName}:unstable"
+                    date = sh(returnStdout: true, script: "echo \$(date '+%Y-%m-%d')").trim()
+                    commitSha = GIT_COMMIT.take(8)
+                    imageTag = "master-${commitSha}-${date}"
+                    extraImageTag = isRelease ? "${imageName}:${tagName} -t ${imageTag} -t ${imageName}:latest" : "${imageName}:unstable -t ${imageTag}"
                     sh "./build-info.sh ${isRelease}"
                 }
             }

build-info.sh

@@ -2,10 +2,7 @@
 
 echo "Getting build info"
 VERSION=$(git describe --tags $(git rev-list --tags --max-count=1))
-GIT_INFO="$(git rev-parse --abbrev-ref HEAD) $(git show --oneline -s)"
-if [ "$1" != "true" ]; then
-    VERSION="${VERSION}.${BUILD_NUMBER}"
-fi
-echo "BUILD_NUM=\"$BUILD_NUMBER\"" > bzt/resources/version/build.py
-echo "VERSION=\"$VERSION\"" > bzt/resources/version/version.py
-echo "GIT_INFO=\"$GIT_INFO\"" > bzt/resources/version/gitinfo.py
+GIT_INFO="$(git branch --show-current) $(git show --oneline -s)"
+echo "BUILD=\"${BUILD_NUMBER} $(date)\"" > bzt/resources/version/build.py
+echo "VERSION=\"${VERSION}\"" > bzt/resources/version/version.py
+echo "GIT_INFO=\"${GIT_INFO}\"" > bzt/resources/version/gitinfo.py

bzt/cli.py

@@ -37,7 +37,7 @@
 from bzt.engine import Engine, Configuration, SETTINGS, EXEC
 from bzt.linter import ConfigurationLinter
 from bzt.utils import get_stacktrace, is_int, BetterDict, is_url, RESOURCES_DIR
-from bzt.resources.version import VERSION, GIT_INFO, BUILD_NUM
+from bzt.resources.version import VERSION, GIT_INFO, BUILD
 
 
 class CLI(object):
@@ -56,7 +56,7 @@ def __init__(self, options):
         self.setup_logging(options)
         self.log = logging.getLogger('')
         self.log.info("Taurus CLI Tool v%s", VERSION)
-        self.log.debug("Build number: %s", BUILD_NUM)
+        self.log.debug("Build: %s", BUILD)
         self.log.debug("Extended git info: %s", GIT_INFO)
         self.log.debug("Command-line options: %s", self.options)
         self.log.debug("Python: %s %s", platform.python_implementation(), platform.python_version())

bzt/resources/version/__init__.py

@@ -9,6 +9,6 @@
     GIT_INFO = "DEV"
 
 try:
-    from .build import BUILD_NUM
+    from .build import BUILD
 except ImportError:
-    BUILD_NUM = "DEV"
+    BUILD = "DEV"

site/deploy-site.sh

@@ -3,33 +3,33 @@
 GOOGLE_STORAGE="https:\/\/storage.cloud.google.com\/taurus-site\/"
 UNSTABLE_SNAPSHOT=""
 TAURUS_VERSION=$(python3 -c 'from bzt.resources.version import VERSION; print(VERSION)')
+STABLE_EXE_NAME=TaurusInstaller_${TAURUS_VERSION}_x64.exe
 
 mkdir site/builds
 PREFIX="\/builds\/"
 
 if [ "$1" = "true" ]; then
     gsutil cp build/nsis/*.exe gs://taurus-site/releases/
 else
-    gsutil cp -s regional dist/*.whl gs://taurus-site/snapshots/
-    gsutil cp -s regional build/nsis/*.exe gs://taurus-site/snapshots/
+    SNAPSHOT_VERSION="${TAURUS_VERSION}.${BUILD_NUMBER}"
+    WHL_NAME="bzt-${SNAPSHOT_VERSION}-py2.py3-none-any.whl"
+    EXE_NAME="TaurusInstaller_${SNAPSHOT_VERSION}_x64.exe"
+    gsutil cp -s regional dist/*.whl gs://taurus-site/snapshots/${WHL_NAME}
+    gsutil cp -s regional build/nsis/*.exe gs://taurus-site/snapshots/${EXE_NAME}
 
     # copy unstable snapshots into site
-    cp dist/*.whl site/builds
-    cp build/nsis/*.exe site/builds
+    cp dist/*.whl site/builds/${WHL_NAME}
+    cp build/nsis/*.exe site/builds/${EXE_NAME}
 
     # prepare content for installation docs
     SNAPSHOT_HEADER="## Latest Unstable Snapshots"
-    WHL_SNAPSHOT="Python wheel package: [bzt-${TAURUS_VERSION}-py2.py3-none-any.whl](${PREFIX}bzt-${TAURUS_VERSION}-py2.py3-none-any.whl)"
-    EXE_SNAPSHOT="Windows installer: [TaurusInstaller_${TAURUS_VERSION}_x64.exe](${PREFIX}TaurusInstaller_${TAURUS_VERSION}_x64.exe)"
+    WHL_SNAPSHOT="Python wheel package: [${WHL_NAME}](${PREFIX}${WHL_NAME})"
+    EXE_SNAPSHOT="Windows installer: [${EXE_NAME}](${PREFIX}${EXE_NAME})"
     UNSTABLE_SNAPSHOT=${SNAPSHOT_HEADER}\\n\\n${WHL_SNAPSHOT}\\n\\n${EXE_SNAPSHOT}
-
-    # cut BUILD_NUMBER off
-    TAURUS_VERSION=${TAURUS_VERSION%.*}
 fi
 
-STABLE_EXE=TaurusInstaller_${TAURUS_VERSION}_x64.exe
-gsutil cp gs://taurus-site/releases/${STABLE_EXE} site/builds
-RELEASE_SNAPSHOT="${PREFIX}${STABLE_EXE}"
+gsutil cp gs://taurus-site/releases/${STABLE_EXE_NAME} site/builds
+RELEASE_SNAPSHOT="${PREFIX}${STABLE_EXE_NAME}"
 
 sed -ri "s/RELEASE_SNAPSHOT/${RELEASE_SNAPSHOT}/" site/dat/docs/Installation.md
 sed -ri "s/UNSTABLE_SNAPSHOT/${UNSTABLE_SNAPSHOT}/" site/dat/docs/Installation.md