Update assemble task - SNAPSHOT

Author: miriameid

.ci/make.sh

@@ -40,6 +40,7 @@ output_folder=".ci/output"
 codegen_folder=".ci/output"
 OUTPUT_DIR="$repo/${output_folder}"
 REPO_BINDING="${OUTPUT_DIR}:/sln/${output_folder}"
+WORKFLOW="${WORKFLOW-staging}"
 mkdir -p "$OUTPUT_DIR"
 
 echo -e "\033[34;1mINFO:\033[0m PRODUCT ${product}\033[0m"
@@ -58,7 +59,7 @@ case $CMD in
         exit 0
         ;;
     assemble)
-        if [ -v $VERSION ]; then
+        if [[ -v $VERSION ]]; then
             echo -e "\033[31;1mTARGET: assemble -> missing version parameter\033[0m"
             exit 1
         fi
@@ -67,7 +68,7 @@ case $CMD in
         TASK_ARGS=("$VERSION" "$output_folder")
         ;;
     codegen)
-        if [ -v $VERSION ]; then
+        if [[ -v $VERSION ]]; then
             echo -e "\033[31;1mTARGET: codegen -> missing version parameter\033[0m"
             exit 1
         fi
@@ -77,7 +78,7 @@ case $CMD in
         TASK_ARGS=("$VERSION" "$codegen_folder")
         ;;
     docsgen)
-        if [ -v $VERSION ]; then
+        if [[ -v $VERSION ]]; then
             echo -e "\033[31;1mTARGET: docsgen -> missing version parameter\033[0m"
             exit 1
         fi
@@ -93,7 +94,7 @@ case $CMD in
         TASK_ARGS=("$VERSION" "$codegen_folder")
         ;;
     bump)
-        if [ -v $VERSION ]; then
+        if [[ -v $VERSION ]]; then
             echo -e "\033[31;1mTARGET: bump -> missing version parameter\033[0m"
             exit 1
         fi
@@ -137,7 +138,11 @@ if [[ "$CMD" == "assemble" ]]; then
 	if compgen -G ".ci/output/*" > /dev/null; then
 
 	  # Tarball everything up in .ci/output
-    cd $repo/.ci/output && tar -czvf elasticsearch-py-$VERSION.tar.gz * && cd -
+	  if [[ "$WORKFLOW" == 'snapshot' ]]; then
+	    cd $repo/.ci/output && tar -czvf elasticsearch-py-$VERSION-SNAPSHOT.tar.gz * && cd -
+	  else
+	    cd $repo/.ci/output && tar -czvf elasticsearch-py-$VERSION.tar.gz * && cd -
+    fi
 
 		echo -e "\033[32;1mTARGET: successfully assembled client v$VERSION\033[0m"
 		exit 0

utils/build-dists.py

@@ -25,7 +25,6 @@
 import re
 import shlex
 import shutil
-import sys
 import tempfile
 
 base_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -167,48 +166,6 @@ def main():
     # If we're handed a version from the build manager we
     # should check that the version is correct or write
     # a new one.
-    if len(sys.argv) >= 2:
-        # 'build_version' is what the release manager wants,
-        # 'expect_version' is what we're expecting to compare
-        # the package version to before building the dists.
-        build_version = expect_version = sys.argv[1]
-
-        # Any prefixes in the version specifier mean we're making
-        # a pre-release which will modify __versionstr__ locally
-        # and not produce a git tag.
-        if any(x in build_version for x in ("-SNAPSHOT", "-rc", "-alpha", "-beta")):
-            # If a snapshot, then we add '+dev'
-            if "-SNAPSHOT" in build_version:
-                version = version + "+dev"
-            # alpha/beta/rc -> aN/bN/rcN
-            else:
-                pre_number = re.search(r"-(a|b|rc)(?:lpha|eta|)(\d+)$", expect_version)
-                version = version + pre_number.group(1) + pre_number.group(2)
-
-            expect_version = re.sub(
-                r"(?:-(?:SNAPSHOT|alpha\d+|beta\d+|rc\d+))+$", "", expect_version
-            )
-            if expect_version.endswith(".x"):
-                expect_version = expect_version[:-1]
-
-            # For snapshots we ensure that the version in the package
-            # at least *starts* with the version. This is to support
-            # build_version='7.x-SNAPSHOT'.
-            if not version.startswith(expect_version):
-                print(
-                    "Version of package (%s) didn't match the "
-                    "expected release version (%s)" % (version, build_version)
-                )
-                exit(1)
-
-        # A release that will be tagged, we want
-        # there to be no '+dev', etc.
-        elif expect_version != version:
-            print(
-                "Version of package (%s) didn't match the "
-                "expected release version (%s)" % (version, build_version)
-            )
-            exit(1)
 
     for suffix in ("", major_version):
         run("rm", "-rf", "build/", "*.egg-info", ".eggs")