typo

.gitlab-ci.yml

@@ -57,7 +57,7 @@ macosx_x86_64:
      - ./chaosframework/tools/chaos_git.sh -c $TEST_BRANCH
      - ./tools/dbinit.sh localhost localhost;sleep 5;./tools/dbinit.sh localhost localhost;sleep 5
      - cd chaosframework;export CHAOS_LIB_HASH=`git log -n 1 --pretty="%h"`;export CHAOS_LAST_TAG=`git describe --abbrev=0`;cd -;
-     - cd html/chaos_dashboard/;./tags.sh $CI_COMMIT_REF_NAME;cd -
+     - cd html/chaos_dashboard/;./tag.sh $CI_COMMIT_REF_NAME;cd -
      - cmake -DCHAOS_ARCHITECTURE_TEST=ON -DCHAOS_VME=OFF -DCHAOS_VERSION_MAJOR="$CI_COMMIT_REF_NAME.$CHAOS_LIB_HASH ($CHAOS_LAST_TAG)" -DCHAOS_VERSION_MINOR="$CI_JOB_STAGE.$CI_COMMIT_SHA" -DCHAOS_WAN=ON . -DCHAOS_BUILD_ID=${CI_PIPELINE_ID} -DCMAKE_INSTALL_PREFIX=$PWD/chaos-osx10-distrib
      - make -j 8 install
      - export CHAOS_LIVE_SERVERS=localhost;export CHAOS_DB_SERVERS=localhost
@@ -143,7 +143,7 @@ ubuntu1604_x86_64:
     - repo sync
     - ./chaosframework/tools/chaos_git.sh -c $TEST_BRANCH    
     - cd chaosframework;export CHAOS_LIB_HASH=`git log -n 1 --pretty="%h"`;export CHAOS_LAST_TAG=`git describe --abbrev=0`;cd -;
-    - cd html/chaos_dashboard/;./tags.sh $CI_COMMIT_REF_NAME;cd -    
+    - cd html/chaos_dashboard/;./tag.sh $CI_COMMIT_REF_NAME;cd -    
     - if ! cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCHAOS_ARCHITECTURE_TEST=ON -DCHAOS_VERSION_MAJOR="$CI_COMMIT_REF_NAME.$CHAOS_LIB_HASH ($CHAOS_LAST_TAG)" -DCHAOS_VERSION_MINOR="$CI_JOB_STAGE.$CI_COMMIT_SHA" -DCHAOS_WAN=ON -DOPENCV=$INSTALL_DIR -DCAEN2527=ON -DIDS=ON -DBASLER=ON -DENABLE_MEMCACHE=ON -DCHAOS_CCS=ON -DCHAOS_BUILD_ID=${CI_PIPELINE_ID} -DCERN_ROOT=$INSTALL_DIR -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR . |& tee $DISTRIB_PREFIX/bundle.configuration.log;then cat /tmp/cmake.log;fi
     - if ! make  -j 4 install |& tee $INSTALL_DIR/bundle.compilation.log;then tar cfz compilation.tar.gz $INSTALL_DIR/bundle.compilation.log;exit 1;fi
     - git clone git@baltig.infn.it:chaos-lnf-control/luminometer.git
@@ -173,7 +173,7 @@ ubuntu1804_x86_64:
     - repo sync
     - ./chaosframework/tools/chaos_git.sh -c $TEST_BRANCH    
     - cd chaosframework;export CHAOS_LIB_HASH=`git log -n 1 --pretty="%h"`;export CHAOS_LAST_TAG=`git describe --abbrev=0`;cd -;
-    - cd html/chaos_dashboard/;./tags.sh $CI_COMMIT_REF_NAME;cd -    
+    - cd html/chaos_dashboard/;./tag.sh $CI_COMMIT_REF_NAME;cd -    
     - if ! cmake  -DCHAOS_ARCHITECTURE_TEST=ON -DCHAOS_VERSION_MAJOR="$CI_COMMIT_REF_NAME.$CHAOS_LIB_HASH ($CHAOS_LAST_TAG)" -DCHAOS_VERSION_MINOR="$CI_JOB_STAGE.$CI_COMMIT_SHA" -DCHAOS_WAN=ON -DOPENCV=$INSTALL_DIR -DIDS=ON -DBASLER=ON -DCAEN2527=ON -DENABLE_MEMCACHE=ON -DCHAOS_CCS=ON -DCHAOS_BUILD_ID=${CI_PIPELINE_ID} -DCERN_ROOT=$INSTALL_DIR -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR . |& tee $DISTRIB_PREFIX/bundle.configuration.log;then cat /tmp/cmake.log;fi
     - if ! make  -j 4 install |& tee $INSTALL_DIR/bundle.compilation.log;then tar cfz compilation.tar.gz $INSTALL_DIR/bundle.compilation.log;exit 1;fi
     - git clone git@baltig.infn.it:chaos-lnf-control/luminometer.git
@@ -203,7 +203,7 @@ ubuntu1804_profile_x86_64:
     - repo sync
     - ./chaosframework/tools/chaos_git.sh -c $TEST_BRANCH    
     - cd chaosframework;export CHAOS_LIB_HASH=`git log -n 1 --pretty="%h"`;export CHAOS_LAST_TAG=`git describe --abbrev=0`;cd -;
-    - cd html/chaos_dashboard/;./tags.sh $CI_COMMIT_REF_NAME;cd -    
+    - cd html/chaos_dashboard/;./tag.sh $CI_COMMIT_REF_NAME;cd -    
     - if ! cmake -DCHAOS_ARCHITECTURE_TEST=ON -DCHAOS_VERSION_MAJOR="$CI_COMMIT_REF_NAME.$CHAOS_LIB_HASH ($CHAOS_LAST_TAG)" -DCHAOS_VERSION_MINOR="$CI_JOB_STAGE.$CI_COMMIT_SHA" -DCHAOS_WAN=ON -DOPENCV=$INSTALL_DIR -DIDS=ON -DCAEN2527=ON -DBASLER=ON -DENABLE_MEMCACHE=ON -DCHAOS_CCS=ON -DCHAOS_BUILD_ID=${CI_PIPELINE_ID} -DCERN_ROOT=$INSTALL_DIR -DCMAKE_BUILD_TYPE=PROFILE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR . |& tee $DISTRIB_PREFIX/bundle.configuration.log;then cat /tmp/cmake.log;fi
     - if ! make  -j 4 install |& tee $INSTALL_DIR/bundle.compilation.log;then tar cfz compilation.tar.gz $INSTALL_DIR/bundle.compilation.log;exit 1;fi
     - git clone git@baltig.infn.it:chaos-lnf-control/luminometer.git
@@ -234,7 +234,7 @@ centos7_x86_64:
     - repo sync
     - ./chaosframework/tools/chaos_git.sh -c $TEST_BRANCH    
     - cd chaosframework;export CHAOS_LIB_HASH=`git log -n 1 --pretty="%h"`;export CHAOS_LAST_TAG=`git describe --abbrev=0`;cd -;
-    - cd html/chaos_dashboard/;./tags.sh $CI_COMMIT_REF_NAME;cd -    
+    - cd html/chaos_dashboard/;./tag.sh $CI_COMMIT_REF_NAME;cd -    
     - if ! cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCHAOS_ARCHITECTURE_TEST=ON -DCHAOS_VERSION_MAJOR="$CI_COMMIT_REF_NAME.$CHAOS_LIB_HASH ($CHAOS_LAST_TAG)" -DCHAOS_VERSION_MINOR="$CI_JOB_STAGE.$CI_COMMIT_SHA" -DCHAOS_WAN=ON -DOPENCV=$INSTALL_DIR -DIDS=ON -DBASLER=ON -DCAEN2527=ON -DENABLE_MEMCACHE=ON -DCHAOS_CCS=ON -DCHAOS_BUILD_ID=${CI_PIPELINE_ID} -DCERN_ROOT=$INSTALL_DIR -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR . |& tee $DISTRIB_PREFIX/bundle.configuration.log;then cat /tmp/cmake.log;fi
     - make  -j 4 install
     - git clone git@baltig.infn.it:chaos-lnf-control/luminometer.git
@@ -286,7 +286,7 @@ ubuntu1404_x86_64:
     - repo sync
     - ./chaosframework/tools/chaos_git.sh -c $TEST_BRANCH    
     - cd chaosframework;export CHAOS_LIB_HASH=`git log -n 1 --pretty="%h"`;export CHAOS_LAST_TAG=`git describe --abbrev=0`;cd -;
-    - cd html/chaos_dashboard/;./tags.sh $CI_COMMIT_REF_NAME;cd -    
+    - cd html/chaos_dashboard/;./tag.sh $CI_COMMIT_REF_NAME;cd -    
     - if ! cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCHAOS_ARCHITECTURE_TEST=ON -DCHAOS_VERSION_MAJOR="$CI_COMMIT_REF_NAME.$CHAOS_LIB_HASH ($CHAOS_LAST_TAG)" -DCHAOS_VERSION_MINOR="$CI_JOB_STAGE.$CI_COMMIT_SHA" -DOPENCV=$INSTALL_DIR -DIDS=ON -DCAEN2527=ON -DBASLER=ON  -DCHAOS_WAN=ON -DENABLE_MEMCACHE=ON -DCHAOS_BUILD_ID=${CI_PIPELINE_ID} -DCHAOS_CCS=ON -DCERN_ROOT=$INSTALL_DIR -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR . ;then cat /tmp/cmake.log;fi
     - if ! make  -j 4 install |& tee $INSTALL_DIR/bundle.compilation.log;then tar cfz compilation.tar.gz $INSTALL_DIR/bundle.compilation.log;exit 1;fi
     - source $INSTALL_DIR/chaos_env.sh