rename tags

CMakeModules/prepare_version_tag.cmake

+function(cleanup varname)
+    string (REPLACE "-" "_" out ${${varname}})
+    SET( ${varname} ${out} PARENT_SCOPE)
+endfunction()
+
 execute_process(COMMAND git describe --tags --abbrev=0
-                OUTPUT_VARIABLE VERSION
+                OUTPUT_VARIABLE ASAPO_TAG
                 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
-string(STRIP ${VERSION} VERSION)
+string(STRIP ${ASAPO_TAG} ASAPO_TAG)
 
 execute_process(COMMAND git rev-parse --abbrev-ref HEAD
                 OUTPUT_VARIABLE BRANCH
                 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
 string(STRIP ${BRANCH} BRANCH)
-
-if (${BRANCH} STREQUAL "master")
-    SET (ASAPO_VERSION ${BRANCH}.${VERSION})
-else()
-    SET (ASAPO_VERSION ${BRANCH}.latest)
-endif()
+cleanup(BRANCH)
 
 execute_process(COMMAND git rev-parse --short HEAD
-                OUTPUT_VARIABLE VERSION_COMMIT
-                WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
-string(STRIP ${VERSION_COMMIT} VERSION_COMMIT)
-
-function(cleanup varname)
-    string (REPLACE "-" "_" out ${${varname}})
-    SET( ${varname} ${out} PARENT_SCOPE)
-endfunction()
-
-cleanup(BRANCH)
+        OUTPUT_VARIABLE ASAPO_VERSION_COMMIT
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+string(STRIP ${ASAPO_VERSION_COMMIT} ASAPO_VERSION_COMMIT)
 
 if (${BRANCH} STREQUAL "master")
+    SET (ASAPO_VERSION ${ASAPO_TAG})
+    SET (ASAPO_VERSION_COMMIT "")
     SET (ASAPO_VERSION_DOCKER_SUFFIX "")
 else()
+    SET (ASAPO_VERSION ${BRANCH})
+    SET (ASAPO_VERSION_COMMIT ", build ${ASAPO_VERSION_COMMIT}")
     SET (ASAPO_VERSION_DOCKER_SUFFIX "-dev")
 endif()
 
-
-
-if (${BRANCH} STREQUAL "master")
-    SET (ASAPO_VERSION_PYTHON ${ASAPO_VERSION})
-else()
-    SET (ASAPO_VERSION_PYTHON ${ASAPO_VERSION}.${BRANCH}.latest)
-endif()
-
-
 message("Asapo Version: " ${ASAPO_VERSION})
-message("Asapo Version Python: " ${ASAPO_VERSION_PYTHON})
+message("Asapo commit: " ${ASAPO_VERSION_COMMIT})

common/cpp/include/common/version.h.in

@@ -6,7 +6,7 @@
 
 namespace asapo {
 
-const char kVersion[] = "@VERSION@";
+const char kVersion[] = "@ASAPO_VERSION@@ASAPO_VERSION_COMMIT@";
 
 inline void ExitAfterPrintVersionIfNeeded(std::string prefix,int argc, char* argv[]) {
     if (argc == 2 && strcmp(argv[1], "-v") == 0) {

common/go/src/asapo_common/version/version_lib.go.in

@@ -3,5 +3,5 @@ package version
 // Default build-time variable for library-import.
 // This file is overridden on build with build-time informations.
 func init(){
-	version   = "@VERSION@"
+	version   = "@ASAPO_VERSION@@ASAPO_VERSION_COMMIT@"
 }

consumer/api/python/asapo_consumer.pyx.in

@@ -290,4 +290,4 @@ def create_server_broker(server_name,source_path,has_filesystem,beamtime_id,stre
     return factory.create_server_broker(_bytes(server_name),_bytes(source_path),has_filesystem, _bytes(beamtime_id),_bytes(stream),_bytes(token),timeout_ms)
 
 
-__version__ = "@ASAPO_VERSION_PYTHON@"
+__version__ = "@ASAPO_VERSION@@ASAPO_VERSION_COMMIT@"

consumer/api/python/binary_dist_windows/setup.py.in

@@ -2,7 +2,7 @@ import setuptools
 
 setuptools.setup(
       name ="asapo_consumer",
-      version = "@ASAPO_VERSION_PYTHON@",
+      version = "@ASAPO_VERSION@",
       install_requires=['numpy'],
       include_package_data=True,
       packages=['asapo_consumer'],

consumer/api/python/source_dist_linux/setup.py.in

@@ -14,7 +14,7 @@ ext_modules = [
 setup(
       name ="asapo_consumer",
       ext_modules = ext_modules,
-      version = "@ASAPO_VERSION_PYTHON@",
+      version = "@ASAPO_VERSION@",
       setup_requires=["numpy"],
       install_requires=["numpy"]
       )

deploy/asapo_helm_chart/asapo/values.yaml

@@ -57,7 +57,8 @@ common:
   authSecret: "12ljzgneasfd"
   offlineDir: "/test_offline"
   onlineDir: "/test_online"
-  asapoVersionTag: "feature_ASAPO-108-kubernetes-deployment.latest"
+  asapoVersionTag: "develop"
+  asapoRepositoryTag: "-dev"
 
 influxdb:
   authEnabled: false

deploy/asapo_services/asap3.tfvars

 elk_logs = true
 
-asapo_image_tag = "feature_ASAPO-108-kubernetes-deployment.latest"
+asapo_image_tag = "develop"
 
 service_dir="/gpfs/asapo/shared/service_dir"
 online_dir="/beamline"

producer/api/python/asapo_producer.pyx.in

@@ -314,4 +314,4 @@ def create_producer(endpoint,beamtime_id,beamline,stream,token,nthreads,timeout_
     return PyProducer.__create_producer(_bytes(endpoint),_bytes(beamtime_id),_bytes(beamline),_bytes(stream),_bytes(token),nthreads,timeout_sec)
 
 
-__version__ = "@ASAPO_VERSION_PYTHON@"
+__version__ = "@ASAPO_VERSION@@ASAPO_VERSION_COMMIT@"

producer/api/python/binary_dist_windows/setup.py.in

@@ -2,7 +2,7 @@ import setuptools
 
 setuptools.setup(
       name ="asapo_producer",
-      version = "@ASAPO_VERSION_PYTHON@",
+      version = "@ASAPO_VERSION@",
       install_requires=['numpy'],
       include_package_data=True,
       packages=['asapo_producer'],

producer/api/python/source_dist_linux/setup.py.in

@@ -14,7 +14,7 @@ ext_modules = [
 setup(
       name ="asapo_producer",
       ext_modules = ext_modules,
-      version = "@ASAPO_VERSION_PYTHON@",
+      version = "@ASAPO_VERSION@",
       setup_requires=["numpy","cython>=0.28"],
       install_requires=["numpy","cython>=0.28"]
       )