diff options
| -rwxr-xr-x | gitlab-ci/clientdata/deploy.sh | 38 | ||||
| -rwxr-xr-x | gitlab-ci/clientdata/testxml.sh (renamed from gitlab-ci/clientdata.sh) | 14 |
2 files changed, 38 insertions, 14 deletions
diff --git a/gitlab-ci/clientdata/deploy.sh b/gitlab-ci/clientdata/deploy.sh new file mode 100755 index 0000000..4afc0cd --- /dev/null +++ b/gitlab-ci/clientdata/deploy.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +cd clientdata +rm -rf public +mkdir public +mkdir shared +echo >shared/error.log +echo ${CI_BUILD_ID} >shared/buildid.log + +function gitclone { + git clone $* + if [ "$?" != 0 ]; then + sleep 1s + git clone $* + if [ "$?" != 0 ]; then + sleep 3s + git clone $* + fi + fi +} + +cd .. +ln -s clientdata client-data + +rm -rf music +gitclone https://gitlab.com/evol/evol-music.git music + +cd tools/update + +./createnew.sh +./create_music.sh + +cp -r upload/* ../../clientdata/public +cd ../../clientdata +gitclone https://gitlab.com/4144/pagesindexgen.git pagesindexgen +cd pagesindexgen +./pagesindexgen.py ../public +ls ../public diff --git a/gitlab-ci/clientdata.sh b/gitlab-ci/clientdata/testxml.sh index 9d1281b..64915b4 100755 --- a/gitlab-ci/clientdata.sh +++ b/gitlab-ci/clientdata/testxml.sh @@ -22,9 +22,6 @@ function gitclone { cd .. ln -s clientdata client-data -rm -rf music -gitclone https://gitlab.com/evol/evol-music.git music - cd tools/testxml ./xsdcheck.sh @@ -46,14 +43,3 @@ if [ "$?" != 0 ]; then fi echo >../../clientdata/shared/error.log - -cd ../update -./createnew.sh -./create_music.sh - -cp -r upload/* ../../clientdata/public -cd ../../clientdata -gitclone https://gitlab.com/4144/pagesindexgen.git pagesindexgen -cd pagesindexgen -./pagesindexgen.py ../public -ls ../public |