Merge branch 'experimental' into development

.gitlab-ci.yml

@@ -71,11 +71,12 @@ ubuntu1604_x86_64:
     - repo init -q --no-clone-bundle -u git@baltig.infn.it:chaos-lnf-control/chaos_repo_bundle.git -b $CI_COMMIT_REF_NAME
     - repo sync
 #    - cmake -DCHAOS_WAN=ON -DCHAOS_CCS=ON -DCERN_ROOT=$INSTALL_DIR -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DCMAKE_BUILD_TYPE=PROFILE . |& tee $DISTRIB_PREFIX/bundle.configuration.log
-    - cmake -DCHAOS_WAN=ON -DCHAOS_BUILD_ID=${CI_PIPELINE_ID} -DCHAOS_CCS=ON -DCERN_ROOT=$INSTALL_DIR -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR . |& tee $DISTRIB_PREFIX/bundle.configuration.log
+    - cmake -DCHAOS_WAN=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
+
     - make  -j 4 install
-    - source $INSTALL_DIR/chaos_env.sh
-    - cd chaosframework/ccs;qmake;echo "* compiling CCS";make -j 4 >& $DISTRIB_PREFIX/ccs.compilation.log ;cp ccs $INSTALL_DIR/bin;
-    - cd ../../
+#    - source $INSTALL_DIR/chaos_env.sh
+#    - cd chaosframework/ccs;qmake;echo "* compiling CCS";make -j 4 >& $DISTRIB_PREFIX/ccs.compilation.log ;cp ccs $INSTALL_DIR/bin;
+#   - cd ../../
     - tar cfz $DISTRIB_NAME.tar.gz -C /usr/local/chaos chaos-distrib
   artifacts:
         name: "$DISTRIB_NAME.tar.gz"
@@ -117,9 +118,9 @@ ubuntu1404_x86_64:
     - repo sync
     - cmake -DCHAOS_WAN=ON -DCHAOS_BUILD_ID=${CI_PIPELINE_ID} -DCHAOS_CCS=ON -DCERN_ROOT=$INSTALL_DIR -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR . 
     - make  -j 4 install
-    - source $INSTALL_DIR/chaos_env.sh
-    - cd chaosframework/ccs;qmake;echo "* compiling CCS";make -j 4 >& $DISTRIB_PREFIX/ccs.compilation.log;cp ccs $INSTALL_DIR/bin;
-    - cd ../../
+ #   - source $INSTALL_DIR/chaos_env.sh
+#    - cd chaosframework/ccs;qmake;echo "* compiling CCS";make -j 4 >& $DISTRIB_PREFIX/ccs.compilation.log;cp ccs $INSTALL_DIR/bin;
+  #  - cd ../../
     - tar cfz $DISTRIB_NAME.tar.gz -C /usr/local/chaos chaos-distrib
   artifacts:
         name: "$DISTRIB_NAME.tar.gz"
@@ -207,8 +208,8 @@ deploy_stage:
     - scp chaos-distrib-$CI_COMMIT_REF_NAME-build_arm_linux26.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/arm/
     - scp chaos-distrib-$CI_COMMIT_REF_NAME-build_i686_static_linux26.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/i686/
     - scp chaos-distrib-$CI_COMMIT_REF_NAME-build_i686_dynamic_linux26.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/i686/
-    - if [ $CI_COMMIT_REF_NAME == "development" ];then echo "deploying in LNF DEVELOPMENT infrastructure"; tar xfz $DISTRIB_NAME.tar.gz -C /usr/local/chaos;cd $DISTRIB_PREFIX;source chaos_env.sh;./tools/chaos_deploy.sh tools/config/lnf/test/chaos-infrastructure.txt;fi
-    - if [ $CI_COMMIT_REF_NAME == "master" ];then echo "deploying in LNF MASTER infrastructure"; tar xfz $DISTRIB_NAME.tar.gz -C /usr/local/chaos;cd $DISTRIB_PREFIX;source chaos_env.sh;./tools/chaos_deploy.sh tools/config/lnf/production/chaos-infrastructure.txt;fi    
+    - if [ "$DEPLOY_DESTINATION" == "development" ];then echo "deploying in LNF DEVELOPMENT infrastructure"; tar xfz $DISTRIB_NAME.tar.gz -C /usr/local/chaos;cd $DISTRIB_PREFIX;source chaos_env.sh;./tools/chaos_deploy.sh -c tools/config/lnf/test/chaos-infrastructure.txt -i /usr/local/chaos/chaos-distrib;fi
+    - if [ "$DEPLOY_DESTINATION" == "production" ];then echo "deploying in LNF MASTER infrastructure"; tar xfz $DISTRIB_NAME.tar.gz -C /usr/local/chaos;cd $DISTRIB_PREFIX;source chaos_env.sh;./tools/chaos_deploy.sh -c tools/config/lnf/production/chaos-infrastructure.txt -i /usr/local/chaos/chaos-distrib;cd tools/config/lnf/production; ./update_libera.sh;fi    
   allow_failure: true
 
 

.gitlab-ci.yml~

+stages:
+  - build
+  - deploy
+
+before_script:
+  - export NOW=$(date +"%Y%m%d-%H%M%S")
+  - export TAR_NAME_POSTFIX=$NOW
+  - echo $CHAOS_DEPLOY_PRIVATE_KEY >> /builds/bisegni/chaosframework/deploy.key
+  - chmod 600 /builds/bisegni/chaosframework/deploy.key
+
+build_framework_x86_64:
+  stage: build
+  image: baltig.infn.it:4567/bisegni/chaos-docker-compilation:latest
+  script:
+    - echo "Working directory:"$PWD
+    - echo "Artifact name:"$TAR_NAME_POSTFIX
+    - cmake .
+    - make clean
+    - make  -j 4
+    - make install
+    #- tar -zcf /builds/bisegni/chaosframework/chaos-distrib-x86_64-Linux_$TAR_NAME_POSTFIX.tgz /builds/bisegni/chaosframework/chaos-distrib-x86_64-Linux
+    #- ls -la
+    #- scp -v -i /builds/bisegni/chaosframework/deploy.key -o StrictHostKeyChecking=no /builds/bisegni/chaosframework/chaos-distrib-x86_64-Linux_$TAR_NAME_POSTFIX.tgz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/
+  cache:
+    key: "$CI_BUILD_REF_NAME/x86_64"
+    paths:
+        - /builds/bisegni/chaosframework/config/CHACHE
+        - /builds/bisegni/chaosframework/external-x86_64-Linux
+        - /builds/bisegni/chaosframework/chaos-distrib-x86_64-Linux
+  only:
+    - development
+    - master
+
+build_framework_arm:
+  stage: build
+  image: baltig.infn.it:4567/bisegni/chaos-docker-compilation:latest
+  script:
+    - echo "Working directory:"$PWD
+    - echo "Artifact name:"$TAR_NAME_POSTFIX
+    - cmake -DCHAOS_TARGET=armhf
+    - make clean
+    - make  -j 4
+    - make install
+    #- tar -zcf /builds/bisegni/chaosframework/chaos-distrib-armhf_$TAR_NAME_POSTFIX.tgz /builds/bisegni/chaosframework/chaos-distrib-armhf
+    #- ls -la
+    #- scp -v -i /builds/bisegni/chaosframework/deploy.key -o StrictHostKeyChecking=no /builds/bisegni/chaosframework/chaos-distrib-x86_64-Linux_$TAR_NAME_POSTFIX.tgz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/
+  cache:
+    key: "$CI_BUILD_REF_NAME/arm"
+    paths:
+        - /builds/bisegni/chaosframework/config/CHACHE
+        - /builds/bisegni/chaosframework/external-armhf
+        - /builds/bisegni/chaosframework/chaos-distrib-armhf
+  only:
+    - development
+    - master
+
+deploy_framework_x86_64:
+    stage: deploy
+    image: baltig.infn.it:4567/bisegni/chaos-docker-compilation:latest
+    script:
+      - ls -la /builds/bisegni/chaosframework/chaos-distrib-x86_64-Linux/bin
+      - ls -la /builds/bisegni/chaosframework/chaos-distrib-x86_64-Linux/lib
+      - ls -la /builds/bisegni/chaosframework/chaos-distrib-x86_64-Linux/include
+      - echo "scp /builds/bisegni/chaosframework/chaos-distrib-x86_64-Linux_$TAR_NAME_POSTFIX.tgz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/"
+    cache:
+        key: "$CI_BUILD_REF_NAME/x86_64"
+        paths:
+            - /builds/bisegni/chaosframework/chaos-distrib-x86_64-Linux
+    only:
+      - development
+      - master
+
+deploy_framework_arm:
+    stage: deploy
+    image: baltig.infn.it:4567/bisegni/chaos-docker-compilation:latest
+    script:
+      - ls -la /builds/bisegni/chaosframework/chaos-distrib-armhf/bin
+      - ls -la /builds/bisegni/chaosframework/chaos-distrib-armhf/lib
+      - ls -la /builds/bisegni/chaosframework/chaos-distrib-armhf/include
+      - echo "scp /builds/bisegni/chaosframework/chaos-distrib-armhf_$TAR_NAME_POSTFIX.tgz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/"
+    cache:
+        key: "$CI_BUILD_REF_NAME/arm"
+        paths:
+            - /builds/bisegni/chaosframework/chaos-distrib-armhf
+    only:
+      - development
+      - master
+