Skip to content
Snippets Groups Projects
Commit f0419a18 authored by Andrea Michelotti's avatar Andrea Michelotti
Browse files

aligned with ubuntu1804

parent 59a09048
No related branches found
No related tags found
No related merge requests found
Pipeline #70691 failed
Stage: build
Stage: deploy_nightly
Stage: test
Stage: deploy
Stage: publish
Hide whitespace changes
Inline Side-by-side
Showing
with 8 additions and 21 deletions
.gitlab-ci.yml
+ 8
− 21
View file @ f0419a18
...@@ -262,10 +262,6 @@ ubuntu1804_x86_64: ...@@ -262,10 +262,6 @@ ubuntu1804_x86_64:
- ./tools/strip_symbols.sh $INSTALL_DIR - ./tools/strip_symbols.sh $INSTALL_DIR
- tar cfz $DISTRIB_NAME.tar.gz -C /usr/local/chaos chaos-distrib - tar cfz $DISTRIB_NAME.tar.gz -C /usr/local/chaos chaos-distrib
- md5sum $DISTRIB_NAME.tar.gz > $DISTRIB_NAME.tar.gz.md5 - md5sum $DISTRIB_NAME.tar.gz > $DISTRIB_NAME.tar.gz.md5
# - scp $DISTRIB_NAME.tar.gz.md5 chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/nightly/$ARCH/$ID/$VERSION_ID/$NIGHTLY_NAME.md5
# - scp $DISTRIB_NAME.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/nightly/$ARCH/$ID/$VERSION_ID/$NIGHTLY_NAME
# - ssh chaosweb@opensource.lnf.infn.it "ln -sf /var/www/html/binary/chaos/nightly/$ARCH/$ID/$VERSION_ID/$NIGHTLY_NAME /var/www/html/binary/chaos/nightly/$ARCH/$ID/$VERSION_ID/latest.tar.gz"
# - ssh chaosweb@opensource.lnf.infn.it "ln -sf /var/www/html/binary/chaos/nightly/$ARCH/$ID/$VERSION_ID/$NIGHTLY_NAME.md5 /var/www/html/binary/chaos/nightly/$ARCH/$ID/$VERSION_ID/latest.tar.gz.md5"
artifacts: artifacts:
...@@ -371,30 +367,21 @@ centos7_x86_64: ...@@ -371,30 +367,21 @@ centos7_x86_64:
script: script:
- npm install -g jchaos - npm install -g jchaos
- repo sync -n chaos_dashboard.git -j1 --fail-fast - repo sync -n chaos_dashboard.git -j1 --fail-fast
- repo sync;git -C html/chaos_dashboard/js/jchaos checkout $CI_COMMIT_REF_NAME;git -C html/chaos_dashboard/js/jchaos pull - repo sync
- if [ -e CACHE ]; then mv CACHE chaosframework/config;fi - if [ -e CACHE ]; then mv CACHE chaosframework/config;fi
- if [ "$TEST_BRANCH" != "$CI_COMMIT_REF_NAME" ]; then ./chaosframework/tools/chaos_git.sh -c $TEST_BRANCH;fi - if [ "$TEST_BRANCH" != "$CI_COMMIT_REF_NAME" ]; then ./chaosframework/tools/chaos_git.sh -c $TEST_BRANCH;fi
- cd chaosframework - cd chaosframework
- GITHASH=`git log -n 1 --pretty="%h"` - GITHASH=`git log -n 1 --pretty="%h"`
- GITTAG=`git describe --abbrev=0` - GITTAG=`git describe --abbrev=0`
- echo -e "GITHASH:$GITHASH\nGITTAG:$GITTAG" >> $INSTALL_DIR/VERSION - echo -e "GITHASH:$GITHASH\nGITTAG:$GITTAG" >> $INSTALL_DIR/VERSION
- export CHAOS_LIB_HASH=`git log -n 1 --pretty="%h"`;export CHAOS_LAST_TAG=`git describe --abbrev=0` - export CHAOS_LIB_HASH=`git log -n 1 --pretty="%h"`;export CHAOS_LAST_TAG=`git describe --abbrev=0`;cd -;
# - cd html/chaos_dashboard/;./tag.sh $CI_COMMIT_REF_NAME;cd - - cd html/chaos_dashboard/;./tag.sh $CI_COMMIT_REF_NAME;cd -
- export CC=/opt/rh/devtoolset-8/root/usr/bin/gcc;export CXX=/opt/rh/devtoolset-8/root/usr/bin/g++ - if ! cmake -DKAFKA_RDK_ENABLE=ON -DCMAKE_BUILD_TYPE=Release -DCHAOS_EPICS_SUPPORT=ON -DCHAOS_ARCHITECTURE_TEST=ON -DCHAOS_VERSION_MAJOR="$CI_COMMIT_REF_NAME.$CHAOS_LIB_HASH.$REVNAME ($CHAOS_LAST_TAG)" -DCHAOS_VERSION_MINOR="$CI_JOB_STAGE.$CI_COMMIT_SHA" -DCHAOS_WAN=ON -DCHAOS_DRIVER_LUMINOMETER=ON -DOPENCV=$INSTALL_DIR -DIDS=ueye495 -DBASLER=ON -DCAEN2527=ON -DENABLE_MEMCACHE=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 ! cmake -DCHAOS_EPICS_SUPPORT=ON -DCMAKE_BUILD_TYPE=Release -DKAFKA_RDK_ENABLE=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH=1 -DCHAOS_ARCHITECTURE_TEST=ON -DCHAOS_VERSION_MAJOR="$CI_COMMIT_REF_NAME.$CHAOS_LIB_HASH.$REVNAME ($CHAOS_LAST_TAG)" -DCHAOS_VERSION_MINOR="$CI_JOB_STAGE.$CI_COMMIT_SHA" -DCHAOS_WAN=ON -DOPENCV=$INSTALL_DIR -DIDS=ueye495 -DBASLER=ON -DCAEN2527=ON -DENABLE_MEMCACHE=ON -DCHAOS_BUILD_ID=${CI_PIPELINE_ID} -DCHAOS_DRIVER_LUMINOMETER=ON -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 `find . -name "*.log"` $INSTALL_DIR/bundle.compilation.log;exit 1;fi
- make -j 4 install - ./tools/strip_symbols.sh $INSTALL_DIR
# - git clone git@bam.infn.it:chaos-lnf-control/chaos-common-labview.git
# - cd chaos-common-labview;git checkout $CI_COMMIT_REF_NAME;cd api/linux/;cmake -DCMAKE_MODULE_PATH=$INSTALL_DIR -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DLVVER=19 .
# - 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
# - cd ../../../
# - ./tools/strip_symbols.sh $INSTALL_DIR
- tar cfz $DISTRIB_NAME.tar.gz -C /usr/local/chaos chaos-distrib - tar cfz $DISTRIB_NAME.tar.gz -C /usr/local/chaos chaos-distrib
- md5sum $DISTRIB_NAME.tar.gz > $DISTRIB_NAME.tar.gz.md5 - md5sum $DISTRIB_NAME.tar.gz > $DISTRIB_NAME.tar.gz.md5
# - scp $DISTRIB_NAME.tar.gz.md5 chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/nightly/$ARCH/$ID/$VERSION_ID/$NIGHTLY_NAME.md5
# - scp $DISTRIB_NAME.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/nightly/$ARCH/$ID/$VERSION_ID/$NIGHTLY_NAME
# - ssh chaosweb@opensource.lnf.infn.it "ln -sf /var/www/html/binary/chaos/nightly/$ARCH/$ID/$VERSION_ID/$NIGHTLY_NAME /var/www/html/binary/chaos/nightly/$ARCH/$ID/$VERSION_ID/latest-$CI_JOB_NAME.tar.gz"
# - ssh chaosweb@opensource.lnf.infn.it "ln -sf /var/www/html/binary/chaos/nightly/$ARCH/$ID/$VERSION_ID/$NIGHTLY_NAME.md5 /var/www/html/binary/chaos/nightly/$ARCH/$ID/$VERSION_ID/latest-$CI_JOB_NAME.tar.gz.md5"
artifacts: artifacts:
name: "$DISTRIB_NAME.tar.gz" name: "$DISTRIB_NAME.tar.gz"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment