deploy into production directory

.gitlab-ci.yml

@@ -603,30 +603,32 @@ deploy_stage:
   image: baltig.infn.it:4567/chaos-lnf-control/chaos_bundle_compilation:lite
   script:
     - scripts/accept_merge_request.sh $CI_COMMIT_REF_NAME
-    - if [ -e chaos-osx10-distrib.tar.gz ];then scp chaos-osx10-distrib.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/$ARCH/osx/;fi
-    - scp chaos-distrib-$REVNAME-ubuntu-16.04-x86_64.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/$ARCH/ubuntu/16.04/chaos-distrib.$TAR_NAME_POSTFIX.tar.gz
-    - ssh chaosweb@opensource.lnf.infn.it "ln -sf /var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/$ARCH/ubuntu/16.04/chaos-distrib.$TAR_NAME_POSTFIX.tar.gz /var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/$ARCH/ubuntu/16.04/latest.tar.gz"
-    - scp chaos-distrib-$REVNAME-ubuntu-18.04-x86_64.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/$ARCH/ubuntu/18.04/chaos-distrib.$TAR_NAME_POSTFIX.tar.gz
-    - ssh chaosweb@opensource.lnf.infn.it "ln -sf /var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/$ARCH/ubuntu/18.04/chaos-distrib.$TAR_NAME_POSTFIX.tar.gz /var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/$ARCH/ubuntu/18.04/latest.tar.gz"
-    - scp chaos-distrib-$REVNAME-centos-7-x86_64.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/$ARCH/centos/7/chaos-distrib.$TAR_NAME_POSTFIX.tar.gz
-    - ssh chaosweb@opensource.lnf.infn.it "ln -sf /var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/$ARCH/centos/7/chaos-distrib.$TAR_NAME_POSTFIX.tar.gz /var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/$ARCH/centos/7/latest.tar.gz"
-    - scp chaos-distrib-$REVNAME-ubuntu-14.04-x86_64.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/$ARCH/ubuntu/14.04/chaos-distrib.$TAR_NAME_POSTFIX.tar.gz
-    - ssh chaosweb@opensource.lnf.infn.it "ln -sf /var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/$ARCH/ubuntu/14.04/chaos-distrib.$TAR_NAME_POSTFIX.tar.gz /var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/$ARCH/ubuntu/14.04/latest.tar.gz"
-    - scp chaos-distrib-$REVNAME-build_arm_linux26.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/arm/chaos-distrib-$REVNAME-build_arm_linux26.tar.gz
-    - scp chaos-distrib-$REVNAME-build_i686_dynamic_linux26.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/i686/chaos-distrib-$REVNAME-build_i686_dynamic_linux26.tar.gz
-    - scp chaos-distrib-$REVNAME-build_i686_static_linux26.tar.gz  chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/i686/chaos-distrib-$REVNAME-build_i686_static_linux26.tar.gz
+    - OUTPUT_REV_DIR=$CI_COMMIT_REF_NAME
+    - if [ $CI_COMMIT_REF_NAME == "master" ];then OUTPUT_REV_DIR="production";fi
+    - if [ -e chaos-osx10-distrib.tar.gz ];then scp chaos-osx10-distrib.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$OUTPUT_REV_DIR/$ARCH/osx/;fi
+    - scp chaos-distrib-$REVNAME-ubuntu-16.04-x86_64.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$OUTPUT_REV_DIR/$ARCH/ubuntu/16.04/chaos-distrib.$TAR_NAME_POSTFIX.tar.gz
+    - ssh chaosweb@opensource.lnf.infn.it "ln -sf /var/www/html/binary/chaos/$OUTPUT_REV_DIR/$ARCH/ubuntu/16.04/chaos-distrib.$TAR_NAME_POSTFIX.tar.gz /var/www/html/binary/chaos/$OUTPUT_REV_DIR/$ARCH/ubuntu/16.04/latest.tar.gz"
+    - scp chaos-distrib-$REVNAME-ubuntu-18.04-x86_64.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$OUTPUT_REV_DIR/$ARCH/ubuntu/18.04/chaos-distrib.$TAR_NAME_POSTFIX.tar.gz
+    - ssh chaosweb@opensource.lnf.infn.it "ln -sf /var/www/html/binary/chaos/$OUTPUT_REV_DIR/$ARCH/ubuntu/18.04/chaos-distrib.$TAR_NAME_POSTFIX.tar.gz /var/www/html/binary/chaos/$OUTPUT_REV_DIR/$ARCH/ubuntu/18.04/latest.tar.gz"
+    - scp chaos-distrib-$REVNAME-centos-7-x86_64.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$OUTPUT_REV_DIR/$ARCH/centos/7/chaos-distrib.$TAR_NAME_POSTFIX.tar.gz
+    - ssh chaosweb@opensource.lnf.infn.it "ln -sf /var/www/html/binary/chaos/$OUTPUT_REV_DIR/$ARCH/centos/7/chaos-distrib.$TAR_NAME_POSTFIX.tar.gz /var/www/html/binary/chaos/$OUTPUT_REV_DIR/$ARCH/centos/7/latest.tar.gz"
+    - scp chaos-distrib-$REVNAME-ubuntu-14.04-x86_64.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$OUTPUT_REV_DIR/$ARCH/ubuntu/14.04/chaos-distrib.$TAR_NAME_POSTFIX.tar.gz
+    - ssh chaosweb@opensource.lnf.infn.it "ln -sf /var/www/html/binary/chaos/$OUTPUT_REV_DIR/$ARCH/ubuntu/14.04/chaos-distrib.$TAR_NAME_POSTFIX.tar.gz /var/www/html/binary/chaos/$OUTPUT_REV_DIR/$ARCH/ubuntu/14.04/latest.tar.gz"
+    - scp chaos-distrib-$REVNAME-build_arm_linux26.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$OUTPUT_REV_DIR/arm/chaos-distrib-$REVNAME-build_arm_linux26.tar.gz
+    - scp chaos-distrib-$REVNAME-build_i686_dynamic_linux26.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$OUTPUT_REV_DIR/i686/chaos-distrib-$REVNAME-build_i686_dynamic_linux26.tar.gz
+    - scp chaos-distrib-$REVNAME-build_i686_static_linux26.tar.gz  chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$OUTPUT_REV_DIR/i686/chaos-distrib-$REVNAME-build_i686_static_linux26.tar.gz
         
     - 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_luminometer.sh;fi
-    - curl -X POST -F token="81913e63e951cc80ebf0095440d432" -F "ref=experimental" -F "variables[DEPLOY_DESTINATION]=$CI_COMMIT_REF_NAME" https://baltig.infn.it/api/v4/projects/1443/trigger/pipeline
+    - curl -X POST -F token="81913e63e951cc80ebf0095440d432" -F "ref=experimental" -F "variables[DEPLOY_DESTINATION]=$OUTPUT_REV_DIR" https://baltig.infn.it/api/v4/projects/1443/trigger/pipeline
     - md5sum chaos-distrib-$REVNAME-ubuntu-16.04-x86_64.tar.gz > chaos-distrib-$REVNAME-ubuntu-16.04-x86_64.tar.gz.md5
     - md5sum chaos-distrib-$REVNAME-ubuntu-18.04-x86_64.tar.gz > chaos-distrib-$REVNAME-ubuntu-18.04-x86_64.tar.gz.md5
     - md5sum chaos-distrib-$REVNAME-ubuntu-14.04-x86_64.tar.gz > chaos-distrib-$REVNAME-ubuntu-14.04-x86_64.tar.gz.md5
     - md5sum chaos-distrib-$REVNAME-centos-7-x86_64.tar.gz > chaos-distrib-$REVNAME-centos-7-x86_64.tar.gz.md5
-    - scp chaos-distrib-$REVNAME-ubuntu-16.04-x86_64.tar.gz.md5 chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/$ARCH/ubuntu/16.04/latest.tar.md5
-    - scp chaos-distrib-$REVNAME-ubuntu-14.04-x86_64.tar.gz.md5 chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/$ARCH/ubuntu/14.04/latest.tar.md5    
-    - scp chaos-distrib-$REVNAME-ubuntu-18.04-x86_64.tar.gz.md5 chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/$ARCH/ubuntu/18.04/latest.tar.md5
-    - scp chaos-distrib-$REVNAME-centos-7-x86_64.tar.gz.md5 chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/$ARCH/centos/7/latest.tar.md5    
+    - scp chaos-distrib-$REVNAME-ubuntu-16.04-x86_64.tar.gz.md5 chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$OUTPUT_REV_DIR/$ARCH/ubuntu/16.04/latest.tar.md5
+    - scp chaos-distrib-$REVNAME-ubuntu-14.04-x86_64.tar.gz.md5 chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$OUTPUT_REV_DIR/$ARCH/ubuntu/14.04/latest.tar.md5
+    - scp chaos-distrib-$REVNAME-ubuntu-18.04-x86_64.tar.gz.md5 chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$OUTPUT_REV_DIR/$ARCH/ubuntu/18.04/latest.tar.md5
+    - scp chaos-distrib-$REVNAME-centos-7-x86_64.tar.gz.md5 chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$OUTPUT_REV_DIR/$ARCH/centos/7/latest.tar.md5
   only:
     variables:
       - $BUILD_DISTRIBUTION == null